积分商品

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -117,6 +117,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setPhotoUrl(cartGoods.getPhotoUrl());
         cartGoodsDetailDto.setPackPrice(cartGoods.getPackPrice());
         cartGoodsDetailDto.setSalePrice(cartGoods.getOriginalPrice());
+        cartGoodsDetailDto.setScore(cartGoods.getScore());
         cartGoodsDetailDto.setPicture(cartGoods.getPic());
         cartGoodsDetailDto.setQty(cartGoods.getQty());
         cartGoodsDetailDto.setActivityType(cartGoods.getActivityType());

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -145,6 +145,9 @@ public class ShoppingCartGoodsDto {
      */
     private Long payCardFee;
 
+    //积分商品使用总积分
+    private Long totalScore;
+
     @Data
     public static class CartGoodsDetailDto {
         /**
@@ -185,6 +188,9 @@ public class ShoppingCartGoodsDto {
          * 即促销价格，不包含订单级别优惠
          */
         private Long salePrice;
+
+        //商品总数使用积分
+        private Long score;
         /**
          * 商品图片
          */

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/user/GetUserScoreUseDetailRequest.java

@@ -26,5 +26,7 @@ public class GetUserScoreUseDetailRequest {
 
     private String MemberId;
 
+    private Integer useScore;
+
     private String PartnerId;
 }
\ No newline at end of file

shopping-cart-application-service/src/main/java/cn/freemud/enums/ActivityTypeEnum.java

@@ -29,6 +29,7 @@ public enum ActivityTypeEnum {
     TYPE_22(22, "单品立减"),
     TYPE_23(23, "超值加购"),
     TYPE_27(27, "促销会员价"),
+    TYPE_28(28, "积分商品活动"),
     /**
      * 优惠券
      */

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

@@ -46,6 +46,7 @@ public class CustomerScoreService implements IPromotionService {
         }
         GetUserScoreUseDetailRequest request = new GetUserScoreUseDetailRequest();
         request.setMemberId(userLoginInfoDto.getMemberId());
+        request.setUseScore(calculationDiscountResult != null ? calculationDiscountResult.getTotalScore() : 0);
         request.setPaidAmount(getValue(shoppingCartGoodsResponseVo.getTotalAmount()));
         request.setPartnerId(userLoginInfoDto.getPartnerId());
         GetUserScoreUserDetailResponse userScoreUseDetail = null;

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

@@ -14,10 +14,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -64,7 +61,13 @@ public class DefaultPromotionService implements IPromotionService {
             cartGoods.setAmount(amount);
             cartGoods.setPackPrice(packAmount);
             if(map.get(cartGoods.getCartGoodsUid()) != null ){
-                cartGoods.setScore(map.get(cartGoods.getCartGoodsUid()).getScore());
+                if(CollectionUtils.isNotEmpty(map.get(cartGoods.getCartGoodsUid()).getDiscounts())){
+                    for (ActivityCalculationDiscountResponseDto.CalculationDiscountResult.Goods.GoodsDiscount goodsDiscount : map.get(cartGoods.getCartGoodsUid()).getDiscounts()){
+                        if(Objects.equals(goodsDiscount.getType(),ActivityTypeEnum.TYPE_28.getCode())){
+                            cartGoods.setScore(map.get(cartGoods.getCartGoodsUid()).getScore()*map.get(cartGoods.getCartGoodsUid()).getActualGoodsNumber());
+                        }
+                    }
+                }
                 cartGoods.setAmount(map.get(cartGoods.getCartGoodsUid()).getRealAmount());
             }
         }

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

@@ -444,9 +444,7 @@ public class CalculationCommonService {
                 activityDiscountsDto.setActivityName(this.convertName(discount.getType(), discount.getActivityName()));
                 activityDiscountsDto.setActivityType(this.convertType(discount.getType()));
                 activityDiscountsDto.setDiscountAmount(discount.getDiscount().intValue());
-                if(cocoPartnerId.contains(partnerId)){
-                    activityDiscountsDto.setActualActivityGoodsNumber(discount.getActualGoodsNumber());
-                }
+                activityDiscountsDto.setActualActivityGoodsNumber(discount.getActualGoodsNumber());
                 activityDiscountsDtoList.add(activityDiscountsDto);
             }
         }