积分商品

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/calculate/ActivityCalculationDiscountResponseDto.java

@@ -52,10 +52,6 @@ public class ActivityCalculationDiscountResponseDto {
         private Long totalDiscountAmount;
 
         /**
-         * 总积分
-         */
-        private Long totalScore;
-        /**
          * 总的优惠信息集合
          */
         private List<Discount> discounts;
@@ -112,6 +108,13 @@ public class ActivityCalculationDiscountResponseDto {
          */
         private Long distributionFee;
 
+
+        //积分商品活动购物车商品所需总积分")
+        private Integer totalScore;
+
+        //用户积分是否足够，1-不够，默认0
+        private Integer isScoreLimit = 0;
+
         private SendPoint sendPointVo;
 
         /**

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

@@ -44,9 +44,13 @@ public class DefaultPromotionService implements IPromotionService {
         long totalAmount = 0L;
         long totalPackgeAmount = 0L;
 
+        Integer totalScore = 0;
+        Integer isScoreLimit = 0;
         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));
+            totalScore = calculationDiscountResult.getTotalScore();
+            isScoreLimit = calculationDiscountResult.getIsScoreLimit();
         }
         for (CartGoods cartGoods : cartGoodsList) {
             // 设置商品原价与商品现价的初始值
@@ -67,8 +71,8 @@ public class DefaultPromotionService implements IPromotionService {
         shoppingCartGoodsResponseVo.setOriginalTotalAmount(calculationDiscountResult == null ? totalOriginalAmount : calculationDiscountResult.getOriginalTotalAmount());
         shoppingCartGoodsResponseVo.setTotalAmount(calculationDiscountResult == null ? totalAmount : calculationDiscountResult.getTotalAmount());
         shoppingCartGoodsResponseVo.setNewPackAmount(totalPackgeAmount);
-        Long l = 0L;
-        shoppingCartGoodsResponseVo.setTotalScore(calculationDiscountResult == null ? l : calculationDiscountResult.getTotalScore());
+        shoppingCartGoodsResponseVo.setTotalScore(totalScore != null ? totalScore.longValue() : 0L );
+        shoppingCartGoodsResponseVo.setIsInsufficientScore(isScoreLimit != 0);
         if (calculationDiscountResult == null) {
             shoppingCartGoodsResponseVo.setTotalDiscountAmount(0L);
         }else {