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

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

order-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -111,6 +111,10 @@ public class ShoppingCartInfoRequestVo {
     private String buyMonthlyCard;
 
     private String monthlyCardCode;
+    /**
+     *  是否为订单请求算价来源
+     */
+    private Integer isOrderReq = 0;
 
     @Data
     public final static class SendGoods {

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

@@ -607,6 +607,7 @@ public class CheckOrder {
                 .useCustomerScore(createOrderVo.getUseCustomerScore())
                 .buyMemberCard(buyMemberCard)
                 .menuType(createOrderVo.getMenuType())
+                .isOrderReq(1)
                 .build();
         // 如果使用优惠券或者商品券，校验 couponCode
         if (StringUtils.isNotBlank(createOrderVo.getCouponCode())) {

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java

@@ -139,6 +139,11 @@ public class ShoppingCartInfoRequestVo extends BaseRequestVo {
      */
     private String monthlyCardCode;
 
+    /**
+     *  是否为订单请求算价来源
+     */
+    private Integer isOrderReq = 0;
+
     @Data
     public final static class SendGoods {
         /**

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

@@ -2161,7 +2161,8 @@ 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())){
+            if (Objects.equals(shoppingCartInfoRequestVo.getFlag(), SubmitPageEnum.YES.getCode())
+                    || shoppingCartInfoRequestVo.getIsOrderReq().compareTo(1)==0){
                 Long originalTotalAmount = shoppingCartGoodsResponseVo.getOriginalTotalAmount() + packAmount;
                 Long totalAmount = shoppingCartGoodsResponseVo.getTotalAmount() + packAmount;
                 shoppingCartGoodsResponseVo.setOriginalTotalAmount(originalTotalAmount);