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

提货接口h5支付

See merge request quanshu/mp-server!1066

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

@@ -14,6 +14,7 @@ import com.qs.mp.admin.service.IGoodsService;
 import com.qs.mp.admin.service.IGoodsSkuService;
 import com.qs.mp.channel.domain.ChannelOrder;
 import com.qs.mp.channel.domain.param.OrderPayParam;
+import com.qs.mp.common.constant.PayConstants;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.core.redis.RedisCache;
@@ -370,11 +371,11 @@ public class UserDeliverOrderController extends BaseApiController {
         Long userId = SecurityUtils.getLoginUser().getUserId();
         SysUser sysUser = sysUserService.selectUserById(userId);
         String openId = "";
-        if (param.getPayType() == 1) {
+        if (PayConstants.ALI_PAY_TYPE.equals(param.getPayType())) {
             if (StringUtils.isBlank(sysUser.getAliuserId())) {
                 return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1026);
             }
-        } else {
+        } else if (PayConstants.WX_PAY_TYPE.equals(param.getPayType())) {
             AppSourceEnum appSourceEnum = AppSourceEnum.getByValue(param.getAppSource());
             if (AppSourceEnum.MSDQ.equals(appSourceEnum)) {
                 if (StringUtils.isBlank(sysUser.getMsdqOpenId())) {
@@ -397,6 +398,10 @@ public class UserDeliverOrderController extends BaseApiController {
                 jsonObject = walletService.directAliPay(BizTypeEnum.DELIVER_ORDER, param.getOrderId(),
                     sysUser.getAliuserId(),
                     deliverOrder.getPayAmt(), "盲票--提货订单");
+            } else if (PayConstants.H5_PAY_TYPE.equals(param.getPayType())) {
+                // h5支付
+                jsonObject = walletService.h5Pay(BizTypeEnum.DELIVER_ORDER, param.getOrderId(),
+                    deliverOrder.getPayAmt(), "盲票--提货订单");
             } else {
                 // 微信支付
                 jsonObject = walletService.pay(BizTypeEnum.DELIVER_ORDER, param.getOrderId(), openId,