Merge remote-tracking branch 'origin/qa' into qa

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

@@ -304,22 +304,21 @@ public class CheckOrder {
                 }
             }
             //todo : 这里不再支持从表中获取门店配送信息 改用接口方式调用
-            if (!storeDeliveryUseOld) {
-                //外卖起送条件（1:杯数，2:金额）
-                if (!Arrays.asList(1, 2).contains(storeDeliveryInfoDto.getDeliveryCondition())) {
-                    throw new ServiceException(ResponseResult.STORE_DISCONTENT_DELIVERY_CONDITION);
-                }
-                if (1 == storeDeliveryInfoDto.getDeliveryCondition()) {
-                    int sum = shoppingCartGoodsDto.getProducts().stream().mapToInt(ShoppingCartGoodsDto.CartGoodsDetailDto::getQty).sum();
-                    if (sum < storeDeliveryInfoDto.getFreeDeliveryCup()) {
-                        throw new ServiceException(ResponseResult.STORE_DISCONTENT_DELIVERY_CUP);
-                    }
-                }
-                //订单金额小于起送费提示
-                else if ((2 == storeDeliveryInfoDto.getDeliveryCondition() && storeDeliveryInfoDto.getDeliveryLimitAmount() > shoppingCartGoodsDto.getTotalAmount()) && !cocoPartnerId.contains(createOrderVo.getPartnerId())) {
-                    throw new ServiceException(ResponseResult.STORE_DISCONTENT_DELIVERY_FEE);
+            //外卖起送条件（1:杯数，2:金额）
+            if (!Arrays.asList(1, 2).contains(storeDeliveryInfoDto.getDeliveryCondition())) {
+                throw new ServiceException(ResponseResult.STORE_DISCONTENT_DELIVERY_CONDITION);
+            }
+            if (1 == storeDeliveryInfoDto.getDeliveryCondition()) {
+                int sum = shoppingCartGoodsDto.getProducts().stream().mapToInt(ShoppingCartGoodsDto.CartGoodsDetailDto::getQty).sum();
+                if (sum < storeDeliveryInfoDto.getFreeDeliveryCup()) {
+                    throw new ServiceException(ResponseResult.STORE_DISCONTENT_DELIVERY_CUP);
                 }
             }
+            //订单金额小于起送费提示
+            else if ((2 == storeDeliveryInfoDto.getDeliveryCondition() && storeDeliveryInfoDto.getDeliveryLimitAmount() > shoppingCartGoodsDto.getTotalAmount()) && !cocoPartnerId.contains(createOrderVo.getPartnerId())) {
+                throw new ServiceException(ResponseResult.STORE_DISCONTENT_DELIVERY_FEE);
+            }
+
             storeDeliveryInfoDto.setEnableTakeaway(true);
             // 校验收货地址是否可配送 fisherman -> 获取门店预计送达时间
             checkReceiveAddress(storeDeliveryInfoDto, createOrderVo,storeResponseDto.getStoreCode());