diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java index 239169e..34e9417 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/PayController.java @@ -51,7 +51,7 @@ public class PayController { } 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) { e.printStackTrace(); } @@ -87,6 +87,8 @@ public class PayController { String userId = ""; if (environment.equals("wx") && payType.equals("wechatPay")) { userId = TokenUtil.parseParamFromToken(token).getString("openId"); + } else if("aliPay".equals(payType)){ + userId = TokenUtil.parseParamFromToken(token).getString("openId"); } else { userId = TokenUtil.parseParamFromToken(token).getString("userId"); }