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

提货订单增加支付宝

See merge request quanshu/mp-server!811

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

@@ -314,13 +314,25 @@ public class UserDeliverOrderController extends BaseApiController {
   public AjaxResult pay(@Valid @RequestBody OrderPayParam param) {
     Long userId = SecurityUtils.getLoginUser().getUserId();
     SysUser sysUser = sysUserService.selectUserById(userId);
-    if (StringUtils.isBlank(sysUser.getOpenId())) {
-      return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+    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);
+      }
     }
     UserDeliverOrder deliverOrder = userDeliverOrderService.getById(param.getOrderId());
     JSONObject jsonObject;
     try {
-      jsonObject = walletService.pay(BizTypeEnum.DELIVER_ORDER, param.getOrderId(), sysUser.getOpenId(), deliverOrder.getPayAmt(), "盲票--提货订单");
+      if (param.getPayType() == 1) {
+        // 支付宝支付
+        jsonObject = walletService.aliPay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), sysUser.getAliuserId(), deliverOrder.getPayAmt(), "盲票--提货订单");
+      } else {
+        // 微信支付
+        jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), sysUser.getOpenId(), deliverOrder.getPayAmt(), "盲票--提货订单");
+      }
     }catch (ServiceException e) {
       LogUtil.error(logger, e, "根据提货单创建支付单失败。userId:{0},orderId:{1}", new Object[]{userId, param.getOrderId()});
       return AjaxResult.error(e.getMessage());