Price 价格服务的编写

promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/dal/mysql/mapper/activity/PromotionActivityMapper.java

@@ -1,5 +1,7 @@
 package cn.iocoder.mall.promotionservice.dal.mysql.mapper.activity;
 
+import cn.iocoder.mall.mybatis.core.query.QueryWrapperX;
+import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityListReqDTO;
 import cn.iocoder.mall.promotionservice.dal.mysql.dataobject.activity.PromotionActivityDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -26,4 +28,8 @@ public interface PromotionActivityMapper extends BaseMapper<PromotionActivityDO>
                               @Param("activityType") Integer activityType,
                               @Param("statuses") Collection<Integer> statuses);
 
+    default List<PromotionActivityDO> selectList(PromotionActivityListReqDTO listReqDTO) {
+        return selectList(new QueryWrapperX<PromotionActivityDO>().inIfPresent("id", listReqDTO.getActiveIds()));
+    }
+
 }

promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/manager/activity/PromotionActivityManager.java

@@ -0,0 +1,26 @@
+package cn.iocoder.mall.promotionservice.manager.activity;
+
+import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityListReqDTO;
+import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityRespDTO;
+import cn.iocoder.mall.promotionservice.service.activity.PromotionActivityService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+/**
+ * 促销活动 Manager
+ */
+@Service
+@Validated
+public class PromotionActivityManager {
+
+    @Autowired
+    private PromotionActivityService promotionActivityService;
+
+    public List<PromotionActivityRespDTO> listPromotionActivities(PromotionActivityListReqDTO listReqDTO) {
+        return promotionActivityService.listPromotionActivities(listReqDTO);
+    }
+
+}

promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/manager/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.mall.promotionservice.manager;

promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/manager/price/PriceManager.java

@@ -134,7 +134,7 @@ public class PriceManager {
                 continue;
             }
             // 设置优惠
-            item.setActivity(timeLimitedDiscount);
+            item.setActivityId(timeLimitedDiscount.getId());
             // 设置价格
             item.setBuyPrice(newBuyPrice);
             item.setBuyTotal(newBuyPrice * item.getBuyQuantity());
