|
@@ -149,12 +149,9 @@ public class PayController {
|
|
|
public String getJhPayInfo(@RequestBody PayInfoRequest payInfoRequest){
|
|
|
Gson gson =new Gson();
|
|
|
ResultData resultData =null;
|
|
|
- //String token=payInfoRequest.getToken();//token
|
|
|
String openId = payInfoRequest.getOpenId(); //用户openId
|
|
|
String userType=payInfoRequest.getUserType();//用户登录类型 1 公众号。2 小程序
|
|
|
- //String mno=payInfoRequest.getMno();//获取商户号
|
|
|
Integer orderId =payInfoRequest.getOrderId();
|
|
|
- //根据token 和登录类型 身份验证
|
|
|
AppUserInfo appUserInfo =new AppUserInfo();
|
|
|
//订单类型 是小程序还是公众号
|
|
|
appUserInfo.setUserType(userType);
|
|
@@ -166,7 +163,6 @@ public class PayController {
|
|
|
appUserInfo.setMinaOpenid(openId);
|
|
|
}
|
|
|
List<AppUserInfo> appUserInfoList =appUserInfoService.Authentication(appUserInfo);
|
|
|
-
|
|
|
if(appUserInfoList!=null&&appUserInfoList.size()==1){
|
|
|
//调用聚合支付
|
|
|
try{
|
|
@@ -289,6 +285,7 @@ public class PayController {
|
|
|
return gson.toJson(resultData);
|
|
|
}
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 验证商户信息查询
|
|
|
*/
|
|
@@ -546,9 +543,6 @@ public class PayController {
|
|
|
payOrder.setStatus("1");
|
|
|
payOrder.setPayType("wx");
|
|
|
payOrder.setWxAmt(Double.valueOf(amt));
|
|
|
- //finishTime
|
|
|
- //SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
- //payOrder.setPayDate(sdf.parse(finishTime)); //支付时间
|
|
|
payOrder.setPayDate(new Date()); //支付时间
|
|
|
payOrder.setReceivedAmt(Double.valueOf(settleAmt)); //settleAmt商家入账金额
|
|
|
//修改订单状态
|