Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!844

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-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;