Merge branch 'KA-起送价是否按照原价计算-20210918-zxh'

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

@@ -81,6 +81,7 @@ import com.freemud.sdk.api.assortment.shoppingcart.enums.BusinessTypeEnum;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
 import com.freemud.sdk.api.assortment.shoppingcart.service.ShoppingCartBaseService;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
+import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import javafx.util.Pair;
 import ma.glasnost.orika.MapperFacade;
@@ -873,9 +874,11 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
                 chooseSendGoodList = products.stream().filter(p -> sendGoodsIdList.contains(p.getSkuId()) || sendGoodsIdList.contains(p.getSpuId())).collect(toList());
                 long sendGoodsAmount = chooseSendGoodList.stream().mapToLong(PremiumExchangeResponseVo.PremiumExchangeProduct::getNowPrice).sum();
                 shoppingCartGoodsResponseVo.setSendGoodsAmount(sendGoodsAmount);
-                // fisherman 需要加上原价-->
-                long sendOriginalGoodsAmount = chooseSendGoodList.stream().mapToLong(PremiumExchangeResponseVo.PremiumExchangeProduct::getOriginalPrice).sum();
-                shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(shoppingCartGoodsResponseVo.getShoppingCartOriginalGoodsAmount() + sendOriginalGoodsAmount);
+                // fisherman 需要加上原价-->  新算价已经在促销加过, 不需要再加
+                if (!grayPush(partnerId, storeId, "2")) {
+                    long sendOriginalGoodsAmount = chooseSendGoodList.stream().mapToLong(PremiumExchangeResponseVo.PremiumExchangeProduct::getOriginalPrice).sum();
+                    shoppingCartGoodsResponseVo.setShoppingCartOriginalGoodsAmount(shoppingCartGoodsResponseVo.getShoppingCartOriginalGoodsAmount() + sendOriginalGoodsAmount);
+                }
             }
             updateForPopupWindow(shoppingCartGoodsResponseVo, premiumExchangeResponseVoBaseResponse.getResult().getShowType(), chooseSendGoodList, shoppingCartInfoRequestVo.getSendGoods());
         }