优化

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -355,7 +355,7 @@ public class ChannelOrderController extends BaseApiController {
     ChannelOrder channelOrder = channelOrderService.getById(param.getOrderId());
     JSONObject jsonObject;
     try {
-      jsonObject = walletService.pay(BizTypeEnum.CHANNEL_ORDER, param.getOrderId(), channelOpenId, channelOrder.getPayAmt(), channelOrder.getTitle());
+      jsonObject = walletService.pay(BizTypeEnum.CHANNEL_ORDER, param.getOrderId(), channelOpenId, channelOrder.getPayAmt(), channelOrder.getTitle(), AppSourceEnum.CHANNEL.getValue());
     }catch (ServiceException e) {
       LogUtil.error(logger, e, "根据经销商采购订单创建支付单失败。userId:{0},orderId:{1}", new Object[]{userId, param.getOrderId()});
       return AjaxResult.error(e.getMessage());

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

@@ -221,7 +221,7 @@ public class UserTicketOrderController extends BaseApiController {
             }
         } else {
             AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(param.getAppSource());
-            if (AppSourceEnum.MSDQ.getValue().equals(appSourceEnum.getValue())) {
+            if (AppSourceEnum.MSDQ.equals(appSourceEnum)) {
                 if (StringUtils.isBlank(sysUser.getMsdqOpenId())) {
                     return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
                 }

mp-common/src/main/java/com/qs/mp/common/enums/AppSourceEnum.java

@@ -23,7 +23,12 @@ public enum AppSourceEnum implements IEnum<Integer> {
     /**
      * 支付宝盲票AppID
      */
-    ALI_MP(3, "2021003127607930", null);
+    ALI_MP(3, "2021003127607930", null),
+
+    /**
+     * 票赢填写AppID
+     */
+    CHANNEL(4, "wxc3a684f1196f6e15", "7708655ba65f04de2a42f23d20ab4134");
 
     private Integer value;
 

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -240,7 +240,7 @@ public class WalletServiceImpl implements IWalletService {
     if (bizType == BizTypeEnum.TICKET_ORDER || bizType == BizTypeEnum.DELIVER_ORDER) {
       appId = appSourceEnum.getAppId();
       // 区分微信小程序
-      if (AppSourceEnum.MSDQ.getValue().equals(appSourceEnum.getValue())) {
+      if (AppSourceEnum.MSDQ.equals(appSourceEnum)) {
         payShopNo = msdqPayShopNo;
         paySign = msdqPaySign;
       } else {