@@ -186,7 +186,7 @@ public class PriceManager {
             for (PromotionActivityRespDTO fullPrivilege : fullPrivileges) {
                 // 创建 fullPrivilege 对应的分组
                 PriceProductCalcRespDTO.ItemGroup itemGroup = new PriceProductCalcRespDTO.ItemGroup()
-                        .setActivity(fullPrivilege)
+                        .setActivityId(fullPrivilege.getId())
                         .setItems(new ArrayList<>());
                 // 筛选商品到分组中
                 for (Iterator<PriceProductCalcRespDTO.Item> iterator = items.iterator(); iterator.hasNext(); ) {
@@ -208,8 +208,9 @@ public class PriceManager {
             itemGroups.add(new PriceProductCalcRespDTO.ItemGroup().setItems(items));
         }
         // 计算每个分组的价格
+        Map<Integer, PromotionActivityRespDTO> activityMap = CollectionUtils.convertMap(activityList, PromotionActivityRespDTO::getId);
         for (PriceProductCalcRespDTO.ItemGroup itemGroup : itemGroups) {
-            itemGroup.setActivityDiscountTotal(calcSkuPriceByFullPrivilege(itemGroup));
+            itemGroup.setActivityDiscountTotal(calcSkuPriceByFullPrivilege(itemGroup, activityMap.get(itemGroup.getActivityId())));
         }
         // 返回结果
         return itemGroups;
@@ -227,11 +228,10 @@ public class PriceManager {
         throw new IllegalArgumentException(String.format("促销活动(%s) 可用范围的类型是不正确", activity.toString()));
     }
 
-    private Integer calcSkuPriceByFullPrivilege(PriceProductCalcRespDTO.ItemGroup itemGroup) {
-        if (itemGroup.getActivity() == null) {
+    private Integer calcSkuPriceByFullPrivilege(PriceProductCalcRespDTO.ItemGroup itemGroup, PromotionActivityRespDTO activity) {
+        if (itemGroup.getActivityId() == null) {
             return null;
         }
-        PromotionActivityRespDTO activity = itemGroup.getActivity();
         Assert.isTrue(PromotionActivityTypeEnum.FULL_PRIVILEGE.getValue().equals(activity.getActivityType()),
                 "传入的必须的满减送活动必须是满减送");
         // 获得优惠信息
@@ -246,7 +246,8 @@ public class PriceManager {
                     if (MeetTypeEnum.QUANTITY.getValue().equals(privilege.getMeetType())) {
                         return itemCnt >= privilege.getMeetValue();
                     }
-                    throw new IllegalArgumentException(String.format("满减送活动(%s) 的匹配(%s)不正确", itemGroup.getActivity().toString(), privilege.toString()));
+                    throw new IllegalArgumentException(String.format("满减送活动(%s) 的匹配(%s)不正确",
+                            activity.toString(), privilege.toString()));
                 }).collect(Collectors.toList());
         // 获得不到优惠信息，返回原始价格
         if (privileges.isEmpty()) {

promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/rpc/activity/PromotionActivityRpcImpl.java

@@ -0,0 +1,26 @@
+package cn.iocoder.mall.promotionservice.rpc.activity;
+
+import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.mall.promotion.api.rpc.activity.PromotionActivityRpc;
+import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityListReqDTO;
+import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityRespDTO;
+import cn.iocoder.mall.promotionservice.manager.activity.PromotionActivityManager;
+import org.apache.dubbo.config.annotation.DubboService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+import static cn.iocoder.common.framework.vo.CommonResult.success;
+
+@DubboService
+public class PromotionActivityRpcImpl implements PromotionActivityRpc {
+
+    @Autowired
+    private PromotionActivityManager promotionActivityManager;
+
+    @Override
+    public CommonResult<List<PromotionActivityRespDTO>> listPromotionActivities(PromotionActivityListReqDTO listReqDTO) {
+        return success(promotionActivityManager.listPromotionActivities(listReqDTO));
+    }
+
+}

promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/rpc/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.mall.promotionservice.rpc;

promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/service/activity/PromotionActivityService.java

@@ -2,6 +2,7 @@ package cn.iocoder.mall.promotionservice.service.activity;
 
 import cn.iocoder.mall.promotion.api.enums.PromotionActivityTypeEnum;
 import cn.iocoder.mall.promotion.api.enums.RangeTypeEnum;
+import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityListReqDTO;
 import cn.iocoder.mall.promotion.api.rpc.activity.dto.PromotionActivityRespDTO;
 import cn.iocoder.mall.promotionservice.convert.activity.PromotionActivityConvert;
 import cn.iocoder.mall.promotionservice.dal.mysql.dataobject.activity.PromotionActivityDO;
@@ -25,24 +26,15 @@ public class PromotionActivityService {
     @Autowired
     private PromotionActivityMapper promotionActivityMapper;
 
-    /**
-     * 获取指定商品
-     *
-     * @param spuId
-     * @param activityStatuses
-     * @return
-     */
+    public List<PromotionActivityRespDTO> listPromotionActivities(PromotionActivityListReqDTO listReqDTO) {
+        List<PromotionActivityDO> activityList = promotionActivityMapper.selectList(listReqDTO);
+        return PromotionActivityConvert.INSTANCE.convertList(activityList);
+    }
+
     public List<PromotionActivityRespDTO> listPromotionActivitiesBySpuId(Integer spuId, Collection<Integer> activityStatuses) {
         return this.listPromotionActivitiesBySpuIds(Collections.singleton(spuId), activityStatuses);
     }
 
-    /**
-     *
-     *
-     * @param spuIds
-     * @param activityStatuses
-     * @return
-     */
     public List<PromotionActivityRespDTO> listPromotionActivitiesBySpuIds(Collection<Integer> spuIds, Collection<Integer> activityStatuses) {
         if (spuIds.isEmpty() || activityStatuses.isEmpty()) {
             return Collections.emptyList();

promotion-service-project/promotion-service-app/src/main/java/cn/iocoder/mall/promotionservice/service/recommend/ProductRecommendService.java

@@ -13,7 +13,7 @@ import cn.iocoder.mall.promotionservice.dal.mysql.mapper.recommend.ProductRecomm
 import cn.iocoder.mall.promotionservice.service.recommend.bo.ProductRecommendAddBO;
 import cn.iocoder.mall.promotionservice.service.recommend.bo.ProductRecommendBO;
 import cn.iocoder.mall.promotionservice.service.recommend.bo.ProductRecommendUpdateBO;
-import org.apache.dubbo.config.annotation.Reference;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -25,7 +25,7 @@ import java.util.List;
 @Validated
 public class ProductRecommendService {
 
-    @Reference(validation = "true", version = "${dubbo.consumer.ProductSpuService.version}")
+    @DubboReference(validation = "true", version = "${dubbo.consumer.ProductSpuRpc.version}")
     private ProductSpuRpc productSpuRpc;
 
     @Autowired