fix 商品券入机修改

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

@@ -162,6 +162,10 @@ public class CouponDiscountCalculation {
         for (ShoppingCartGoodsDto.CartGoodsDetailDto cartGoods : shoppingCartGoodsDto.getProducts()) {
             //商品券商品
             if (StringUtils.isNotEmpty(cartGoods.getCouponCode())) {
+
+                if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
+                    continue;
+                }
                 List<ActivityDiscountsDto> productActivityDiscountsDtos = new ArrayList<>();
                 if (CollectionUtils.isNotEmpty(discounts)) {
                     for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount couponDiscount : discounts) {
@@ -171,22 +175,12 @@ 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) {
+                            Integer extendType = couponDiscount.getExtendType();
+                            activityDiscountsDto.setExtendType(extendType);
                             activityDiscountsDto.setTenderId(goodsMap.get(cartGoods.getCartGoodsUid()).getArtNo());
-                            }
                             productActivityDiscountsDtos.add(activityDiscountsDto);
 
-                            cartGoods.setTotalDiscountAmount(-activityDiscountsDto.getDiscountAmount());
-                            cartGoods.setSalePrice(0L);
-                            cartGoods.setActivityDiscountsDtos(productActivityDiscountsDtos);
-                        }
-                    }
-                }
-
-                if (goodsMap.get(cartGoods.getCartGoodsUid()) == null) {
-                    continue;
-                }
+                            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(),
@@ -195,6 +189,17 @@ public class CouponDiscountCalculation {
                                     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);
+                        }
+                    }
+                }
+
             }
         }