Merge branch 'feature/new-fixbig'

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

@@ -1859,7 +1859,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
     public boolean grayPush(String partnerId, String storeId, String version) {
 
         if (StringUtils.isBlank(sharing)) return false;
-
         CalculateCenter center = JSON.parseObject(sharing, CalculateCenter.class);
         Boolean enable = false;
         if (!center.getEnable()) return false;
@@ -1868,21 +1867,15 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 enable = true;
                 break;
             case 1: {
-                if (StringUtils.isBlank(center.getPartnerId())) {
-                    enable = false;
-                } else {
-                    if (Arrays.asList(center.getPartnerId().split(",")).contains(partnerId)) {
+                //商户+门店级别
+                String real = partnerId.concat(storeId);
+                if (Arrays.asList(center.getGrayList().split(",")).contains(real)) {
                     enable = true;
-                    } else {
-                        enable = false;
                 }
-                    if (Arrays.asList(center.getStoreId().split(",")).contains(storeId)) {
+                //商户级别
+                else if (Arrays.asList(center.getGrayList().split(",")).contains(partnerId)) {
                     enable = true;
-                    } else {
-                        enable = false;
-                    }
                 }
-                break;
             }
         }
         if (center.getEnable() && enable) {

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

@@ -22,12 +22,7 @@ public class CalculateCenter {
     /**
      * 商户
      */
-    private String partnerId;
-
-    /**
-     * 门店
-     */
-    private String storeId;
+    private String grayList;
 
     /**
      * 是否启用新的算价中心

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

@@ -202,6 +202,7 @@ public class CalculationSharingDiscountService {
         }
 
     }
+
     /**
      * 实物商品
      * @param calculationDiscountGoodsList
@@ -209,11 +210,18 @@ public class CalculationSharingDiscountService {
      */
     private void setCommonDiscountGoods(List<CalculationSharingDiscountRequestDto.CalculationDiscountGoods> calculationDiscountGoodsList
             , CartGoods cartGoods) {
+
         CalculationSharingDiscountRequestDto.CalculationDiscountGoods calculationDiscountGoods = new CalculationSharingDiscountRequestDto.CalculationDiscountGoods();
         calculationDiscountGoods.setGoodsId(cartGoods.getGoodsId());
         calculationDiscountGoods.setCartGoodsUid(cartGoods.getCartGoodsUid());
         calculationDiscountGoods.setGoodsQuantity(cartGoods.getQty());
+        //if (cartGoods.getGoodsType().equals(GoodsTypeEnum.SET_MEAL_GOODS))
+        if (CollectionUtils.isNotEmpty(cartGoods.getProductGroupList()) || CollectionUtils.isNotEmpty(cartGoods.getProductComboList())) {
+            calculationDiscountGoods.setOriginalPrice(cartGoods.getFinalPrice()!=null ? cartGoods.getFinalPrice() : cartGoods.getOriginalPrice());
+        }
+        else {
             calculationDiscountGoods.setOriginalPrice(cartGoods.getOriginalPrice());
+        }
         calculationDiscountGoods.setMemberDiscount(cartGoods.getMemberDiscount());
         calculationDiscountGoods.setSpuId(cartGoods.getSpuId());
         //商品加料