Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'qa' of…

Merge branches 'feature/20211014_餐盒费规则配置_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

shopping-cart-application-service/src/main/java/cn/freemud/handle/CommonFunctionHandle.java

@@ -40,9 +40,6 @@ public class CommonFunctionHandle {
     public Long packAmountConfig(ShoppingCartInfoRequestVo shoppingCartInfoRequestVo, Long newPackAmount,Long totalAmount) {
         if (Objects.equals(shoppingCartInfoRequestVo.getOrderType(), CreateOrderType.TAKE_OUT.getCode())
                 || Objects.equals(shoppingCartInfoRequestVo.getReachStoreType(), OrderType.COLLECT_GOODS.getCode())) {
-            if(newPackAmount == 0){
-                return newPackAmount;
-            }
             String redisKey = RedisUtil.packAmountConfig + shoppingCartInfoRequestVo.getPartnerId() + "_" + null;
             String value = redisCache.hashGet(redisKey, "packAmountType");
             if(StringUtils.isEmpty(value)){