Merge branch 'KA-20210722-自提根据模板配置计算餐具包装费ID1033456-zxh' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

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

@@ -50,7 +50,6 @@ import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformIapp
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerStoreDeliveryConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.application.sdk.api.base.BaseResponse;
-import com.freemud.application.sdk.api.log.ApiLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressRequest;
 import com.freemud.application.sdk.api.membercenter.request.StatisticalPropertyRequest;
@@ -603,7 +602,7 @@ public class CheckOrder {
                 .useCustomerScore(createOrderVo.getUseCustomerScore())
                 .buyMemberCard(buyMemberCard)
                 .menuType(createOrderVo.getMenuType())
-                .isOrderReq(1)
+//                .isOrderReq(0)
                 .build();
         // 如果使用优惠券或者商品券，校验 couponCode
         if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -1528,6 +1528,10 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (activityCalculationDiscountResponseDto != null && StringUtils.equals(activityCalculationDiscountResponseDto.getStatusCode(), "103")) {
             throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_CAN_NOT_USE_THIS_SHOP);
         }
+        // 新增算价失败提示
+        if (activityCalculationDiscountResponseDto != null && StringUtils.equals(activityCalculationDiscountResponseDto.getStatusCode(), "104")){
+            throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_CAN_NOT_USE_THIS_SHOP,activityCalculationDiscountResponseDto.getMsg());
+        }
         throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
     }
 
@@ -2170,8 +2174,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             //fisherman 【ID1033456】自提根据模板配置计算餐具包装费
             Long packAmount = commonFunctionHandle.getPackAmountByStoreConfig(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo.getNewPackAmount());
             shoppingCartGoodsResponseVo.setNewPackAmount(packAmount);
-            if (Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.YES.getCode())
-                    || shoppingCartInfoRequestVo.getIsOrderReq().compareTo(1)==0){
+            if (Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.YES.getCode())){
                 Long originalTotalAmount = shoppingCartGoodsResponseVo.getOriginalTotalAmount() + packAmount;
                 Long totalAmount = shoppingCartGoodsResponseVo.getTotalAmount() + packAmount;
                 shoppingCartGoodsResponseVo.setOriginalTotalAmount(originalTotalAmount);