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

e4817b57 · 刘鹏飞 · bbccf1d8 · 4ac6c077 · e4817b57
Commit e4817b57 authored Dec 25, 2020 by 刘鹏飞
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

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

No files found.
--- a/order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
+++ b/order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
@@ -306,7 +306,7 @@ public class CheckOrder {
                }
            }
            //订单金额小于起送费提示
-            else if (2 == storeDeliveryInfoDto.getDeliveryCondition() && storeDeliveryInfoDto.getDeliveryLimitAmount() > shoppingCartGoodsDto.getTotalAmount()) {
+            else if ((2 == storeDeliveryInfoDto.getDeliveryCondition() && storeDeliveryInfoDto.getDeliveryLimitAmount() > shoppingCartGoodsDto.getTotalAmount()) && !cocoPartnerId.contains(createOrderVo.getPartnerId())) {
                throw new ServiceException(ResponseResult.STORE_DISCONTENT_DELIVERY_FEE);
            }