积分商品

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -48,6 +48,10 @@ public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseV
     private Long totalDiscountAmount;
 
     /**
+     * 总积分
+     */
+    private Long totalScore;
+    /**
      * 新包装费（该字段给新版本前端展示，使其好计算）
      */
     private Long newPackAmount;

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

@@ -43,6 +43,11 @@ public class DefaultPromotionService implements IPromotionService {
         long totalOriginalAmount = 0L;
         long totalAmount = 0L;
         long totalPackgeAmount = 0L;
+
+        Map<String, ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods> map = new HashMap<>();
+        if(calculationDiscountResult !=null){
+            map = calculationDiscountResult.getGoods().stream().collect(Collectors.toMap(ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods :: getCartGoodsUid,Function.identity(), (k1, k2) -> k1));
+        }
         for (CartGoods cartGoods : cartGoodsList) {
             // 设置商品原价与商品现价的初始值
             long originalAmount = cartGoods.getOriginalPrice() * cartGoods.getQty();
@@ -54,10 +59,15 @@ public class DefaultPromotionService implements IPromotionService {
             cartGoods.setOriginalAmount(originalAmount);
             cartGoods.setAmount(amount);
             cartGoods.setPackPrice(packAmount);
+            if(map.get(cartGoods.getCartGoodsUid()) != null ){
+                cartGoods.setScore(map.get(cartGoods.getCartGoodsUid()).getScore());
+                cartGoods.setAmount(map.get(cartGoods.getCartGoodsUid()).getRealAmount());
+            }
         }
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(calculationDiscountResult == null ? totalOriginalAmount : calculationDiscountResult.getOriginalTotalAmount());
         shoppingCartGoodsResponseVo.setTotalAmount(calculationDiscountResult == null ? totalAmount : calculationDiscountResult.getTotalAmount());
         shoppingCartGoodsResponseVo.setNewPackAmount(totalPackgeAmount);
+//        shoppingCartGoodsResponseVo.setTotalScore(calculationDiscountResult == null ? 0L : calculationDiscountResult.getTotalScore());
         if (calculationDiscountResult == null) {
             shoppingCartGoodsResponseVo.setTotalDiscountAmount(0L);
         }else {