czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tkk' into test

Browse Source
This commit is contained in:
Tankaikai
2024-09-26 17:34:37 +08:00
parent 3026609afb 4ad5b3416c
commit 5a6e4e63c0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java
View File

@@ -51,7 +51,7 @@ public class PayController {
} }
try { try {
return payService.payOrderTest(openId, map.get("orderId"), payType, IpUtil.getIpAddr(request)); return payService.payOrder(openId, map.get("orderId"), payType, IpUtil.getIpAddr(request));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -87,6 +87,8 @@ public class PayController {
String userId = ""; String userId = "";
if (environment.equals("wx") && payType.equals("wechatPay")) { if (environment.equals("wx") && payType.equals("wechatPay")) {
userId = TokenUtil.parseParamFromToken(token).getString("openId"); userId = TokenUtil.parseParamFromToken(token).getString("openId");
} else if("aliPay".equals(payType)){
userId = TokenUtil.parseParamFromToken(token).getString("openId");
} else { } else {
userId = TokenUtil.parseParamFromToken(token).getString("userId"); userId = TokenUtil.parseParamFromToken(token).getString("userId");
} }