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

Dev

See merge request quanshu/mp-server!281

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

@@ -175,6 +175,9 @@ public class UserDeliverOrderController extends BaseApiController {
     if (null == orderSettleVO) {
       return AjaxResult.error("订单已过期，请重新下单");
     }
+    if (null == orderSettleVO.getAddr()) {
+      return AjaxResult.error("请填写收货地址");
+    }
     String orderId = userDeliverOrderService.submitOrder(userId, orderSettleVO);
     JSONObject jsonObject = new JSONObject();
     jsonObject.put("orderId", orderId);

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

@@ -28,6 +28,7 @@ public enum ErrorCodeEnum {
   ERROR_CODE_1019(1019, "盲票未付款"),
   ERROR_CODE_1020(1020, "库存不足"),
   ERROR_CODE_1021(1021, "盲豆余额不足"),
+  ERROR_CODE_1022(1022, "订单支付中"),
   ;
   private int code;
   private String msg;

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderItemServiceImpl.java

@@ -2,6 +2,7 @@ package com.qs.mp.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.vo.TicketListVO;
+import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.TicketStatusEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
@@ -54,7 +55,7 @@ public class UserTicketOrderItemServiceImpl extends ServiceImpl<UserTicketOrderI
     List<TicketListVO> ticketListVOS = getBaseMapper().listMyTicketVO(new QueryWrapper<UserTicketOrderItem>()
         .eq("t1.user_id", userId).eq("t1.order_id", orderId).eq("t2.status", UserTicketOrderStatusEnum.FINISHED));
     if (CollectionUtils.isEmpty(ticketListVOS)) {
-      throw new ServiceException("订单不存在");
+      throw new ServiceException(ErrorCodeEnum.ERROR_CODE_1022);
     }
     return ticketListVOS.get(0);
   }