优化

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -321,14 +321,25 @@ public class UserDeliverOrderController extends BaseApiController {
     public AjaxResult pay(@Valid @RequestBody OrderPayParam param) {
         Long userId = SecurityUtils.getLoginUser().getUserId();
         SysUser sysUser = sysUserService.selectUserById(userId);
+        String openId = "";
         if (param.getPayType() == 1) {
             if (StringUtils.isBlank(sysUser.getAliuserId())) {
                 return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1026);
             }
         } else {
-            if (StringUtils.isBlank(sysUser.getOpenId())) {
-                return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+            AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(param.getAppSource());
+            if (AppSourceEnum.MSDQ.equals(appSourceEnum)) {
+                if (StringUtils.isBlank(sysUser.getMsdqOpenId())) {
+                    return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+                }
+                openId = sysUser.getMsdqOpenId();
+            } else {
+                if (StringUtils.isBlank(sysUser.getOpenId())) {
+                    return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+                }
+                openId = sysUser.getOpenId();
             }
+
         }
         UserDeliverOrder deliverOrder = userDeliverOrderService.getById(param.getOrderId());
         JSONObject jsonObject;
@@ -340,7 +351,7 @@ public class UserDeliverOrderController extends BaseApiController {
                     deliverOrder.getPayAmt(), "盲票--提货订单");
             } else {
                 // 微信支付
-                jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), sysUser.getOpenId(),
+                jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), openId,
                     deliverOrder.getPayAmt(), "盲票--提货订单", param.getAppSource());
             }
         } catch (ServiceException e) {

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserTicketOrderController.java

@@ -214,13 +214,23 @@ public class UserTicketOrderController extends BaseApiController {
     public AjaxResult pay(@Valid @RequestBody OrderPayParam param) {
         Long userId = SecurityUtils.getLoginUser().getUserId();
         SysUser sysUser = sysUserService.selectUserById(userId);
+        String openId = "";
         if (param.getPayType() == 1) {
             if (StringUtils.isBlank(sysUser.getAliuserId())) {
                 return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1026);
             }
         } else {
-            if (StringUtils.isBlank(sysUser.getOpenId())) {
-                return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+            AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(param.getAppSource());
+            if (AppSourceEnum.MSDQ.equals(appSourceEnum)) {
+                if (StringUtils.isBlank(sysUser.getMsdqOpenId())) {
+                    return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+                }
+                openId = sysUser.getMsdqOpenId();
+            } else {
+                if (StringUtils.isBlank(sysUser.getOpenId())) {
+                    return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+                }
+                openId = sysUser.getOpenId();
             }
         }
 
@@ -233,7 +243,7 @@ public class UserTicketOrderController extends BaseApiController {
                     ticketOrder.getPayAmt(), ticketOrder.getTitle());
             } else {
                 // 微信支付
-                jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), sysUser.getOpenId(),
+                jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), openId,
                     ticketOrder.getPayAmt(), ticketOrder.getTitle(), param.getAppSource());
             }
         } catch (ServiceException e) {