Merge branch '202110090-修复会员价套餐购物车不展示标签问题-zhiwei.zha' into qa

order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreBaseApiClient.java

 package cn.freemud.service.thirdparty;
 
 import cn.freemud.annotations.LogIgnoreFeign;
+import cn.freemud.entities.dto.store.GetEstimateDeliveryRequest;
 import cn.freemud.entities.dto.store.StoreCBaseResponse;
 import cn.freemud.entities.dto.store.StoreCBaseResponseDto;
-import cn.freemud.entities.dto.store.StoreInfoRequestDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,5 +22,5 @@ public interface StoreBaseApiClient {
 
     @LogIgnoreFeign(logMessage="queryDeliverDetail")
     @PostMapping(value = "/delivery/calcDeliveryData")
-    StoreCBaseResponse<StoreCBaseResponseDto> queryDeliverDetail(@RequestBody StoreInfoRequestDto request);
+    StoreCBaseResponse<StoreCBaseResponseDto> queryDeliverDetail(@RequestBody GetEstimateDeliveryRequest request);
 }

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

@@ -96,10 +96,11 @@ public class MemberDiscountServiceImpl implements IPromotionService {
         for (CartGoods cartGoods : cartGoodsList) {
             //优惠总价
             ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = result.get(cartGoods.getCartGoodsUid());
-            //老促销计算价格接口套餐价购物车内部计算价格，已在套餐实现类计算好价格，这里无需再扣减
-            if (goodsDiscount != null && goodsDiscount.getDiscount() > 0 && CollectionUtils.isEmpty(cartGoods.getProductComboList())
-                    && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
-                cartGoods.setAmount(cartGoods.getAmount() - goodsDiscount.getDiscount());
+            if (goodsDiscount != null && goodsDiscount.getDiscount() > 0) {
+                //老促销计算价格接口套餐价购物车内部计算价格，已在套餐实现类计算好价格，这里无需再扣减
+                if (CollectionUtils.isEmpty(cartGoods.getProductComboList()) && CollectionUtils.isEmpty(cartGoods.getProductGroupList())) {
+                    cartGoods.setAmount(cartGoods.getAmount() - goodsDiscount.getDiscount());
+                }
                 cartGoods.setCurrentMemberLevel(goodsDiscount.getCurrentMembershipLevel());
             }
         }