Merge remote-tracking branch 'origin/qa' into qa

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -2,6 +2,7 @@ package cn.freemud.service.impl.mcoffee.calculation;
 
 import cn.freemud.adapter.ActivityAdapter;
 import cn.freemud.adapter.ShoppingCartConvertAdapter;
+import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.constant.ResponseCodeConstant;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
@@ -15,6 +16,7 @@ import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
+import cn.freemud.service.impl.ItemServiceImpl;
 import cn.freemud.service.thirdparty.ActivityClient;
 import cn.freemud.utils.PropertyConvertUtil;
 import com.freemud.application.sdk.api.log.ErrorLog;
@@ -77,6 +79,8 @@ public class CalculationServiceImpl {
 
     @Autowired
     private ShoppingCartConvertAdapter shoppingCartConvertAdapter;
+    @Autowired
+    private ItemServiceImpl itemService;
 
     /**
      * 更新购物车行优惠信息
@@ -235,6 +239,18 @@ public class CalculationServiceImpl {
             }
         }
 
+        List<ShoppingCartGoodsDto.CartGoodsDetailDto> products = shoppingCartGoodsDto.getProducts();
+        List<String> productIds = products.stream().map(t -> t.getSkuId()).collect(Collectors.toList());
+
+        //调用商品的接口获取商品键位
+        BaseResponse<Map<String, GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean>> baseResponse = itemService.getProducts(shoppingCartInfoRequestVo.getPartnerId(),
+                shoppingCartInfoRequestVo.getShopId(), productIds, false, shoppingCartInfoRequestVo.getMenuType());
+        if (ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) && baseResponse.getResult() != null){
+            for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods: products) {
+                GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean productBean = baseResponse.getResult().get(cartGoods.getSkuId());
+                cartGoods.setProductCode(productBean.getCustomerCode());
+            }
+        }
 
 //        fullPromotionCalculation.updateShoppingCartGoodsApportion(shoppingCartGoodsResponseVo, calculationDiscountResult, shoppingCartGoodsDto,premiumExchangeActivity,shoppingCartInfoRequestVo);
         //限时特价

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java

 package cn.freemud.service.impl.mcoffee.calculation;
 
 import cn.freemud.adapter.CouponAdapter;
-import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.DateUtil;
-import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.GetMemberCouponListRequestDto;
+import cn.freemud.entities.dto.GetMemberCouponListResponseDto;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.service.CommonService;
-import cn.freemud.service.impl.ItemServiceImpl;
 import cn.freemud.service.impl.mcoffee.entity.CouponAvailableReq;
 import cn.freemud.service.impl.mcoffee.entity.CouponAvailableResp;
 import cn.freemud.service.impl.mcoffee.entity.CouponProductVo;
@@ -51,8 +51,6 @@ public class CouponDiscountCalculation {
 
     @Autowired
     private CustomerExtendClient customerExtendClient;
-    @Autowired
-    private ItemServiceImpl itemService;
 
     @Autowired
     private CommonService commonService;
@@ -196,26 +194,13 @@ public class CouponDiscountCalculation {
                             activityDiscountsDto.setExtendType(extendType);
                             activityDiscountsDto.setTenderId(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
                             productActivityDiscountsDtos.add(activityDiscountsDto);
-
-                            if (extendType != null && extendType == 4 ) {
-                                //调用商品的接口获取商品键位
-                                List<String> productIds=Arrays.asList(cartGoods.getSkuId());
-                                BaseResponse<Map<String, GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean>> baseResponse = itemService.getProducts(shoppingCartInfoRequestVo.getPartnerId(),
-                                        shoppingCartInfoRequestVo.getShopId(), productIds, false, shoppingCartInfoRequestVo.getMenuType());
-                                if (ResponseResult.SUCCESS.getCode().equals(baseResponse.getCode()) && baseResponse.getResult() != null){
-                                    GetMenuResponseDto.DataBean.RootNodeBean.ChildrenBeanFirst.ChildrenBeanSecond.ProductBean productBean = baseResponse.getResult().get(cartGoods.getSkuId());
-                                    cartGoods.setCustomerCode(productBean.getCustomerCode());
-                                }
-                            }else {
-                                cartGoods.setCustomerCode(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
-                            }
-
                             cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
                             cartGoods.setSalePrice(0L);
                             cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos);
                         }
                     }
                 }
+                cartGoods.setCustomerCode(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
 
             }
         }