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

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

@@ -868,7 +868,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             }
             BaseResponse<PremiumExchangeResponseVo> premiumExchangeResponseVoBaseResponse = premiumExchange(request);
             List<PremiumExchangeResponseVo.PremiumExchangeProduct> chooseSendGoodList = null;
-            ShoppingSdkLogUtil.printLog("fisherman 新算价日志查询:", JSON.toJSONString(premiumExchangeResponseVoBaseResponse),JSON.toJSONString(shoppingCartGoodsResponseVo));
             if (premiumExchangeResponseVoBaseResponse != null && ResponseResult.SUCCESS.getCode().equals(premiumExchangeResponseVoBaseResponse.getCode())
                     && premiumExchangeResponseVoBaseResponse.getResult() != null && CollectionUtils.isNotEmpty(premiumExchangeResponseVoBaseResponse.getResult().getProducts())) {
                 List<PremiumExchangeResponseVo.PremiumExchangeProduct> products = premiumExchangeResponseVoBaseResponse.getResult().getProducts();
@@ -876,9 +875,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());
         }