|
@@ -119,7 +119,8 @@ public class PayController {
|
|
public String getJhPayInfo(@RequestBody PayInfoRequest payInfoRequest){
|
|
public String getJhPayInfo(@RequestBody PayInfoRequest payInfoRequest){
|
|
Gson gson =new Gson();
|
|
Gson gson =new Gson();
|
|
ResultData resultData =null;
|
|
ResultData resultData =null;
|
|
- String token=payInfoRequest.getToken();//token
|
|
|
|
|
|
+ //String token=payInfoRequest.getToken();//token
|
|
|
|
+ String openId = payInfoRequest.getOpenId(); //用户openId
|
|
String userType=payInfoRequest.getUserType();//用户登录类型 1 公众号。2 小程序
|
|
String userType=payInfoRequest.getUserType();//用户登录类型 1 公众号。2 小程序
|
|
String mno=payInfoRequest.getMno();//获取商户号
|
|
String mno=payInfoRequest.getMno();//获取商户号
|
|
Integer orderId =payInfoRequest.getOrderId();
|
|
Integer orderId =payInfoRequest.getOrderId();
|
|
@@ -129,10 +130,10 @@ public class PayController {
|
|
appUserInfo.setUserType(userType);
|
|
appUserInfo.setUserType(userType);
|
|
if(userType.equals("1")){
|
|
if(userType.equals("1")){
|
|
//1 是公众号
|
|
//1 是公众号
|
|
- appUserInfo.setBlogOpenid(token);
|
|
|
|
|
|
+ appUserInfo.setBlogOpenid(openId);
|
|
}else if(userType.equals("2")){
|
|
}else if(userType.equals("2")){
|
|
//2是小程序
|
|
//2是小程序
|
|
- appUserInfo.setMinaOpenid(token);
|
|
|
|
|
|
+ appUserInfo.setMinaOpenid(openId);
|
|
}
|
|
}
|
|
List<AppUserInfo> appUserInfoList =appUserInfoService.Authentication(appUserInfo);
|
|
List<AppUserInfo> appUserInfoList =appUserInfoService.Authentication(appUserInfo);
|
|
|
|
|