选中优惠券赋值

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

@@ -100,6 +100,19 @@ public class CouponPromotionService implements IPromotionService {
                     couponDiscount = couponDiscount + (couponResults.getDiscountAmount() == null ? 0 : couponResults.getDiscountAmount());
                 }
             }
+            if (CollectionUtils.isNotEmpty(calculationDiscountResult.getDiscounts())) {
+                //选中优惠券赋值
+                List<ChooseCouponVo> couponCodes = new ArrayList<>();
+                for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){
+                    for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Discount discount : calculationDiscountResult.getDiscounts()){
+                        if(chooseCouponVo.getCouponCode().equals(discount.getActivityCode())){
+                            couponCodes.add(chooseCouponVo);
+                            break;
+                        }
+                    }
+                }
+                shoppingCartGoodsResponseVo.setCouponCodes(couponCodes);
+            }
         }
         shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);
 

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

@@ -771,7 +771,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
             setAddAndUpdateResponse(shoppingCartGoodsResponseVo, calculationDiscountResult, cartGoodsList, shoppingCartGoodsResponseVo.getToastMsg(), partnerId, storeId, userId, ShoppingCartConstant.QUERY_INFO, shoppingCartInfoRequestVo);
             // 在原价、现价、折扣价上增加第一次使用会员卡的费用
             this.addNeedCardAmount(shoppingCartInfoRequestVo, shoppingCartGoodsResponseVo);
-
         }
         // 添加购物车商品总价和加价购商品总价,现在是自己计算,后面需要优化为促销计算, 这段要删除
         shoppingCartGoodsResponseVo.setShoppingCartGoodsAmount(0L);
@@ -822,8 +821,6 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (!checkAvailableCoupon(shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getCouponCode())) {
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_NOT_USE);
         }
-        // TODO: 21-7-15 待优化
-        shoppingCartGoodsResponseVo.setCouponCodes(shoppingCartInfoRequestVo.getCouponCodes());
         return ResponseUtil.success(shoppingCartGoodsResponseVo);
     }
 

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/CouponSharingService.java

@@ -93,6 +93,17 @@ public class CouponSharingService {
             List<Integer> asList = Arrays.asList( ActivityTypeEnum.TYPE_3.getCode(),  ActivityTypeEnum.TYPE_31.getCode(), ActivityTypeEnum.TYPE_34.getCode());
             List<CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount> couponResultsList = calculationDiscountResult.getDiscounts();
             couponDiscount = couponResultsList.stream().filter(d -> asList.contains(d.getType())).mapToLong(d -> d.getDiscount().longValue()).sum();
+            //选中优惠券赋值
+            List<ChooseCouponVo> couponCodes = new ArrayList<>();
+            for (ChooseCouponVo chooseCouponVo : shoppingCartInfoRequestVo.getCouponCodes()){
+                for (CalculationSharingDiscountResponseDto.CalculationDiscountResult.Discount discount : couponResultsList){
+                    if(chooseCouponVo.getCouponCode().equals(discount.getActivityCode())){
+                        couponCodes.add(chooseCouponVo);
+                        break;
+                    }
+                }
+            }
+            shoppingCartGoodsResponseVo.setCouponCodes(couponCodes);
         }
         shoppingCartGoodsResponseVo.setCouponDiscount(couponDiscount);