Merge branch 'feature/20210224-蜜雪下单前优惠券状态检查-lcf'

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -170,6 +170,7 @@ public enum ResponseResult {
     ORDER_CANCEL_ERROR_EXPECT_TIME("45067", "预约时间还剩15分钟，无法取消"),
     ORDER_CANCEL_ERROR_ESTIMATE_TIME("45068", "预计送达还剩30分钟，无法取消"),
     STORE_SELF_ERROR("45069", "请选择截止营业时间大于45分钟下单"),
+    COUPON_INVALID("45070", "券已锁定，请先支付或取消待支付订单"),
 
 
     /**

order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java

@@ -124,9 +124,8 @@ public class AppOrderServiceImpl implements AppOrderService {
             requestDto.setPartnerId(Integer.valueOf(createOrderVo.getPartnerId()));
             InvalidCouponsResponseDto invalidCouponsResponseDto = couponOnlineClient.invalidCoupons(requestDto);
             if (invalidCouponsResponseDto.getStatusCode() != 100 || invalidCouponsResponseDto.getData() == null || (invalidCouponsResponseDto.getData() != null && CollectionUtils.isEmpty(invalidCouponsResponseDto.getData().getInvalidCoupons()))){
-                return ResponseUtil.error(ShoppingCartConstant.COUPON_INVALID);
+                return ResponseUtil.error(ResponseResult.COUPON_INVALID.getCode(), ResponseResult.COUPON_INVALID.getMessage());
             }
-
         }
 
         OrderExtInfoDto extInfo = orderservice.getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo, shoppingCartGoodsDto);