Browse Source

1、微信支付、提现、退款修复(将小程序appid、密钥、openid更换成公众号appid、密钥、openid)

master
Aug 1 day ago
parent
commit
2eec42634a
6 changed files with 16 additions and 14 deletions
  1. +1
    -1
      han-hai-module-pay/src/main/resources/pay_weixin.properties
  2. +4
    -4
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java
  3. +2
    -2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java
  4. +4
    -2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java
  5. +4
    -4
      jeecg-boot-module-system/src/main/resources/application-dev.yml
  6. +1
    -1
      jeecg-boot-module-system/src/main/resources/pay_weixin.properties

+ 1
- 1
han-hai-module-pay/src/main/resources/pay_weixin.properties View File

@ -6,7 +6,7 @@
#pay.notifyUrlDev=https://jobadmin.java996.icu/job-dev/job/pay/notify #pay.notifyUrlDev=https://jobadmin.java996.icu/job-dev/job/pay/notify
pay.mchId=1712378227 pay.mchId=1712378227
pay.appId=wx77ba4c7131677a74
pay.appId=wxb1c123a63736f789
pay.mchKey=0fdb77429ffdf206c151af76a663041c pay.mchKey=0fdb77429ffdf206c151af76a663041c
pay.keyPath=classpath:apiclient_cert.pem pay.keyPath=classpath:apiclient_cert.pem
pay.notifyUrl=http://h5.xzaiyp.top/massage-api/post/create pay.notifyUrl=http://h5.xzaiyp.top/massage-api/post/create


+ 4
- 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/AmountServiceImpl.java View File

@ -28,10 +28,10 @@ import java.util.Map;
@Service @Service
public class AmountServiceImpl implements AmountService { public class AmountServiceImpl implements AmountService {
/*************************************************************************************/ /*************************************************************************************/
//微信小程序 AppID
//微信公众号 AppID
@Value("${wx.miniapp.appid}") @Value("${wx.miniapp.appid}")
private String appid; private String appid;
//微信小程序的密钥
//微信公众号的密钥
@Value("${wx.miniapp.secret}") @Value("${wx.miniapp.secret}")
private String secret; private String secret;
//商户号 //商户号
@ -111,7 +111,6 @@ public class AmountServiceImpl implements AmountService {
//权限验证 //权限验证
//HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证 //HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);//小程序权限验证
HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证; HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); //公众号权限验证;
//HanHaiMember hanHaiMember = hanHaiMemberService.getById("1919297392365035521");
//提现结果 //提现结果
String massage = "提现申请失败"; String massage = "提现申请失败";
@ -148,7 +147,8 @@ public class AmountServiceImpl implements AmountService {
//1.微信提现基础参数 //1.微信提现基础参数
Map map = getMap(); Map map = getMap();
//变化的用户信息参数 //变化的用户信息参数
map.put("openid", hanHaiMember.getAppletOpenid());//用户openid
//map.put("openid", hanHaiMember.getAppletOpenid());//用户openid(小程序)
map.put("openid", hanHaiMember.getOfficialOpenid());//用户openid(公众号)
map.put("userName", userName);//用户真实姓名 map.put("userName", userName);//用户真实姓名
map.put("transferAmount", transferAmount);//提现金额, 单位为 map.put("transferAmount", transferAmount);//提现金额, 单位为
String idStr = "H" + IdWorker.getIdStr(); String idStr = "H" + IdWorker.getIdStr();


+ 2
- 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/LoginApiServiceImpl.java View File

@ -37,10 +37,10 @@ import java.util.Map;
public class LoginApiServiceImpl implements LoginApiService { public class LoginApiServiceImpl implements LoginApiService {
/******************************************************************************************************************/ /******************************************************************************************************************/
//微信小程序的 AppID //微信小程序的 AppID
@Value("${wx.miniapp.wxAppid}")
@Value("${wx.miniapp.appid}")
private String mpAppId; private String mpAppId;
//微信小程序的 AppID //微信小程序的 AppID
@Value("${wx.miniapp.wxSecret}")
@Value("${wx.miniapp.secret}")
private String mpAppSecret; private String mpAppSecret;
@Resource @Resource


+ 4
- 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java View File

@ -181,7 +181,8 @@ public class OrderServiceImpl implements OrderService {
massageOrder.getId(), massageOrder.getId(),
i1, i1,
massageOrder.getId(), massageOrder.getId(),
hanHaiMember.getAppletOpenid(),
//hanHaiMember.getAppletOpenid(), //用户openid(小程序)
hanHaiMember.getOfficialOpenid(), //用户openid(公众号)
massageOrder.toString()); massageOrder.toString());
return Result.OK("支付成功",appOrder); return Result.OK("支付成功",appOrder);
@ -303,7 +304,8 @@ public class OrderServiceImpl implements OrderService {
massageOrder.getId(), massageOrder.getId(),
i1, i1,
massageOrder.getId(), massageOrder.getId(),
hanHaiMember.getAppletOpenid(),
//hanHaiMember.getAppletOpenid(), //用户openid(小程序)
hanHaiMember.getOfficialOpenid(), //用户openid(公众号)
massageOrder.toString()); massageOrder.toString());
return Result.OK("支付成功",appOrder); return Result.OK("支付成功",appOrder);


+ 4
- 4
jeecg-boot-module-system/src/main/resources/application-dev.yml View File

@ -332,10 +332,10 @@ third-app:
## 微信商户 ## 微信商户
wx: wx:
miniapp: miniapp:
wxAppid: wxb1c123a63736f789 #微信公众号appid
wxSecret: 497549cd0a6a086e59f02f65f470c69a #微信公众号密钥
appid: wx77ba4c7131677a74 # 微信小程序appid
secret: fb915d623f92d455f2e70934f75fb96c # 微信小程序密钥
appid: wxb1c123a63736f789 #微信公众号appid
secret: 497549cd0a6a086e59f02f65f470c69a #微信公众号密钥
# appid: wx77ba4c7131677a74 # 微信小程序appid
# secret: fb915d623f92d455f2e70934f75fb96c # 微信小程序密钥
merchantId: 1712378227 # 商户号 merchantId: 1712378227 # 商户号
# privateKeyPath: jeecg-boot-module-system/src/main/resources/apiclient_key.pem #本地私钥路径 # privateKeyPath: jeecg-boot-module-system/src/main/resources/apiclient_key.pem #本地私钥路径
# publicKeyPath: jeecg-boot-module-system/src/main/resources/pub_key.pem #本地公钥路径 # publicKeyPath: jeecg-boot-module-system/src/main/resources/pub_key.pem #本地公钥路径


+ 1
- 1
jeecg-boot-module-system/src/main/resources/pay_weixin.properties View File

@ -1,5 +1,5 @@
pay.mchId=1712378227 pay.mchId=1712378227
pay.appId=wx77ba4c7131677a74
pay.appId=wxb1c123a63736f789
pay.mchKey=0fdb77429ffdf206c151af76a663041c pay.mchKey=0fdb77429ffdf206c151af76a663041c
pay.keyPath=classpath:apiclient_cert.pem pay.keyPath=classpath:apiclient_cert.pem
pay.notifyUrl=http://h5.xzaiyp.top/massage-api/post/create pay.notifyUrl=http://h5.xzaiyp.top/massage-api/post/create


Loading…
Cancel
Save