From 3055eeb259b2f27c247ee7808da8f75f15dd2552 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 5 Aug 2020 10:44:09 +0800 Subject: [PATCH] update --- .../iformall/controller/WxPayOrderController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index a45dd533c..8e8a78d9e 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -33,6 +33,7 @@ import com.iformall.enums.EnumOrderStatus; import com.iformall.enums.EnumPayStatus; import com.iformall.enums.EnumPayWay; import com.iformall.exception.MallinkException; +import com.iformall.service.WxAppinfoService; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxCouponService; import com.iformall.service.WxOrderService; @@ -67,6 +68,9 @@ public class WxPayOrderController extends BaseController { @Autowired private WxCouponService wxCouponService; + @Autowired + private WxAppinfoService wxAppinfoService; + /** * 微信支付 * @param paramMap @@ -202,10 +206,12 @@ public class WxPayOrderController extends BaseController { } } //查询微信订单状态并更新 - WxCUser user = getUser(); - WxAppinfo appInfo = getAppInfo(user.getAppId()); + + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(payOrder, EnumPayWay.getEnum(payOrder.getPayVendor())); + //WxCUser user = getUser(); + //WxAppinfo appInfo = getAppInfo(user.getAppId()); if (null == appInfo) { - return new ResultData(ErrorCode.PAY_ORDER_ERROR, "当前用户appId["+user.getAppId()+"]找不到appInfo"); + return new ResultData(ErrorCode.PAY_ORDER_ERROR, "当前支付类型["+payOrder.getPayVendor()+"]找不到C端appInfo"); } WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); try {