Merge branch '2020/09/24-运费券-huiyang' into qa

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

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

@@ -127,9 +127,9 @@ public class CouponDiscountCalculation {
                     continue;
                 }
                 cartGoods.setAmount(goodsMap.get(cartGoods.getCartGoodsUid()).getRealAmount());
-                List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discounts = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();
-                if (CollectionUtils.isNotEmpty(discounts)) {
-                    ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discounts.stream().filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())).findFirst().get();
+                List<ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount> discountsNew = goodsMap.get(cartGoods.getCartGoodsUid()).getDiscounts();
+                if (CollectionUtils.isNotEmpty(discountsNew)) {
+                    ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount = discountsNew.stream().filter(t -> ActivityTypeEnum.TYPE_32.getCode().equals(t.getType())).findFirst().get();
                     cartGoods.setCouponName(goodsDiscount.getActivityName());
                 }
             }
@@ -179,6 +179,10 @@ public class CouponDiscountCalculation {
         for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
             //商品券商品
             if (StringUtils.isNotEmpty(cartGoods.getCouponCode()) || discount != null) {
+
+                if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
+                    continue;
+                }
                 List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>();
                 if (CollectionUtils.isNotEmpty(discounts)) {
                     for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount couponDiscount : discounts) {
@@ -188,12 +192,24 @@ public class CouponDiscountCalculation {
                             activityDiscountsDto.setActivityName(couponDiscount.getActivityName());
                             activityDiscountsDto.setActivityType(couponDiscount.getType());
                             activityDiscountsDto.setDiscountAmount(0 - couponDiscount.getDiscount());
-                            activityDiscountsDto.setExtendType(couponDiscount.getExtendType());
-                            if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
-                                activityDiscountsDto.setTenderId(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
-                            }
+                            Integer extendType = couponDiscount.getExtendType();
+                            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);
@@ -201,17 +217,6 @@ public class CouponDiscountCalculation {
                     }
                 }
 
-                if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
-                    continue;
-                }
-                //调用商品的接口获取商品键位
-                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());
-                }
             }
         }