BJ_ZTEITS-Developers / parking-cloud-yudao

Commit caf49aae352ac6e131b07d4a96d9cd1a4aa63d28

Authored by YunaiV
2 parents 3278d38c f6a6a1ff

Merge branch 'develop' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into master-jdk17 

# Conflicts:
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
Inline Side-by-side
Showing 107 changed files with 2743 additions and 1593 deletions

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 107 files are displayed.

yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/collection/CollectionUtils.java
  View file @caf49aa
... ... @@ -290,7 +290,15 @@ public class CollectionUtils {
290 290 return valueFunc.apply(t);
291 291 }
292 292  
293   - public static <T, V extends Comparable<? super V>> V getSumValue(List<T> from, Function<T, V> valueFunc,
  293 + public static <T, V extends Comparable<? super V>> T getMinObject(List<T> from, Function<T, V> valueFunc) {
  294 + if (CollUtil.isEmpty(from)) {
  295 + return null;
  296 + }
  297 + assert from.size() > 0; // 断言，避免告警
  298 + return from.stream().min(Comparator.comparing(valueFunc)).get();
  299 + }
  300 +
  301 + public static <T, V extends Comparable<? super V>> V getSumValue(Collection<T> from, Function<T, V> valueFunc,
294 302 BinaryOperator<V> accumulator) {
295 303 return getSumValue(from, valueFunc, accumulator, null);
296 304 }
... ...
yudao-module-mall/yudao-module-product-api/src/main/java/cn/iocoder/yudao/module/product/api/spu/ProductSpuApi.java
  View file @caf49aa
... ... @@ -4,6 +4,9 @@ import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
4 4  
5 5 import java.util.Collection;
6 6 import java.util.List;
  7 +import java.util.Map;
  8 +
  9 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
7 10  
8 11 /**
9 12 * 商品 SPU API 接口
... ... @@ -22,6 +25,16 @@ public interface ProductSpuApi {
22 25 List<ProductSpuRespDTO> getSpuList(Collection<Long> ids);
23 26  
24 27 /**
  28 + * 批量查询 SPU MAP
  29 + *
  30 + * @param ids SPU 编号列表
  31 + * @return SPU MAP
  32 + */
  33 + default Map<Long, ProductSpuRespDTO> getSpusMap(Collection<Long> ids) {
  34 + return convertMap(getSpuList(ids), ProductSpuRespDTO::getId);
  35 + }
  36 +
  37 + /**
25 38 * 批量查询 SPU 数组，并且校验是否 SPU 是否有效。
26 39 *
27 40 * 如下情况，视为无效：
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/AppProductSpuController.java
  View file @caf49aa
... ... @@ -4,10 +4,6 @@ import cn.hutool.core.collection.CollUtil;
4 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 6 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
7   -import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
8   -import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
9   -import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
10   -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
11 7 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuDetailRespVO;
12 8 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuPageReqVO;
13 9 import cn.iocoder.yudao.module.product.controller.app.spu.vo.AppProductSpuRespVO;
... ... @@ -51,11 +47,6 @@ public class AppProductSpuController {
51 47 @Resource
52 48 private ProductBrowseHistoryService productBrowseHistoryService;
53 49  
54   - @Resource
55   - private MemberLevelApi memberLevelApi;
56   - @Resource
57   - private MemberUserApi memberUserApi;
58   -
59 50 @GetMapping("/list-by-ids")
60 51 @Operation(summary = "获得商品 SPU 列表")
61 52 @Parameter(name = "ids", description = "编号列表", required = true)
... ... @@ -68,9 +59,6 @@ public class AppProductSpuController {
68 59 // 拼接返回
69 60 list.forEach(spu -> spu.setSalesCount(spu.getSalesCount() + spu.getVirtualSalesCount()));
70 61 List<AppProductSpuRespVO> voList = BeanUtils.toBean(list, AppProductSpuRespVO.class);
71   - // 处理 vip 价格
72   - MemberLevelRespDTO memberLevel = getMemberLevel();
73   - voList.forEach(vo -> vo.setVipPrice(calculateVipPrice(vo.getPrice(), memberLevel)));
74 62 return success(voList);
75 63 }
76 64  
... ... @@ -85,9 +73,6 @@ public class AppProductSpuController {
85 73 // 拼接返回
86 74 pageResult.getList().forEach(spu -> spu.setSalesCount(spu.getSalesCount() + spu.getVirtualSalesCount()));
87 75 PageResult<AppProductSpuRespVO> voPageResult = BeanUtils.toBean(pageResult, AppProductSpuRespVO.class);
88   - // 处理 vip 价格
89   - MemberLevelRespDTO memberLevel = getMemberLevel();
90   - voPageResult.getList().forEach(vo -> vo.setVipPrice(calculateVipPrice(vo.getPrice(), memberLevel)));
91 76 return success(voPageResult);
92 77 }
93 78  
... ... @@ -115,37 +100,7 @@ public class AppProductSpuController {
115 100 spu.setSalesCount(spu.getSalesCount() + spu.getVirtualSalesCount());
116 101 AppProductSpuDetailRespVO spuVO = BeanUtils.toBean(spu, AppProductSpuDetailRespVO.class)
117 102 .setSkus(BeanUtils.toBean(skus, AppProductSpuDetailRespVO.Sku.class));
118   - // 处理 vip 价格
119   - MemberLevelRespDTO memberLevel = getMemberLevel();
120   - spuVO.setVipPrice(calculateVipPrice(spuVO.getPrice(), memberLevel));
121 103 return success(spuVO);
122 104 }
123 105  
124   - private MemberLevelRespDTO getMemberLevel() {
125   - Long userId = getLoginUserId();
126   - if (userId == null) {
127   - return null;
128   - }
129   - MemberUserRespDTO user = memberUserApi.getUser(userId);
130   - if (user.getLevelId() == null || user.getLevelId() <= 0) {
131   - return null;
132   - }
133   - return memberLevelApi.getMemberLevel(user.getLevelId());
134   - }
135   -
136   - /**
137   - * 计算会员 VIP 优惠价格
138   - *
139   - * @param price 原价
140   - * @param memberLevel 会员等级
141   - * @return 优惠价格
142   - */
143   - public Integer calculateVipPrice(Integer price, MemberLevelRespDTO memberLevel) {
144   - if (memberLevel == null || memberLevel.getDiscountPercent() == null) {
145   - return 0;
146   - }
147   - Integer newPrice = price * memberLevel.getDiscountPercent() / 100;
148   - return price - newPrice;
149   - }
150   -
151 106 }
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuDetailRespVO.java
  View file @caf49aa
... ... @@ -46,9 +46,6 @@ public class AppProductSpuDetailRespVO {
46 46 @Schema(description = "市场价，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
47 47 private Integer marketPrice;
48 48  
49   - @Schema(description = "VIP 价格，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "968") // 通过会员等级，计算出折扣后价格
50   - private Integer vipPrice;
51   -
52 49 @Schema(description = "库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
53 50 private Integer stock;
54 51  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/app/spu/vo/AppProductSpuRespVO.java
  View file @caf49aa
... ... @@ -38,9 +38,6 @@ public class AppProductSpuRespVO {
38 38 @Schema(description = "市场价，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
39 39 private Integer marketPrice;
40 40  
41   - @Schema(description = "VIP 价格，单位使用：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "968") // 通过会员等级，计算出折扣后价格
42   - private Integer vipPrice;
43   -
44 41 @Schema(description = "库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "666")
45 42 private Integer stock;
46 43  
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryService.java
  View file @caf49aa
... ... @@ -87,6 +87,7 @@ public interface ProductCategoryService {
87 87 * 校验商品分类是否有效。如下情况，视为无效：
88 88 * 1. 商品分类编号不存在
89 89 * 2. 商品分类被禁用
  90 + * 3. 商品分类层级校验，必须使用第二级的商品分类及以下
90 91 *
91 92 * @param ids 商品分类编号数组
92 93 */
... ...
yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/category/ProductCategoryServiceImpl.java
  View file @caf49aa
... ... @@ -20,6 +20,7 @@ import java.util.Map;
20 20 import java.util.Objects;
21 21  
22 22 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  23 +import static cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO.CATEGORY_LEVEL;
23 24 import static cn.iocoder.yudao.module.product.dal.dataobject.category.ProductCategoryDO.PARENT_ID_NULL;
24 25 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.*;
25 26  
... ... @@ -112,13 +113,19 @@ public class ProductCategoryServiceImpl implements ProductCategoryService {
112 113 Map<Long, ProductCategoryDO> categoryMap = CollectionUtils.convertMap(list, ProductCategoryDO::getId);
113 114 // 校验
114 115 ids.forEach(id -> {
  116 + // 校验分类是否存在
115 117 ProductCategoryDO category = categoryMap.get(id);
116 118 if (category == null) {
117 119 throw exception(CATEGORY_NOT_EXISTS);
118 120 }
  121 + // 校验分类是否启用
119 122 if (!CommonStatusEnum.ENABLE.getStatus().equals(category.getStatus())) {
120 123 throw exception(CATEGORY_DISABLED, category.getName());
121 124 }
  125 + // 商品分类层级校验，必须使用第二级的商品分类
  126 + if (getCategoryLevel(id) < CATEGORY_LEVEL) {
  127 + throw exception(SPU_SAVE_FAIL_CATEGORY_LEVEL_ERROR);
  128 + }
122 129 });
123 130 }
124 131  
... ...
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/DiscountActivityApi.java
  View file @caf49aa
... ... @@ -13,11 +13,11 @@ import java.util.List;
13 13 public interface DiscountActivityApi {
14 14  
15 15 /**
16   - * 获得商品匹配的的限时折扣信息
  16 + * 获得 skuId 商品匹配的的限时折扣信息
17 17 *
18 18 * @param skuIds 商品 SKU 编号数组
19 19 * @return 限时折扣信息
20 20 */
21   - List<DiscountProductRespDTO> getMatchDiscountProductList(Collection<Long> skuIds);
  21 + List<DiscountProductRespDTO> getMatchDiscountProductListBySkuIds(Collection<Long> skuIds);
22 22  
23 23 }
... ...
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/dto/DiscountProductRespDTO.java
  View file @caf49aa
... ... @@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.promotion.api.discount.dto;
2 2  
3 3 import lombok.Data;
4 4  
  5 +import java.time.LocalDateTime;
  6 +
5 7 /**
6 8 * 限时折扣活动商品 Response DTO
7 9 *
... ... @@ -44,5 +46,14 @@ public class DiscountProductRespDTO {
44 46 * 活动标题
45 47 */
46 48 private String activityName;
  49 + /**
  50 + * 活动开始时间点
  51 + */
  52 + private LocalDateTime activityStartTime;
  53 + /**
  54 + * 活动结束时间点
  55 + */
  56 + private LocalDateTime activityEndTime;
  57 +
47 58  
48 59 }
... ...
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/reward/RewardActivityApi.java
  View file @caf49aa
... ... @@ -12,13 +12,12 @@ import java.util.List;
12 12 */
13 13 public interface RewardActivityApi {
14 14  
15   -
16 15 /**
17   - * 基于指定的 SPU 编号数组，获得它们匹配的满减送活动
  16 + * 获得 spuId 商品匹配的的满减送活动列表
18 17 *
19   - * @param spuIds SPU 编号数组
  18 + * @param spuIds SPU 编号
20 19 * @return 满减送活动列表
21 20 */
22   - List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds);
  21 + List<RewardActivityMatchRespDTO> getMatchRewardActivityListBySpuIds(Collection<Long> spuIds);
23 22  
24 23 }
... ...
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/api/reward/dto/RewardActivityMatchRespDTO.java
  View file @caf49aa
... ... @@ -19,6 +19,11 @@ import java.util.Map;
19 19 public class RewardActivityMatchRespDTO {
20 20  
21 21 /**
  22 + * 匹配的 SPU 数组
  23 + */
  24 + private List<Long> spuIds;
  25 +
  26 + /**
22 27 * 活动编号，主键自增
23 28 */
24 29 private Long id;
... ... @@ -100,6 +105,13 @@ public class RewardActivityMatchRespDTO {
100 105 */
101 106 private Map<Long, Integer> giveCouponTemplateCounts;
102 107  
  108 + /**
  109 + * 规则描述
  110 + *
  111 + * 通过 {@link #limit}、{@link #discountPrice} 等字段进行拼接
  112 + */
  113 + private String description;
  114 +
103 115 }
104 116  
105 117 }
... ...
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/ErrorCodeConstants.java
  View file @caf49aa
... ... @@ -11,7 +11,7 @@ public interface ErrorCodeConstants {
11 11  
12 12 // ========== 促销活动相关 1-013-001-000 ============
13 13 ErrorCode DISCOUNT_ACTIVITY_NOT_EXISTS = new ErrorCode(1_013_001_000, "限时折扣活动不存在");
14   - ErrorCode DISCOUNT_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1_013_001_001, "存在商品参加了其它限时折扣活动");
  14 + ErrorCode DISCOUNT_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1_013_001_001, "存在商品参加了其它限时折扣活动【{}】");
15 15 ErrorCode DISCOUNT_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1_013_001_002, "限时折扣活动已关闭，不能修改");
16 16 ErrorCode DISCOUNT_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED = new ErrorCode(1_013_001_003, "限时折扣活动未关闭，不能删除");
17 17 ErrorCode DISCOUNT_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1_013_001_004, "限时折扣活动已关闭，不能重复关闭");
... ... @@ -38,14 +38,18 @@ public interface ErrorCodeConstants {
38 38  
39 39 // ========== 满减送活动 1-013-006-000 ==========
40 40 ErrorCode REWARD_ACTIVITY_NOT_EXISTS = new ErrorCode(1_013_006_000, "满减送活动不存在");
41   - ErrorCode REWARD_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1_013_006_001, "存在商品参加了其它满减送活动");
  41 + ErrorCode REWARD_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1_013_006_001, "该时间段存在商品参加了其它满减送活动");
42 42 ErrorCode REWARD_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1_013_006_002, "满减送活动已关闭，不能修改");
43 43 ErrorCode REWARD_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED = new ErrorCode(1_013_006_003, "满减送活动未关闭，不能删除");
44 44 ErrorCode REWARD_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1_013_006_004, "满减送活动已关闭，不能重复关闭");
45   - ErrorCode REWARD_ACTIVITY_SCOPE_ALL_EXISTS = new ErrorCode(1_013_006_005, "已存在商品范围为全场的满减送活动");
46   - ErrorCode REWARD_ACTIVITY_SCOPE_CATEGORY_EXISTS = new ErrorCode(1_013_006_006, "存在商品类型参加了其它满减送活动");
47   -
48   - // ========== TODO 空着 1-013-007-000 ============
  45 + ErrorCode REWARD_ACTIVITY_SCOPE_EXISTS = new ErrorCode(1_013_006_005, "与该时间段满减送活动【{}】商品范围冲突，原因：{}");
  46 +
  47 + // ========== 积分商城活动 1-013-007-000 ==========
  48 + ErrorCode POINT_ACTIVITY_NOT_EXISTS = new ErrorCode(1_013_007_000, "积分商城活动不存在");
  49 + ErrorCode POINT_ACTIVITY_SPU_CONFLICTS = new ErrorCode(1_013_007_001, "存在商品参加了其它积分商城活动");
  50 + ErrorCode POINT_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED = new ErrorCode(1_013_007_002, "积分商城活动已关闭，不能修改");
  51 + ErrorCode POINT_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED_OR_END = new ErrorCode(1_013_007_003, "积分商城活动未关闭或未结束，不能删除");
  52 + ErrorCode POINT_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED = new ErrorCode(1_013_007_004, "积分商城活动已关闭，不能重复关闭");
49 53  
50 54 // ========== 秒杀活动 1-013-008-000 ==========
51 55 ErrorCode SECKILL_ACTIVITY_NOT_EXISTS = new ErrorCode(1_013_008_000, "秒杀活动不存在");
... ...
yudao-module-mall/yudao-module-promotion-api/src/main/java/cn/iocoder/yudao/module/promotion/enums/coupon/CouponTakeTypeEnum.java
  View file @caf49aa
... ... @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
5 5 import lombok.Getter;
6 6  
7 7 import java.util.Arrays;
  8 +import java.util.Objects;
8 9  
9 10 /**
10 11 * 优惠劵领取方式
... ... @@ -20,12 +21,12 @@ public enum CouponTakeTypeEnum implements IntArrayValuable {
20 21 REGISTER(3, "新人券"), // 注册时自动领取
21 22 ;
22 23  
23   - public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CouponTakeTypeEnum::getValue).toArray();
  24 + public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(CouponTakeTypeEnum::getType).toArray();
24 25  
25 26 /**
26 27 * 值
27 28 */
28   - private final Integer value;
  29 + private final Integer type;
29 30 /**
30 31 * 名字
31 32 */
... ... @@ -35,4 +36,9 @@ public enum CouponTakeTypeEnum implements IntArrayValuable {
35 36 public int[] array() {
36 37 return ARRAYS;
37 38 }
  39 +
  40 + public static boolean isUser(Integer type) {
  41 + return Objects.equals(USER.getType(), type);
  42 + }
  43 +
38 44 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/discount/DiscountActivityApiImpl.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.api.discount;
2 2  
  3 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
3 4 import cn.iocoder.yudao.module.promotion.api.discount.dto.DiscountProductRespDTO;
4   -import cn.iocoder.yudao.module.promotion.convert.discount.DiscountActivityConvert;
  5 +import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountProductDO;
5 6 import cn.iocoder.yudao.module.promotion.service.discount.DiscountActivityService;
  7 +import jakarta.annotation.Resource;
6 8 import org.springframework.stereotype.Service;
7 9 import org.springframework.validation.annotation.Validated;
8 10  
9   -import jakarta.annotation.Resource;
10 11 import java.util.Collection;
11 12 import java.util.List;
12 13  
... ... @@ -23,8 +24,9 @@ public class DiscountActivityApiImpl implements DiscountActivityApi {
23 24 private DiscountActivityService discountActivityService;
24 25  
25 26 @Override
26   - public List<DiscountProductRespDTO> getMatchDiscountProductList(Collection<Long> skuIds) {
27   - return DiscountActivityConvert.INSTANCE.convertList02(discountActivityService.getMatchDiscountProductList(skuIds));
  27 + public List<DiscountProductRespDTO> getMatchDiscountProductListBySkuIds(Collection<Long> skuIds) {
  28 + List<DiscountProductDO> list = discountActivityService.getMatchDiscountProductListBySkuIds(skuIds);
  29 + return BeanUtils.toBean(list, DiscountProductRespDTO.class);
28 30 }
29 31  
30 32 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/reward/RewardActivityApiImpl.java
  View file @caf49aa
... ... @@ -2,10 +2,10 @@ package cn.iocoder.yudao.module.promotion.api.reward;
2 2  
3 3 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
4 4 import cn.iocoder.yudao.module.promotion.service.reward.RewardActivityService;
  5 +import jakarta.annotation.Resource;
5 6 import org.springframework.stereotype.Service;
6 7 import org.springframework.validation.annotation.Validated;
7 8  
8   -import jakarta.annotation.Resource;
9 9 import java.util.Collection;
10 10 import java.util.List;
11 11  
... ... @@ -22,8 +22,8 @@ public class RewardActivityApiImpl implements RewardActivityApi {
22 22 private RewardActivityService rewardActivityService;
23 23  
24 24 @Override
25   - public List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds) {
26   - return rewardActivityService.getMatchRewardActivityList(spuIds);
  25 + public List<RewardActivityMatchRespDTO> getMatchRewardActivityListBySpuIds(Collection<Long> spuIds) {
  26 + return rewardActivityService.getMatchRewardActivityListBySpuIds(spuIds);
27 27 }
28 28  
29 29 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/coupon/vo/template/CouponTemplateBaseVO.java
  View file @caf49aa
... ... @@ -9,12 +9,12 @@ import cn.iocoder.yudao.module.promotion.enums.coupon.CouponTemplateValidityType
9 9 import com.fasterxml.jackson.annotation.JsonFormat;
10 10 import com.fasterxml.jackson.annotation.JsonIgnore;
11 11 import io.swagger.v3.oas.annotations.media.Schema;
12   -import lombok.Data;
13   -import org.springframework.format.annotation.DateTimeFormat;
14   -
15 12 import jakarta.validation.constraints.AssertTrue;
16 13 import jakarta.validation.constraints.Min;
17 14 import jakarta.validation.constraints.NotNull;
  15 +import lombok.Data;
  16 +import org.springframework.format.annotation.DateTimeFormat;
  17 +
18 18 import java.time.LocalDateTime;
19 19 import java.util.List;
20 20 import java.util.Objects;
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/DiscountActivityController.java
  View file @caf49aa
... ... @@ -3,9 +3,10 @@ package cn.iocoder.yudao.module.promotion.controller.admin.discount;
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6   -import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
7   -import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
8   -import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.*;
  6 +import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityCreateReqVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityPageReqVO;
  8 +import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityRespVO;
  9 +import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityUpdateReqVO;
9 10 import cn.iocoder.yudao.module.promotion.convert.discount.DiscountActivityConvert;
10 11 import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountActivityDO;
11 12 import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountProductDO;
... ... @@ -13,12 +14,12 @@ import cn.iocoder.yudao.module.promotion.service.discount.DiscountActivityServic
13 14 import io.swagger.v3.oas.annotations.Operation;
14 15 import io.swagger.v3.oas.annotations.Parameter;
15 16 import io.swagger.v3.oas.annotations.tags.Tag;
  17 +import jakarta.annotation.Resource;
  18 +import jakarta.validation.Valid;
16 19 import org.springframework.security.access.prepost.PreAuthorize;
17 20 import org.springframework.validation.annotation.Validated;
18 21 import org.springframework.web.bind.annotation.*;
19 22  
20   -import jakarta.annotation.Resource;
21   -import jakarta.validation.Valid;
22 23 import java.util.List;
23 24  
24 25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
... ... @@ -33,9 +34,6 @@ public class DiscountActivityController {
33 34 @Resource
34 35 private DiscountActivityService discountActivityService;
35 36  
36   - @Resource
37   - private ProductSpuApi productSpuApi;
38   -
39 37 @PostMapping("/create")
40 38 @Operation(summary = "创建限时折扣活动")
41 39 @PreAuthorize("@ss.hasPermission('promotion:discount-activity:create')")
... ... @@ -73,7 +71,7 @@ public class DiscountActivityController {
73 71 @Operation(summary = "获得限时折扣活动")
74 72 @Parameter(name = "id", description = "编号", required = true, example = "1024")
75 73 @PreAuthorize("@ss.hasPermission('promotion:discount-activity:query')")
76   - public CommonResult<DiscountActivityDetailRespVO> getDiscountActivity(@RequestParam("id") Long id) {
  74 + public CommonResult<DiscountActivityRespVO> getDiscountActivity(@RequestParam("id") Long id) {
77 75 DiscountActivityDO discountActivity = discountActivityService.getDiscountActivity(id);
78 76 if (discountActivity == null) {
79 77 return success(null);
... ... @@ -88,18 +86,14 @@ public class DiscountActivityController {
88 86 @PreAuthorize("@ss.hasPermission('promotion:discount-activity:query')")
89 87 public CommonResult<PageResult<DiscountActivityRespVO>> getDiscountActivityPage(@Valid DiscountActivityPageReqVO pageVO) {
90 88 PageResult<DiscountActivityDO> pageResult = discountActivityService.getDiscountActivityPage(pageVO);
91   -
92   - if (CollUtil.isEmpty(pageResult.getList())) { // TODO @zhangshuai：方法里的空行，目的是让代码分块，可以更清晰；所以上面这个空格可以不要，而下面判断之后的，空格，其实加下比较好；类似的还有 spuList、以及后面的 convert
  89 + if (CollUtil.isEmpty(pageResult.getList())) {
93 90 return success(PageResult.empty(pageResult.getTotal()));
94 91 }
  92 +
95 93 // 拼接数据
96 94 List<DiscountProductDO> products = discountActivityService.getDiscountProductsByActivityId(
97 95 convertSet(pageResult.getList(), DiscountActivityDO::getId));
98   -
99   - List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(
100   - convertSet(products, DiscountProductDO::getSpuId));
101   -
102   - return success(DiscountActivityConvert.INSTANCE.convertPage(pageResult, products, spuList));
  96 + return success(DiscountActivityConvert.INSTANCE.convertPage(pageResult, products));
103 97 }
104 98  
105 99 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityRespVO.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.controller.admin.discount.vo;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
  4 +import jakarta.validation.constraints.NotNull;
4 5 import lombok.Data;
5 6 import lombok.EqualsAndHashCode;
6 7 import lombok.ToString;
7 8  
8   -import jakarta.validation.constraints.NotNull;
9 9 import java.time.LocalDateTime;
10 10 import java.util.List;
11 11  
... ... @@ -25,25 +25,7 @@ public class DiscountActivityRespVO extends DiscountActivityBaseVO {
25 25 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
26 26 private LocalDateTime createTime;
27 27  
28   -
29   - @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048") // TODO @zhangshuai：属性和属性之间，最多空一行噢；
30   - private Long spuId;
31   -
32 28 @Schema(description = "限时折扣商品", requiredMode = Schema.RequiredMode.REQUIRED)
33   - private List<DiscountActivityBaseVO.Product> products;
34   -
35   - // ========== 商品字段 ==========
36   -
37   - // TODO @zhangshuai：一个优惠活动，会关联多个商品，所以它不用返回 spuName 哈；
38   - // TODO 最终界面展示字段就：编号、活动名称、参与商品数、活动状态、开始时间、结束时间、操作
39   - @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 name 读取
40   - example = "618大促")
41   - private String spuName;
42   - @Schema(description = "商品主图", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 picUrl 读取
43   - example = "https://www.iocoder.cn/xx.png")
44   - private String picUrl;
45   - @Schema(description = "商品市场价，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 marketPrice 读取
46   - example = "50")
47   - private Integer marketPrice;
  29 + private List<Product> products;
48 30  
49 31 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityUpdateReqVO.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.controller.admin.discount.vo;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
  4 +import jakarta.validation.Valid;
  5 +import jakarta.validation.constraints.NotEmpty;
  6 +import jakarta.validation.constraints.NotNull;
4 7 import lombok.Data;
5 8 import lombok.EqualsAndHashCode;
6 9 import lombok.ToString;
7 10  
8   -import jakarta.validation.Valid;
9   -import jakarta.validation.constraints.NotEmpty;
10   -import jakarta.validation.constraints.NotNull;
11 11 import java.util.List;
12 12  
13 13 @Schema(description = "管理后台 - 限时折扣活动更新 Request VO")
... ... @@ -25,6 +25,6 @@ public class DiscountActivityUpdateReqVO extends DiscountActivityBaseVO {
25 25 */
26 26 @NotEmpty(message = "商品列表不能为空")
27 27 @Valid
28   - private List<DiscountActivityCreateReqVO.Product> products;
  28 + private List<Product> products;
29 29  
30 30 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/PointActivityController.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.controller.admin.point;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  5 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  6 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  7 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  8 +import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
  9 +import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
  10 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity.PointActivityPageReqVO;
  11 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity.PointActivityRespVO;
  12 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity.PointActivitySaveReqVO;
  13 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.product.PointProductRespVO;
  14 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointActivityDO;
  15 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointProductDO;
  16 +import cn.iocoder.yudao.module.promotion.service.point.PointActivityService;
  17 +import io.swagger.v3.oas.annotations.Operation;
  18 +import io.swagger.v3.oas.annotations.Parameter;
  19 +import io.swagger.v3.oas.annotations.tags.Tag;
  20 +import jakarta.annotation.Resource;
  21 +import jakarta.validation.Valid;
  22 +import org.springframework.security.access.prepost.PreAuthorize;
  23 +import org.springframework.validation.annotation.Validated;
  24 +import org.springframework.web.bind.annotation.*;
  25 +
  26 +import java.util.Collections;
  27 +import java.util.List;
  28 +import java.util.Map;
  29 +
  30 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  31 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
  32 +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
  33 +
  34 +@Tag(name = "管理后台 - 积分商城活动")
  35 +@RestController
  36 +@RequestMapping("/promotion/point-activity")
  37 +@Validated
  38 +public class PointActivityController {
  39 +
  40 + @Resource
  41 + private PointActivityService pointActivityService;
  42 + @Resource
  43 + private ProductSpuApi productSpuApi;
  44 +
  45 + @PostMapping("/create")
  46 + @Operation(summary = "创建积分商城活动")
  47 + @PreAuthorize("@ss.hasPermission('promotion:point-activity:create')")
  48 + public CommonResult<Long> createPointActivity(@Valid @RequestBody PointActivitySaveReqVO createReqVO) {
  49 + return success(pointActivityService.createPointActivity(createReqVO));
  50 + }
  51 +
  52 + @PutMapping("/update")
  53 + @Operation(summary = "更新积分商城活动")
  54 + @PreAuthorize("@ss.hasPermission('promotion:point-activity:update')")
  55 + public CommonResult<Boolean> updatePointActivity(@Valid @RequestBody PointActivitySaveReqVO updateReqVO) {
  56 + pointActivityService.updatePointActivity(updateReqVO);
  57 + return success(true);
  58 + }
  59 +
  60 + @PutMapping("/close")
  61 + @Operation(summary = "关闭积分商城活动")
  62 + @Parameter(name = "id", description = "编号", required = true)
  63 + @PreAuthorize("@ss.hasPermission('promotion:point-activity:close')")
  64 + public CommonResult<Boolean> closeSeckillActivity(@RequestParam("id") Long id) {
  65 + pointActivityService.closePointActivity(id);
  66 + return success(true);
  67 + }
  68 +
  69 + @DeleteMapping("/delete")
  70 + @Operation(summary = "删除积分商城活动")
  71 + @Parameter(name = "id", description = "编号", required = true)
  72 + @PreAuthorize("@ss.hasPermission('promotion:point-activity:delete')")
  73 + public CommonResult<Boolean> deletePointActivity(@RequestParam("id") Long id) {
  74 + pointActivityService.deletePointActivity(id);
  75 + return success(true);
  76 + }
  77 +
  78 + @GetMapping("/get")
  79 + @Operation(summary = "获得积分商城活动")
  80 + @Parameter(name = "id", description = "编号", required = true, example = "1024")
  81 + @PreAuthorize("@ss.hasPermission('promotion:point-activity:query')")
  82 + public CommonResult<PointActivityRespVO> getPointActivity(@RequestParam("id") Long id) {
  83 + PointActivityDO pointActivity = pointActivityService.getPointActivity(id);
  84 + if (pointActivity == null) {
  85 + return success(null);
  86 + }
  87 +
  88 + List<PointProductDO> products = pointActivityService.getPointProductListByActivityIds(Collections.singletonList(id));
  89 + PointActivityRespVO respVO = BeanUtils.toBean(pointActivity, PointActivityRespVO.class);
  90 + respVO.setProducts(BeanUtils.toBean(products, PointProductRespVO.class));
  91 + return success(respVO);
  92 + }
  93 +
  94 + @GetMapping("/page")
  95 + @Operation(summary = "获得积分商城活动分页")
  96 + @PreAuthorize("@ss.hasPermission('promotion:point-activity:query')")
  97 + public CommonResult<PageResult<PointActivityRespVO>> getPointActivityPage(@Valid PointActivityPageReqVO pageReqVO) {
  98 + PageResult<PointActivityDO> pageResult = pointActivityService.getPointActivityPage(pageReqVO);
  99 + if (CollUtil.isEmpty(pageResult.getList())) {
  100 + return success(PageResult.empty(pageResult.getTotal()));
  101 + }
  102 +
  103 + // 拼接数据
  104 + List<PointActivityRespVO> resultList = buildPointActivityRespVOList(pageResult.getList());
  105 + return success(new PageResult<>(resultList, pageResult.getTotal()));
  106 + }
  107 +
  108 + @GetMapping("/list-by-ids")
  109 + @Operation(summary = "获得积分商城活动列表，基于活动编号数组")
  110 + @Parameter(name = "ids", description = "活动编号数组", required = true, example = "[1024, 1025]")
  111 + public CommonResult<List<PointActivityRespVO>> getPointActivityListByIds(@RequestParam("ids") List<Long> ids) {
  112 + // 1. 获得开启的活动列表
  113 + List<PointActivityDO> activityList = pointActivityService.getPointActivityListByIds(ids);
  114 + activityList.removeIf(activity -> CommonStatusEnum.isDisable(activity.getStatus()));
  115 + if (CollUtil.isEmpty(activityList)) {
  116 + return success(Collections.emptyList());
  117 + }
  118 + // 2. 拼接返回
  119 + List<PointActivityRespVO> result = buildPointActivityRespVOList(activityList);
  120 + return success(result);
  121 + }
  122 +
  123 + private List<PointActivityRespVO> buildPointActivityRespVOList(List<PointActivityDO> activityList) {
  124 + List<PointProductDO> products = pointActivityService.getPointProductListByActivityIds(
  125 + convertSet(activityList, PointActivityDO::getId));
  126 + Map<Long, List<PointProductDO>> productsMap = convertMultiMap(products, PointProductDO::getActivityId);
  127 + Map<Long, ProductSpuRespDTO> spuMap = productSpuApi.getSpusMap(
  128 + convertSet(activityList, PointActivityDO::getSpuId));
  129 + List<PointActivityRespVO> result = BeanUtils.toBean(activityList, PointActivityRespVO.class);
  130 + result.forEach(activity -> {
  131 + // 设置 product 信息
  132 + PointProductDO minProduct = getMinObject(productsMap.get(activity.getId()), PointProductDO::getPoint);
  133 + assert minProduct != null;
  134 + activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice());
  135 + findAndThen(spuMap, activity.getSpuId(),
  136 + spu -> activity.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice()));
  137 + });
  138 + return result;
  139 + }
  140 +
  141 +}
0 142 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/vo/activity/PointActivityPageReqVO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +import lombok.EqualsAndHashCode;
  7 +import lombok.ToString;
  8 +import org.springframework.format.annotation.DateTimeFormat;
  9 +
  10 +import java.time.LocalDateTime;
  11 +
  12 +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  13 +
  14 +@Schema(description = "管理后台 - 积分商城活动分页 Request VO")
  15 +@Data
  16 +@EqualsAndHashCode(callSuper = true)
  17 +@ToString(callSuper = true)
  18 +public class PointActivityPageReqVO extends PageParam {
  19 +
  20 + @Schema(description = "积分商城活动商品", example = "19509")
  21 + private Long spuId;
  22 +
  23 + @Schema(description = "活动状态", example = "2")
  24 + private Integer status;
  25 +
  26 + @Schema(description = "备注", example = "你说的对")
  27 + private String remark;
  28 +
  29 + @Schema(description = "排序")
  30 + private Integer sort;
  31 +
  32 + @Schema(description = "创建时间")
  33 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  34 + private LocalDateTime[] createTime;
  35 +
  36 +}
0 37 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/vo/activity/PointActivityRespVO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity;
  2 +
  3 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.product.PointProductRespVO;
  4 +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
  5 +import com.alibaba.excel.annotation.ExcelProperty;
  6 +import io.swagger.v3.oas.annotations.media.Schema;
  7 +import lombok.Data;
  8 +
  9 +import java.time.LocalDateTime;
  10 +import java.util.List;
  11 +
  12 +@Schema(description = "管理后台 - 积分商城活动 Response VO")
  13 +@Data
  14 +@ExcelIgnoreUnannotated
  15 +public class PointActivityRespVO {
  16 +
  17 + @Schema(description = "积分商城活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11373")
  18 + @ExcelProperty("积分商城活动编号")
  19 + private Long id;
  20 +
  21 + @Schema(description = "积分商城活动商品", requiredMode = Schema.RequiredMode.REQUIRED, example = "19509")
  22 + @ExcelProperty("积分商城活动商品")
  23 + private Long spuId;
  24 +
  25 + @Schema(description = "活动状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  26 + @ExcelProperty("活动状态")
  27 + private Integer status;
  28 +
  29 + @Schema(description = "积分商城活动库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  30 + @ExcelProperty("积分商城活动库存")
  31 + private Integer stock; // 剩余库存积分兑换时扣减
  32 +
  33 + @Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  34 + @ExcelProperty("积分商城活动总库存")
  35 + private Integer totalStock;
  36 +
  37 + @Schema(description = "备注", example = "你说的对")
  38 + @ExcelProperty("备注")
  39 + private String remark;
  40 +
  41 + @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
  42 + @ExcelProperty("排序")
  43 + private Integer sort;
  44 +
  45 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  46 + @ExcelProperty("创建时间")
  47 + private LocalDateTime createTime;
  48 +
  49 + @Schema(description = "积分商城商品", requiredMode = Schema.RequiredMode.REQUIRED)
  50 + private List<PointProductRespVO> products;
  51 +
  52 + // ========== 商品字段 ==========
  53 +
  54 + @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 name 读取
  55 + example = "618大促")
  56 + private String spuName;
  57 + @Schema(description = "商品主图", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 picUrl 读取
  58 + example = "https://www.iocoder.cn/xx.png")
  59 + private String picUrl;
  60 + @Schema(description = "商品市场价，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 marketPrice 读取
  61 + example = "50")
  62 + private Integer marketPrice;
  63 +
  64 + //======================= 显示所需兑换积分最少的 sku 信息 =======================
  65 +
  66 + @Schema(description = "兑换积分", requiredMode = Schema.RequiredMode.REQUIRED)
  67 + private Integer point;
  68 +
  69 + @Schema(description = "兑换金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "15860")
  70 + private Integer price;
  71 +
  72 +}
0 73 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/vo/activity/PointActivitySaveReqVO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity;
  2 +
  3 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.product.PointProductSaveReqVO;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import jakarta.validation.constraints.NotNull;
  6 +import lombok.Data;
  7 +
  8 +import java.util.List;
  9 +
  10 +@Schema(description = "管理后台 - 积分商城活动新增/修改 Request VO")
  11 +@Data
  12 +public class PointActivitySaveReqVO {
  13 +
  14 + @Schema(description = "积分商城活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11373")
  15 + private Long id;
  16 +
  17 + @Schema(description = "积分商城活动商品", requiredMode = Schema.RequiredMode.REQUIRED, example = "19509")
  18 + @NotNull(message = "积分商城活动商品不能为空")
  19 + private Long spuId;
  20 +
  21 + @Schema(description = "备注", example = "你说的对")
  22 + private String remark;
  23 +
  24 + @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
  25 + @NotNull(message = "排序不能为空")
  26 + private Integer sort;
  27 +
  28 + @Schema(description = "积分商城商品", requiredMode = Schema.RequiredMode.REQUIRED)
  29 + private List<PointProductSaveReqVO> products;
  30 +
  31 +}
0 32 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/vo/product/PointProductRespVO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.controller.admin.point.vo.product;
  2 +
  3 +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +
  7 +@Schema(description = "管理后台 - 积分商城商品 Response VO")
  8 +@Data
  9 +@ExcelIgnoreUnannotated
  10 +public class PointProductRespVO {
  11 +
  12 + @Schema(description = "积分商城商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "31718")
  13 + private Long id;
  14 +
  15 + @Schema(description = "积分商城活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "29388")
  16 + private Long activityId;
  17 +
  18 + @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8112")
  19 + private Long spuId;
  20 +
  21 + @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2736")
  22 + private Long skuId;
  23 +
  24 + @Schema(description = "可兑换数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "3926")
  25 + private Integer count;
  26 +
  27 + @Schema(description = "兑换积分", requiredMode = Schema.RequiredMode.REQUIRED)
  28 + private Integer point;
  29 +
  30 + @Schema(description = "兑换金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "15860")
  31 + private Integer price;
  32 +
  33 + @Schema(description = "积分商城商品库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  34 + private Integer stock;
  35 +
  36 + @Schema(description = "积分商城商品状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  37 + private Integer activityStatus;
  38 +
  39 +}
0 40 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/point/vo/product/PointProductSaveReqVO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.controller.admin.point.vo.product;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import jakarta.validation.constraints.NotNull;
  5 +import lombok.Data;
  6 +
  7 +@Schema(description = "管理后台 - 积分商城商品新增/修改 Request VO")
  8 +@Data
  9 +public class PointProductSaveReqVO {
  10 +
  11 + @Schema(description = "积分商城商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "31718")
  12 + private Long id;
  13 +
  14 + @Schema(description = "积分商城活动 id", requiredMode = Schema.RequiredMode.REQUIRED, example = "29388")
  15 + @NotNull(message = "积分商城活动 id不能为空")
  16 + private Long activityId;
  17 +
  18 + @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "8112")
  19 + @NotNull(message = "商品 SPU 编号不能为空")
  20 + private Long spuId;
  21 +
  22 + @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2736")
  23 + @NotNull(message = "商品 SKU 编号不能为空")
  24 + private Long skuId;
  25 +
  26 + @Schema(description = "可兑换数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "3926")
  27 + @NotNull(message = "可兑换数量不能为空")
  28 + private Integer count;
  29 +
  30 + @Schema(description = "兑换积分", requiredMode = Schema.RequiredMode.REQUIRED)
  31 + @NotNull(message = "兑换积分不能为空")
  32 + private Integer point;
  33 +
  34 + @Schema(description = "兑换金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "15860")
  35 + @NotNull(message = "兑换金额，单位：分不能为空")
  36 + private Integer price;
  37 +
  38 + @Schema(description = "积分商城商品库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  39 + @NotNull(message = "积分商城商品不能为空")
  40 + private Integer stock;
  41 +
  42 + @Schema(description = "积分商城商品状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  43 + @NotNull(message = "积分商城商品状态不能为空")
  44 + private Integer activityStatus;
  45 +
  46 +}
0 47 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityBaseVO.java
  View file @caf49aa
... ... @@ -88,6 +88,7 @@ public class RewardActivityBaseVO {
88 88 return point == null || point >= 0;
89 89 }
90 90  
  91 +
91 92 }
92 93  
93 94 @AssertTrue(message = "商品范围编号的数组不能为空")
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/SeckillActivityController.java
  View file @caf49aa
... ... @@ -102,7 +102,7 @@ public class SeckillActivityController {
102 102 @GetMapping("/list-by-ids")
103 103 @Operation(summary = "获得秒杀活动列表，基于活动编号数组")
104 104 @Parameter(name = "ids", description = "活动编号数组", required = true, example = "[1024, 1025]")
105   - public CommonResult<List<SeckillActivityRespVO>> getCombinationActivityListByIds(@RequestParam("ids") List<Long> ids) {
  105 + public CommonResult<List<SeckillActivityRespVO>> getSeckillActivityListByIds(@RequestParam("ids") List<Long> ids) {
106 106 // 1. 获得开启的活动列表
107 107 List<SeckillActivityDO> activityList = seckillActivityService.getSeckillActivityListByIds(ids);
108 108 activityList.removeIf(activity -> CommonStatusEnum.isDisable(activity.getStatus()));
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/seckill/vo/activity/SeckillActivityRespVO.java
  View file @caf49aa
... ... @@ -54,7 +54,7 @@ public class SeckillActivityRespVO extends SeckillActivityBaseVO {
54 54 example = "50")
55 55 private Integer marketPrice;
56 56  
57   - @Schema(description = "拼团金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  57 + @Schema(description = "秒杀金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
58 58 private Integer seckillPrice; // 从 products 获取最小 price 读取
59 59  
60 60 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/activity/AppActivityController.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.controller.app.activity;
2 2  
3   -import cn.hutool.core.collection.CollUtil;
4   -import cn.hutool.core.map.MapUtil;
5   -import cn.hutool.core.util.ObjUtil;
6   -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
7 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
8   -import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
9   -import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
10 4 import cn.iocoder.yudao.module.promotion.controller.app.activity.vo.AppActivityRespVO;
11 5 import cn.iocoder.yudao.module.promotion.dal.dataobject.bargain.BargainActivityDO;
12 6 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
13   -import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountActivityDO;
14   -import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountProductDO;
15   -import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
16 7 import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillActivityDO;
17   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
18 8 import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
19 9 import cn.iocoder.yudao.module.promotion.service.bargain.BargainActivityService;
20 10 import cn.iocoder.yudao.module.promotion.service.combination.CombinationActivityService;
21   -import cn.iocoder.yudao.module.promotion.service.discount.DiscountActivityService;
22   -import cn.iocoder.yudao.module.promotion.service.reward.RewardActivityService;
23 11 import cn.iocoder.yudao.module.promotion.service.seckill.SeckillActivityService;
24 12 import io.swagger.v3.oas.annotations.Operation;
25 13 import io.swagger.v3.oas.annotations.Parameter;
... ... @@ -31,11 +19,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
31 19 import org.springframework.web.bind.annotation.RequestParam;
32 20 import org.springframework.web.bind.annotation.RestController;
33 21  
34   -import java.time.LocalDateTime;
35   -import java.util.*;
  22 +import java.util.ArrayList;
  23 +import java.util.List;
36 24  
37 25 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
38   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
39 26  
40 27 @Tag(name = "用户 APP - 营销活动") // 用于提供跨多个活动的 HTTP 接口
41 28 @RestController
... ... @@ -49,152 +36,31 @@ public class AppActivityController {
49 36 private SeckillActivityService seckillActivityService;
50 37 @Resource
51 38 private BargainActivityService bargainActivityService;
52   - @Resource
53   - private DiscountActivityService discountActivityService;
54   - @Resource
55   - private RewardActivityService rewardActivityService;
56   -
57   - @Resource
58   - private ProductSpuApi productSpuApi;
59 39  
60 40 @GetMapping("/list-by-spu-id")
61   - @Operation(summary = "获得单个商品，近期参与的每个活动")
  41 + @Operation(summary = "获得单个商品，进行中的拼团、秒杀、砍价活动信息", description = "每种活动，只返回一个")
62 42 @Parameter(name = "spuId", description = "商品编号", required = true)
63 43 public CommonResult<List<AppActivityRespVO>> getActivityListBySpuId(@RequestParam("spuId") Long spuId) {
64   - // 每种活动，只返回一个
65   - return success(getAppActivityList(Collections.singletonList(spuId)));
66   - }
67   -
68   - @GetMapping("/list-by-spu-ids")
69   - @Operation(summary = "获得多个商品，近期参与的每个活动")
70   - @Parameter(name = "spuIds", description = "商品编号数组", required = true)
71   - public CommonResult<Map<Long, List<AppActivityRespVO>>> getActivityListBySpuIds(@RequestParam("spuIds") List<Long> spuIds) {
72   - if (CollUtil.isEmpty(spuIds)) {
73   - return success(MapUtil.empty());
74   - }
75   - // 每种活动，只返回一个；key 为 SPU 编号
76   - return success(convertMultiMap(getAppActivityList(spuIds), AppActivityRespVO::getSpuId));
77   - }
78   -
79   - private List<AppActivityRespVO> getAppActivityList(Collection<Long> spuIds) {
80   - if (CollUtil.isEmpty(spuIds)) {
81   - return new ArrayList<>();
82   - }
83   - // 获取开启的且开始的且没有结束的活动
84   - List<AppActivityRespVO> activityList = new ArrayList<>();
85   - LocalDateTime now = LocalDateTime.now();
  44 + List<AppActivityRespVO> activityVOList = new ArrayList<>();
86 45 // 1. 拼团活动
87   - getCombinationActivities(spuIds, now, activityList);
88   - // 2. 秒杀活动
89   - getSeckillActivities(spuIds, now, activityList);
90   - // 3. 砍价活动
91   - getBargainActivities(spuIds, now, activityList);
92   - // 4. 限时折扣活动
93   - getDiscountActivities(spuIds, now, activityList);
94   - // 5. 满减送活动
95   - getRewardActivityList(spuIds, now, activityList);
96   - return activityList;
97   - }
98   -
99   - private void getCombinationActivities(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
100   - List<CombinationActivityDO> combinationActivities = combinationActivityService.getCombinationActivityBySpuIdsAndStatusAndDateTimeLt(
101   - spuIds, CommonStatusEnum.ENABLE.getStatus(), now);
102   - if (CollUtil.isEmpty(combinationActivities)) {
103   - return;
104   - }
105   -
106   - combinationActivities.forEach(item -> {
107   - activityList.add(new AppActivityRespVO(item.getId(), PromotionTypeEnum.COMBINATION_ACTIVITY.getType(),
108   - item.getName(), item.getSpuId(), item.getStartTime(), item.getEndTime()));
109   - });
110   - }
111   -
112   - private void getSeckillActivities(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
113   - List<SeckillActivityDO> seckillActivities = seckillActivityService.getSeckillActivityBySpuIdsAndStatusAndDateTimeLt(
114   - spuIds, CommonStatusEnum.ENABLE.getStatus(), now);
115   - if (CollUtil.isEmpty(seckillActivities)) {
116   - return;
  46 + CombinationActivityDO combinationActivity = combinationActivityService.getMatchCombinationActivityBySpuId(spuId);
  47 + if (combinationActivity != null) {
  48 + activityVOList.add(new AppActivityRespVO(combinationActivity.getId(), PromotionTypeEnum.COMBINATION_ACTIVITY.getType(),
  49 + combinationActivity.getName(), combinationActivity.getSpuId(), combinationActivity.getStartTime(), combinationActivity.getEndTime()));
117 50 }
118   -
119   - seckillActivities.forEach(item -> {
120   - activityList.add(new AppActivityRespVO(item.getId(), PromotionTypeEnum.SECKILL_ACTIVITY.getType(),
121   - item.getName(), item.getSpuId(), item.getStartTime(), item.getEndTime()));
122   - });
123   - }
124   -
125   - private void getBargainActivities(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
126   - List<BargainActivityDO> bargainActivities = bargainActivityService.getBargainActivityBySpuIdsAndStatusAndDateTimeLt(
127   - spuIds, CommonStatusEnum.ENABLE.getStatus(), now);
128   - if (CollUtil.isNotEmpty(bargainActivities)) {
129   - return;
130   - }
131   -
132   - bargainActivities.forEach(item -> {
133   - activityList.add(new AppActivityRespVO(item.getId(), PromotionTypeEnum.BARGAIN_ACTIVITY.getType(),
134   - item.getName(), item.getSpuId(), item.getStartTime(), item.getEndTime()));
135   - });
136   - }
137   -
138   - private void getDiscountActivities(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
139   - List<DiscountActivityDO> discountActivities = discountActivityService.getDiscountActivityBySpuIdsAndStatusAndDateTimeLt(
140   - spuIds, CommonStatusEnum.ENABLE.getStatus(), now);
141   - if (CollUtil.isEmpty(discountActivities)) {
142   - return;
143   - }
144   -
145   - List<DiscountProductDO> products = discountActivityService.getDiscountProductsByActivityId(
146   - convertSet(discountActivities, DiscountActivityDO::getId));
147   - Map<Long, Long> productMap = convertMap(products, DiscountProductDO::getActivityId, DiscountProductDO::getSpuId);
148   - discountActivities.forEach(item -> activityList.add(new AppActivityRespVO(item.getId(), PromotionTypeEnum.DISCOUNT_ACTIVITY.getType(),
149   - item.getName(), productMap.get(item.getId()), item.getStartTime(), item.getEndTime())));
150   - }
151   -
152   - private void getRewardActivityList(Collection<Long> spuIds, LocalDateTime now, List<AppActivityRespVO> activityList) {
153   - // 1.1 获得所有的活动
154   - List<RewardActivityDO> rewardActivityList = rewardActivityService.getRewardActivityListByStatusAndDateTimeLt(
155   - CommonStatusEnum.ENABLE.getStatus(), now);
156   - if (CollUtil.isEmpty(rewardActivityList)) {
157   - return;
158   - }
159   - // 1.2 获得所有的商品信息
160   - List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(spuIds);
161   - if (CollUtil.isEmpty(spuList)) {
162   - return;
163   - }
164   -
165   - // 2. 构建活动
166   - for (RewardActivityDO rewardActivity : rewardActivityList) {
167   - // 情况一：所有商品都能参加
168   - if (PromotionProductScopeEnum.isAll(rewardActivity.getProductScope())) {
169   - buildAppActivityRespVO(rewardActivity, spuIds, activityList);
170   - }
171   - // 情况二：指定商品参加
172   - if (PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope())) {
173   - List<Long> fSpuIds = spuList.stream().map(ProductSpuRespDTO::getId).filter(id ->
174   - rewardActivity.getProductScopeValues().contains(id)).toList();
175   - buildAppActivityRespVO(rewardActivity, fSpuIds, activityList);
176   - }
177   - // 情况三：指定商品类型参加
178   - if (PromotionProductScopeEnum.isCategory(rewardActivity.getProductScope())) {
179   - List<Long> fSpuIds = spuList.stream().filter(spuItem -> rewardActivity.getProductScopeValues()
180   - .contains(spuItem.getCategoryId())).map(ProductSpuRespDTO::getId).toList();
181   - buildAppActivityRespVO(rewardActivity, fSpuIds, activityList);
182   - }
  51 + // 2. 秒杀活动
  52 + SeckillActivityDO seckillActivity = seckillActivityService.getMatchSeckillActivityBySpuId(spuId);
  53 + if (seckillActivity != null) {
  54 + activityVOList.add(new AppActivityRespVO(seckillActivity.getId(), PromotionTypeEnum.SECKILL_ACTIVITY.getType(),
  55 + seckillActivity.getName(), seckillActivity.getSpuId(), seckillActivity.getStartTime(), seckillActivity.getEndTime()));
183 56 }
184   - }
185   -
186   - private static void buildAppActivityRespVO(RewardActivityDO rewardActivity, Collection<Long> spuIds,
187   - List<AppActivityRespVO> activityList) {
188   - for (Long spuId : spuIds) {
189   - // 校验商品是否已经加入过活动
190   - if (anyMatch(activityList, appActivity -> ObjUtil.equal(appActivity.getId(), rewardActivity.getId()) &&
191   - ObjUtil.equal(appActivity.getSpuId(), spuId))) {
192   - continue;
193   - }
194   - activityList.add(new AppActivityRespVO(rewardActivity.getId(),
195   - PromotionTypeEnum.REWARD_ACTIVITY.getType(), rewardActivity.getName(), spuId,
196   - rewardActivity.getStartTime(), rewardActivity.getEndTime()));
  57 + // 3. 砍价活动
  58 + BargainActivityDO bargainActivity = bargainActivityService.getMatchBargainActivityBySpuId(spuId);
  59 + if (bargainActivity != null) {
  60 + activityVOList.add(new AppActivityRespVO(bargainActivity.getId(), PromotionTypeEnum.BARGAIN_ACTIVITY.getType(),
  61 + bargainActivity.getName(), bargainActivity.getSpuId(), bargainActivity.getStartTime(), bargainActivity.getEndTime()));
197 62 }
  63 + return success(activityVOList);
198 64 }
199 65  
200 66 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponTemplateController.java
  View file @caf49aa
... ... @@ -73,7 +73,7 @@ public class AppCouponTemplateController {
73 73 // 1.1 处理查询条件：商品范围编号
74 74 Long productScopeValue = getProductScopeValue(productScope, spuId);
75 75 // 1.2 处理查询条件：领取方式 = 直接领取
76   - List<Integer> canTakeTypes = singletonList(CouponTakeTypeEnum.USER.getValue());
  76 + List<Integer> canTakeTypes = singletonList(CouponTakeTypeEnum.USER.getType());
77 77  
78 78 // 2. 查询
79 79 List<CouponTemplateDO> list = couponTemplateService.getCouponTemplateList(canTakeTypes, productScope,
... ... @@ -105,7 +105,7 @@ public class AppCouponTemplateController {
105 105 // 1.1 处理查询条件：商品范围编号
106 106 Long productScopeValue = getProductScopeValue(pageReqVO.getProductScope(), pageReqVO.getSpuId());
107 107 // 1.2 处理查询条件：领取方式 = 直接领取
108   - List<Integer> canTakeTypes = singletonList(CouponTakeTypeEnum.USER.getValue());
  108 + List<Integer> canTakeTypes = singletonList(CouponTakeTypeEnum.USER.getType());
109 109  
110 110 // 2. 分页查询
111 111 PageResult<CouponTemplateDO> pageResult = couponTemplateService.getCouponTemplatePage(
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/AppPointActivityController.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.controller.app.point;
  2 +
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.util.ObjUtil;
  5 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  6 +import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  7 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  8 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  9 +import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
  10 +import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
  11 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity.PointActivityPageReqVO;
  12 +import cn.iocoder.yudao.module.promotion.controller.app.point.vo.AppPointActivityDetailRespVO;
  13 +import cn.iocoder.yudao.module.promotion.controller.app.point.vo.AppPointActivityPageReqVO;
  14 +import cn.iocoder.yudao.module.promotion.controller.app.point.vo.AppPointActivityRespVO;
  15 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointActivityDO;
  16 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointProductDO;
  17 +import cn.iocoder.yudao.module.promotion.service.point.PointActivityService;
  18 +import io.swagger.v3.oas.annotations.Operation;
  19 +import io.swagger.v3.oas.annotations.Parameter;
  20 +import io.swagger.v3.oas.annotations.tags.Tag;
  21 +import jakarta.annotation.Resource;
  22 +import org.springframework.validation.annotation.Validated;
  23 +import org.springframework.web.bind.annotation.GetMapping;
  24 +import org.springframework.web.bind.annotation.RequestMapping;
  25 +import org.springframework.web.bind.annotation.RequestParam;
  26 +import org.springframework.web.bind.annotation.RestController;
  27 +
  28 +import java.util.Collections;
  29 +import java.util.List;
  30 +import java.util.Map;
  31 +
  32 +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
  33 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
  34 +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
  35 +
  36 +@Tag(name = "用户 App - 积分商城活动")
  37 +@RestController
  38 +@RequestMapping("/promotion/point-activity")
  39 +@Validated
  40 +public class AppPointActivityController {
  41 +
  42 + @Resource
  43 + private PointActivityService pointActivityService;
  44 +
  45 + @Resource
  46 + private ProductSpuApi productSpuApi;
  47 +
  48 + @GetMapping("/page")
  49 + @Operation(summary = "获得积分商城活动分页")
  50 + public CommonResult<PageResult<AppPointActivityRespVO>> getPointActivityPage(AppPointActivityPageReqVO pageReqVO) {
  51 + // 1. 查询满足当前阶段的活动
  52 + PageResult<PointActivityDO> pageResult = pointActivityService.getPointActivityPage(
  53 + BeanUtils.toBean(pageReqVO, PointActivityPageReqVO.class));
  54 + if (CollUtil.isEmpty(pageResult.getList())) {
  55 + return success(PageResult.empty(pageResult.getTotal()));
  56 + }
  57 +
  58 + // 2. 拼接数据
  59 + List<AppPointActivityRespVO> resultList = buildAppPointActivityRespVOList(pageResult.getList());
  60 + return success(new PageResult<>(resultList, pageResult.getTotal()));
  61 + }
  62 +
  63 + @GetMapping("/get-detail")
  64 + @Operation(summary = "获得积分商城活动明细")
  65 + @Parameter(name = "id", description = "活动编号", required = true, example = "1024")
  66 + public CommonResult<AppPointActivityDetailRespVO> getPointActivity(@RequestParam("id") Long id) {
  67 + // 1. 获取活动
  68 + PointActivityDO activity = pointActivityService.getPointActivity(id);
  69 + if (activity == null
  70 + || ObjUtil.equal(activity.getStatus(), CommonStatusEnum.DISABLE.getStatus())) {
  71 + return success(null);
  72 + }
  73 +
  74 + // 2. 拼接数据
  75 + List<PointProductDO> products = pointActivityService.getPointProductListByActivityIds(Collections.singletonList(id));
  76 + AppPointActivityDetailRespVO respVO = BeanUtils.toBean(activity, AppPointActivityDetailRespVO.class);
  77 + respVO.setProducts(BeanUtils.toBean(products, AppPointActivityDetailRespVO.Product.class));
  78 + return success(respVO);
  79 + }
  80 +
  81 + @GetMapping("/list-by-ids")
  82 + @Operation(summary = "获得积分商城活动列表，基于活动编号数组")
  83 + @Parameter(name = "ids", description = "活动编号数组", required = true, example = "[1024, 1025]")
  84 + public CommonResult<List<AppPointActivityRespVO>> getCombinationActivityListByIds(@RequestParam("ids") List<Long> ids) {
  85 + // 1. 获得开启的活动列表
  86 + List<PointActivityDO> activityList = pointActivityService.getPointActivityListByIds(ids);
  87 + activityList.removeIf(activity -> CommonStatusEnum.isDisable(activity.getStatus()));
  88 + if (CollUtil.isEmpty(activityList)) {
  89 + return success(Collections.emptyList());
  90 + }
  91 + // 2. 拼接返回
  92 + List<AppPointActivityRespVO> result = buildAppPointActivityRespVOList(activityList);
  93 + return success(result);
  94 + }
  95 +
  96 + private List<AppPointActivityRespVO> buildAppPointActivityRespVOList(List<PointActivityDO> activityList) {
  97 + List<PointProductDO> products = pointActivityService.getPointProductListByActivityIds(
  98 + convertSet(activityList, PointActivityDO::getId));
  99 + Map<Long, List<PointProductDO>> productsMap = convertMultiMap(products, PointProductDO::getActivityId);
  100 + Map<Long, ProductSpuRespDTO> spuMap = productSpuApi.getSpusMap(
  101 + convertSet(activityList, PointActivityDO::getSpuId));
  102 + List<AppPointActivityRespVO> result = BeanUtils.toBean(activityList, AppPointActivityRespVO.class);
  103 + result.forEach(activity -> {
  104 + // 设置 product 信息
  105 + PointProductDO minProduct = getMinObject(productsMap.get(activity.getId()), PointProductDO::getPoint);
  106 + assert minProduct != null;
  107 + activity.setPoint(minProduct.getPoint()).setPrice(minProduct.getPrice());
  108 + findAndThen(spuMap, activity.getSpuId(),
  109 + spu -> activity.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice()));
  110 + });
  111 + return result;
  112 + }
  113 +
  114 +}
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/vo/AppPointActivityDetailRespVO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.controller.app.point.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.util.List;
  7 +
  8 +@Schema(description = "用户 App - 积分商城活动的详细 Response VO")
  9 +@Data
  10 +public class AppPointActivityDetailRespVO {
  11 +
  12 + @Schema(description = "积分商城活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11373")
  13 + private Long id;
  14 +
  15 + @Schema(description = "积分商城活动商品", requiredMode = Schema.RequiredMode.REQUIRED, example = "19509")
  16 + private Long spuId;
  17 +
  18 + @Schema(description = "活动状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  19 + private Integer status;
  20 +
  21 + @Schema(description = "积分商城活动库存(剩余库存积分兑换时扣减)", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  22 + private Integer stock;
  23 +
  24 + @Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  25 + private Integer totalStock;
  26 +
  27 + @Schema(description = "备注", example = "你说的对")
  28 + private String remark;
  29 +
  30 + @Schema(description = "商品信息数组", requiredMode = Schema.RequiredMode.REQUIRED)
  31 + private List<Product> products;
  32 +
  33 + @Schema(description = "商品信息")
  34 + @Data
  35 + public static class Product {
  36 +
  37 + @Schema(description = "积分商城商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "31718")
  38 + private Long id;
  39 +
  40 + @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2736")
  41 + private Long skuId;
  42 +
  43 + @Schema(description = "可兑换数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "3926")
  44 + private Integer count;
  45 +
  46 + @Schema(description = "兑换积分", requiredMode = Schema.RequiredMode.REQUIRED)
  47 + private Integer point;
  48 +
  49 + @Schema(description = "兑换金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "15860")
  50 + private Integer price;
  51 +
  52 + @Schema(description = "积分商城商品库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  53 + private Integer stock;
  54 +
  55 + }
  56 +
  57 +}
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/discount/vo/DiscountActivityDetailRespVO.java renamed to yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/vo/AppPointActivityPageReqVO.java 100755 → 100644
  View file @caf49aa
1   -package cn.iocoder.yudao.module.promotion.controller.admin.discount.vo;
  1 +package cn.iocoder.yudao.module.promotion.controller.app.point.vo;
2 2  
  3 +import cn.iocoder.yudao.framework.common.pojo.PageParam;
3 4 import io.swagger.v3.oas.annotations.media.Schema;
4 5 import lombok.Data;
5 6 import lombok.EqualsAndHashCode;
6 7 import lombok.ToString;
7 8  
8   -import java.util.List;
9   -
10   -@Schema(description = "管理后台 - 限时折扣活动的详细 Response VO")
  9 +@Schema(description = "用户 App - 积分商城活动分页 Request VO")
11 10 @Data
12 11 @EqualsAndHashCode(callSuper = true)
13 12 @ToString(callSuper = true)
14   -public class DiscountActivityDetailRespVO extends DiscountActivityRespVO {
15   -
16   - /**
17   - * 商品列表
18   - */
19   - private List<Product> products;
  13 +public class AppPointActivityPageReqVO extends PageParam {
20 14  
21 15 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/point/vo/AppPointActivityRespVO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.controller.app.point.vo;
  2 +
  3 +import com.alibaba.excel.annotation.ExcelProperty;
  4 +import io.swagger.v3.oas.annotations.media.Schema;
  5 +import lombok.Data;
  6 +
  7 +import java.time.LocalDateTime;
  8 +
  9 +@Schema(description = "用户 App - 积分商城活动 Response VO")
  10 +@Data
  11 +public class AppPointActivityRespVO {
  12 +
  13 + @Schema(description = "积分商城活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "11373")
  14 + @ExcelProperty("积分商城活动编号")
  15 + private Long id;
  16 +
  17 + @Schema(description = "积分商城活动商品", requiredMode = Schema.RequiredMode.REQUIRED, example = "19509")
  18 + @ExcelProperty("积分商城活动商品")
  19 + private Long spuId;
  20 +
  21 + @Schema(description = "活动状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  22 + @ExcelProperty("活动状态")
  23 + private Integer status;
  24 +
  25 + @Schema(description = "积分商城活动库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  26 + @ExcelProperty("积分商城活动库存")
  27 + private Integer stock; // 剩余库存积分兑换时扣减
  28 +
  29 + @Schema(description = "积分商城活动总库存", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
  30 + @ExcelProperty("积分商城活动总库存")
  31 + private Integer totalStock;
  32 +
  33 + // TODO @puhui999：只返回必要的字段，例如说 remark、sort、createTime 应该是不需要的呢。也可以看看别的也不需要哈。
  34 +
  35 + @Schema(description = "备注", example = "你说的对")
  36 + @ExcelProperty("备注")
  37 + private String remark;
  38 +
  39 + @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
  40 + @ExcelProperty("排序")
  41 + private Integer sort;
  42 +
  43 + @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
  44 + @ExcelProperty("创建时间")
  45 + private LocalDateTime createTime;
  46 +
  47 + // ========== 商品字段 ==========
  48 +
  49 + @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 name 读取
  50 + example = "618大促")
  51 + private String spuName;
  52 + @Schema(description = "商品主图", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 picUrl 读取
  53 + example = "https://www.iocoder.cn/xx.png")
  54 + private String picUrl;
  55 + @Schema(description = "商品市场价，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 marketPrice 读取
  56 + example = "50")
  57 + private Integer marketPrice;
  58 +
  59 + //======================= 显示所需兑换积分最少的 sku 信息 =======================
  60 +
  61 + @Schema(description = "兑换积分", requiredMode = Schema.RequiredMode.REQUIRED)
  62 + private Integer point;
  63 +
  64 + @Schema(description = "兑换金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "15860")
  65 + private Integer price;
  66 +
  67 +}
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/reward/AppRewardActivityController.java
  View file @caf49aa
... ... @@ -30,8 +30,18 @@ public class AppRewardActivityController {
30 30 @Operation(summary = "获得满减送活动")
31 31 @Parameter(name = "id", description = "编号", required = true, example = "1024")
32 32 public CommonResult<AppRewardActivityRespVO> getRewardActivity(@RequestParam("id") Long id) {
33   - RewardActivityDO rewardActivity = rewardActivityService.getRewardActivity(id);
34   - return success(BeanUtils.toBean(rewardActivity, AppRewardActivityRespVO.class));
  33 + RewardActivityDO activity = rewardActivityService.getRewardActivity(id);
  34 + if (activity == null) {
  35 + return success(null);
  36 + }
  37 + // 拼接 Rule 描述
  38 + AppRewardActivityRespVO activityVO = BeanUtils.toBean(activity, AppRewardActivityRespVO.class);
  39 + for (int i = 0; i < activityVO.getRules().size(); i++) {
  40 + AppRewardActivityRespVO.Rule ruleVO = activityVO.getRules().get(i);
  41 + RewardActivityDO.Rule rule = activity.getRules().get(i);
  42 + ruleVO.setDescription(rewardActivityService.getRewardActivityRuleDescription(activity.getConditionType(), rule));
  43 + }
  44 + return success(activityVO);
35 45 }
36 46  
37 47 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/reward/vo/AppRewardActivityRespVO.java
  View file @caf49aa
... ... @@ -4,6 +4,7 @@ import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivi
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6  
  7 +import java.time.LocalDateTime;
7 8 import java.util.List;
8 9  
9 10 @Schema(description = "用户 App - 满减送活动 Response VO")
... ... @@ -19,6 +20,12 @@ public class AppRewardActivityRespVO {
19 20 @Schema(description = "活动标题", requiredMode = Schema.RequiredMode.REQUIRED, example = "满啦满啦")
20 21 private String name;
21 22  
  23 + @Schema(description = "开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
  24 + private LocalDateTime startTime;
  25 +
  26 + @Schema(description = "结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
  27 + private LocalDateTime endTime;
  28 +
22 29 @Schema(description = "条件类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
23 30 private Integer conditionType;
24 31  
... ... @@ -26,9 +33,18 @@ public class AppRewardActivityRespVO {
26 33 private Integer productScope;
27 34  
28 35 @Schema(description = "商品 SPU 编号的数组", example = "1,2,3")
29   - private List<Long> productSpuIds;
  36 + private List<Long> productScopeValues;
30 37  
31 38 @Schema(description = "优惠规则的数组")
32   - private List<RewardActivityBaseVO.Rule> rules;
  39 + private List<Rule> rules;
  40 +
  41 + @Schema(description = "优惠规则")
  42 + @Data
  43 + public static class Rule extends RewardActivityBaseVO.Rule {
  44 +
  45 + @Schema(description = "规则描述")
  46 + private String description; // 通过 {@link #limit}、{@link #discountPrice} 等字段进行拼接
  47 +
  48 + }
33 49  
34 50 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/seckill/AppSeckillActivityController.java
  View file @caf49aa
... ... @@ -151,7 +151,7 @@ public class AppSeckillActivityController {
151 151 }
152 152  
153 153 @GetMapping("/list-by-ids")
154   - @Operation(summary = "获得拼团活动列表，基于活动编号数组")
  154 + @Operation(summary = "获得秒杀活动列表，基于活动编号数组")
155 155 @Parameter(name = "ids", description = "活动编号数组", required = true, example = "[1024, 1025]")
156 156 public CommonResult<List<AppSeckillActivityRespVO>> getCombinationActivityListByIds(@RequestParam("ids") List<Long> ids) {
157 157 // 1. 获得开启的活动列表
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/discount/DiscountActivityConvert.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.convert.discount;
2 2  
3   -import cn.hutool.core.util.ObjectUtil;
4 3 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
6   -import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
7   -import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
8   -import cn.iocoder.yudao.module.promotion.api.discount.dto.DiscountProductRespDTO;
9   -import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.*;
  4 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  5 +import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityBaseVO;
  6 +import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityCreateReqVO;
  7 +import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityRespVO;
  8 +import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityUpdateReqVO;
10 9 import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountActivityDO;
11 10 import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountProductDO;
12   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
13 11 import org.mapstruct.Mapper;
14 12 import org.mapstruct.factory.Mappers;
15 13  
16 14 import java.util.List;
17   -import java.util.Map;
18 15  
19 16 /**
20 17 * 限时折扣活动 Convert
... ... @@ -33,105 +30,22 @@ public interface DiscountActivityConvert {
33 30 DiscountActivityRespVO convert(DiscountActivityDO bean);
34 31  
35 32 List<DiscountActivityRespVO> convertList(List<DiscountActivityDO> list);
36   - List<DiscountActivityBaseVO.Product> convertList2(List<DiscountProductDO> list);
37 33  
38   - List<DiscountProductRespDTO> convertList02(List<DiscountProductDO> list);
  34 + List<DiscountActivityBaseVO.Product> convertList2(List<DiscountProductDO> list);
39 35  
40 36 PageResult<DiscountActivityRespVO> convertPage(PageResult<DiscountActivityDO> page);
41 37  
42 38 default PageResult<DiscountActivityRespVO> convertPage(PageResult<DiscountActivityDO> page,
43   - List<DiscountProductDO> discountProductDOList,
44   - List<ProductSpuRespDTO> spuList) {
  39 + List<DiscountProductDO> discountProductDOList) {
45 40 PageResult<DiscountActivityRespVO> pageResult = convertPage(page);
46   -
47   - // 拼接商品 TODO @zhangshuai：类似空行的问题，也可以看看
48   - Map<Long, DiscountProductDO> discountActivityMap = CollectionUtils.convertMap(discountProductDOList, DiscountProductDO::getActivityId);
49   - Map<Long, ProductSpuRespDTO> spuMap = CollectionUtils.convertMap(spuList, ProductSpuRespDTO::getId);
50   - pageResult.getList().forEach(item -> {
51   - item.setProducts(convertList2(discountProductDOList));
52   - item.setSpuId(discountActivityMap.get(item.getId())==null?null: discountActivityMap.get(item.getId()).getSpuId());
53   - if (item.getSpuId() != null) {
54   - MapUtils.findAndThen(spuMap, item.getSpuId(),
55   - spu -> item.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()).setMarketPrice(spu.getMarketPrice()));
56   - }
57   -
58   - });
  41 + pageResult.getList().forEach(item -> item.setProducts(convertList2(discountProductDOList)));
59 42 return pageResult;
60 43 }
61 44  
62 45 DiscountProductDO convert(DiscountActivityBaseVO.Product bean);
63 46  
64   - default DiscountActivityDetailRespVO convert(DiscountActivityDO activity, List<DiscountProductDO> products){
65   - if ( activity == null && products == null ) {
66   - return null;
67   - }
68   -
69   - DiscountActivityDetailRespVO discountActivityDetailRespVO = new DiscountActivityDetailRespVO();
70   -
71   - if ( activity != null ) {
72   - discountActivityDetailRespVO.setName( activity.getName() );
73   - discountActivityDetailRespVO.setStartTime( activity.getStartTime() );
74   - discountActivityDetailRespVO.setEndTime( activity.getEndTime() );
75   - discountActivityDetailRespVO.setRemark( activity.getRemark() );
76   - discountActivityDetailRespVO.setId( activity.getId() );
77   - discountActivityDetailRespVO.setStatus( activity.getStatus() );
78   - discountActivityDetailRespVO.setCreateTime( activity.getCreateTime() );
79   - }
80   - if (!products.isEmpty()) {
81   - discountActivityDetailRespVO.setSpuId(products.get(0).getSpuId());
82   - }
83   - discountActivityDetailRespVO.setProducts( convertList2( products ) );
84   -
85   - return discountActivityDetailRespVO;
86   - }
87   -
88   - // =========== 比较是否相等 ==========
89   - /**
90   - * 比较两个限时折扣商品是否相等
91   - *
92   - * @param productDO 数据库中的商品
93   - * @param productVO 前端传入的商品
94   - * @return 是否匹配
95   - */
96   - @SuppressWarnings("DuplicatedCode")
97   - default boolean isEquals(DiscountProductDO productDO, DiscountActivityBaseVO.Product productVO) {
98   - if (ObjectUtil.notEqual(productDO.getSpuId(), productVO.getSpuId())
99   - || ObjectUtil.notEqual(productDO.getSkuId(), productVO.getSkuId())
100   - || ObjectUtil.notEqual(productDO.getDiscountType(), productVO.getDiscountType())) {
101   - return false;
102   - }
103   - if (productDO.getDiscountType().equals(PromotionDiscountTypeEnum.PRICE.getType())) {
104   - return ObjectUtil.equal(productDO.getDiscountPrice(), productVO.getDiscountPrice());
105   - }
106   - if (productDO.getDiscountType().equals(PromotionDiscountTypeEnum.PERCENT.getType())) {
107   - return ObjectUtil.equal(productDO.getDiscountPercent(), productVO.getDiscountPercent());
108   - }
109   - return true;
  47 + default DiscountActivityRespVO convert(DiscountActivityDO activity, List<DiscountProductDO> products) {
  48 + return BeanUtils.toBean(activity, DiscountActivityRespVO.class).setProducts(convertList2(products));
110 49 }
111 50  
112   - /**
113   - * 比较两个限时折扣商品是否相等
114   - * 注意，比较时忽略 id 编号
115   - *
116   - * @param productDO 商品 1
117   - * @param productVO 商品 2
118   - * @return 是否匹配
119   - */
120   - @SuppressWarnings("DuplicatedCode")
121   - default boolean isEquals(DiscountProductDO productDO, DiscountProductDO productVO) {
122   - if (ObjectUtil.notEqual(productDO.getSpuId(), productVO.getSpuId())
123   - || ObjectUtil.notEqual(productDO.getSkuId(), productVO.getSkuId())
124   - || ObjectUtil.notEqual(productDO.getDiscountType(), productVO.getDiscountType())) {
125   - return false;
126   - }
127   - if (productDO.getDiscountType().equals(PromotionDiscountTypeEnum.PRICE.getType())) {
128   - return ObjectUtil.equal(productDO.getDiscountPrice(), productVO.getDiscountPrice());
129   - }
130   - if (productDO.getDiscountType().equals(PromotionDiscountTypeEnum.PERCENT.getType())) {
131   - return ObjectUtil.equal(productDO.getDiscountPercent(), productVO.getDiscountPercent());
132   - }
133   - return true;
134   - }
135   -
136   -
137   -}
  51 +}
138 52 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
  View file @caf49aa
... ... @@ -67,9 +67,15 @@ public class DiscountProductDO extends BaseDO {
67 67 private Integer discountPrice;
68 68  
69 69 /**
  70 + * 活动标题
  71 + *
  72 + * 冗余 {@link DiscountActivityDO#getName()}
  73 + */
  74 + private String activityName;
  75 + /**
70 76 * 活动状态
71 77 *
72   - * 关联 {@link DiscountActivityDO#getStatus()}
  78 + * 冗余 {@link DiscountActivityDO#getStatus()}
73 79 */
74 80 private Integer activityStatus;
75 81 /**
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/point/PointActivityDO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.dal.dataobject.point;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.Data;
  9 +import lombok.EqualsAndHashCode;
  10 +import lombok.ToString;
  11 +
  12 +/**
  13 + * 积分商城活动 DO
  14 + *
  15 + * @author HUIHUI
  16 + */
  17 +@TableName(value = "promotion_point_activity", autoResultMap = true)
  18 +@KeySequence("promotion_point_activity_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  19 +@Data
  20 +@EqualsAndHashCode(callSuper = true)
  21 +@ToString(callSuper = true)
  22 +public class PointActivityDO extends BaseDO {
  23 +
  24 + /**
  25 + * 积分商城活动编号
  26 + */
  27 + @TableId
  28 + private Long id;
  29 + /**
  30 + * 积分商城活动商品
  31 + */
  32 + private Long spuId;
  33 + /**
  34 + * 活动状态
  35 + *
  36 + * 枚举 {@link CommonStatusEnum 对应的类}
  37 + */
  38 + private Integer status;
  39 + /**
  40 + * 备注
  41 + */
  42 + private String remark;
  43 + /**
  44 + * 排序
  45 + */
  46 + private Integer sort;
  47 +
  48 + /**
  49 + * 积分商城活动库存(剩余库存积分兑换时扣减)
  50 + */
  51 + private Integer stock;
  52 + /**
  53 + * 积分商城活动总库存
  54 + */
  55 + private Integer totalStock;
  56 +
  57 +}
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/point/PointProductDO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.dal.dataobject.point;
  2 +
  3 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  4 +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
  5 +import com.baomidou.mybatisplus.annotation.KeySequence;
  6 +import com.baomidou.mybatisplus.annotation.TableId;
  7 +import com.baomidou.mybatisplus.annotation.TableName;
  8 +import lombok.*;
  9 +
  10 +/**
  11 + * 积分商城商品 DO
  12 + *
  13 + * @author HUIHUI
  14 + */
  15 +@TableName("promotion_point_product")
  16 +@KeySequence("promotion_point_product_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
  17 +@Data
  18 +@EqualsAndHashCode(callSuper = true)
  19 +@ToString(callSuper = true)
  20 +@Builder
  21 +@NoArgsConstructor
  22 +@AllArgsConstructor
  23 +public class PointProductDO extends BaseDO {
  24 +
  25 + /**
  26 + * 积分商城商品编号
  27 + */
  28 + @TableId
  29 + private Long id;
  30 + /**
  31 + * 积分商城活动 id
  32 + *
  33 + * 关联 {@link PointActivityDO#getId()}
  34 + */
  35 + private Long activityId;
  36 + /**
  37 + * 商品 SPU 编号
  38 + */
  39 + private Long spuId;
  40 + /**
  41 + * 商品 SKU 编号
  42 + */
  43 + private Long skuId;
  44 + /**
  45 + * 可兑换次数
  46 + */
  47 + private Integer count;
  48 + /**
  49 + * 所需兑换积分
  50 + */
  51 + private Integer point;
  52 + /**
  53 + * 所需兑换金额，单位：分
  54 + */
  55 + private Integer price;
  56 + /**
  57 + * 积分商城商品库存
  58 + */
  59 + private Integer stock;
  60 + /**
  61 + * 积分商城商品状态
  62 + *
  63 + * 枚举 {@link CommonStatusEnum 对应的类}
  64 + */
  65 + private Integer activityStatus;
  66 +
  67 +}
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/bargain/BargainActivityMapper.java
  View file @caf49aa
... ... @@ -6,14 +6,11 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.activity.BargainActivityPageReqVO;
8 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.bargain.BargainActivityDO;
9   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 9 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
11 10 import org.apache.ibatis.annotations.Mapper;
12 11  
13 12 import java.time.LocalDateTime;
14   -import java.util.Collection;
15 13 import java.util.List;
16   -import java.util.Map;
17 14  
18 15 /**
19 16 * 砍价活动 Mapper
... ... @@ -86,35 +83,13 @@ public interface BargainActivityMapper extends BaseMapperX&lt;BargainActivityDO&gt; {
86 83 .last("LIMIT " + count));
87 84 }
88 85  
89   - /**
90   - * 查询出指定 spuId 的 spu 参加的活动最接近现在的一条记录。多个的话，一个 spuId 对应一个最近的活动编号
91   - *
92   - * @param spuIds spu 编号
93   - * @param status 状态
94   - * @return 包含 spuId 和 activityId 的 map 对象列表
95   - */
96   - default List<Map<String, Object>> selectSpuIdAndActivityIdMapsBySpuIdsAndStatus(Collection<Long> spuIds, Integer status) {
97   - return selectMaps(new QueryWrapper<BargainActivityDO>()
98   - .select("spu_id AS spuId, MAX(DISTINCT(id)) AS activityId") // 时间越大 id 也越大 直接用 id
99   - .in("spu_id", spuIds)
100   - .eq("status", status)
101   - .groupBy("spu_id"));
102   - }
103   -
104   - /**
105   - * 获取指定活动编号的活动列表且
106   - * 开始时间和结束时间小于给定时间 dateTime 的活动列表
107   - *
108   - * @param ids 活动编号
109   - * @param dateTime 指定日期
110   - * @return 活动列表
111   - */
112   - default List<BargainActivityDO> selectListByIdsAndDateTimeLt(Collection<Long> ids, LocalDateTime dateTime) {
113   - return selectList(new LambdaQueryWrapperX<BargainActivityDO>()
114   - .in(BargainActivityDO::getId, ids)
115   - .lt(BargainActivityDO::getStartTime, dateTime)
116   - .gt(BargainActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间，也就是说获取指定时间段的活动
117   - .orderByDesc(BargainActivityDO::getCreateTime));
  86 + default BargainActivityDO selectBySpuIdAndStatusAndNow(Long spuId, Integer status) {
  87 + LocalDateTime now = LocalDateTime.now();
  88 + return selectOne(new LambdaQueryWrapperX<BargainActivityDO>()
  89 + .eq(BargainActivityDO::getSpuId, spuId)
  90 + .eq(BargainActivityDO::getStatus, status)
  91 + .lt(BargainActivityDO::getStartTime, now)
  92 + .gt(BargainActivityDO::getEndTime, now)); // 开始时间 < now < 结束时间，也就是说获取指定时间段的活动
118 93 }
119 94  
120 95 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/combination/CombinationActivityMapper.java
  View file @caf49aa
... ... @@ -6,14 +6,10 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activity.CombinationActivityPageReqVO;
8 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
9   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
10 9 import org.apache.ibatis.annotations.Mapper;
11   -import org.apache.ibatis.annotations.Param;
12 10  
13 11 import java.time.LocalDateTime;
14   -import java.util.Collection;
15 12 import java.util.List;
16   -import java.util.Map;
17 13  
18 14 /**
19 15 * 拼团活动 Mapper
... ... @@ -39,40 +35,13 @@ public interface CombinationActivityMapper extends BaseMapperX&lt;CombinationActivi
39 35 .eq(CombinationActivityDO::getStatus, status));
40 36 }
41 37  
42   - default List<CombinationActivityDO> selectListByStatus(Integer status, Integer count) {
43   - return selectList(new LambdaQueryWrapperX<CombinationActivityDO>()
  38 + default CombinationActivityDO selectBySpuIdAndStatusAndNow(Long spuId, Integer status) {
  39 + LocalDateTime now = LocalDateTime.now();
  40 + return selectOne(new LambdaQueryWrapperX<CombinationActivityDO>()
  41 + .eq(CombinationActivityDO::getSpuId, spuId)
44 42 .eq(CombinationActivityDO::getStatus, status)
45   - .last("LIMIT " + count));
  43 + .lt(CombinationActivityDO::getStartTime, now)
  44 + .gt(CombinationActivityDO::getEndTime, now)); // 开始时间 < now < 结束时间，也就是说获取指定时间段的活动
46 45 }
47 46  
48   - /**
49   - * 查询出指定 spuId 的 spu 参加的活动最接近现在的一条记录。多个的话，一个 spuId 对应一个最近的活动编号
50   - * @param spuIds spu 编号
51   - * @param status 状态
52   - * @return 包含 spuId 和 activityId 的 map 对象列表
53   - */
54   - default List<Map<String, Object>> selectSpuIdAndActivityIdMapsBySpuIdsAndStatus(@Param("spuIds") Collection<Long> spuIds, @Param("status") Integer status) {
55   - return selectMaps(new QueryWrapper<CombinationActivityDO>()
56   - .select("spu_id AS spuId, MAX(DISTINCT(id)) AS activityId") // 时间越大 id 也越大 直接用 id
57   - .in("spu_id", spuIds)
58   - .eq("status", status)
59   - .groupBy("spu_id"));
60   - }
61   -
62   - /**
63   - * 获取指定活动编号的活动列表且
64   - * 开始时间和结束时间小于给定时间 dateTime 的活动列表
65   - *
66   - * @param ids 活动编号
67   - * @param dateTime 指定日期
68   - * @return 活动列表
69   - */
70   - default List<CombinationActivityDO> selectListByIdsAndDateTimeLt(Collection<Long> ids, LocalDateTime dateTime) {
71   - return selectList(new LambdaQueryWrapperX<CombinationActivityDO>()
72   - .in(CombinationActivityDO::getId, ids)
73   - .lt(CombinationActivityDO::getStartTime, dateTime)
74   - .gt(CombinationActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间，也就是说获取指定时间段的活动
75   - .orderByDesc(CombinationActivityDO::getCreateTime));
76   - }
77   -
78   -}
  47 +}
79 48 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponTemplateMapper.java
  View file @caf49aa
... ... @@ -70,7 +70,7 @@ public interface CouponTemplateMapper extends BaseMapperX&lt;CouponTemplateDO&gt; {
70 70 .in(CouponTemplateDO::getTakeType, canTakeTypes) // 2. 领取方式一致
71 71 .and(ww -> ww.gt(CouponTemplateDO::getValidEndTime, LocalDateTime.now()) // 3.1 未过期
72 72 .or().eq(CouponTemplateDO::getValidityType, CouponTemplateValidityTypeEnum.TERM.getType())) // 3.2 领取之后
73   - .apply(" (take_count < total_count OR total_count = -1 )"); // 4. 剩余数量大于 0，或者无限领取
  73 + .apply(" (take_count < total_count OR total_count = -1)"); // 4. 剩余数量大于 0，或者无限领取
74 74 }
75 75 return canTakeConsumer;
76 76 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/discount/DiscountProductMapper.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.dal.mysql.discount;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  4 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
4 5 import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountProductDO;
5   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  6 +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
6 7 import org.apache.ibatis.annotations.Mapper;
7   -import org.apache.ibatis.annotations.Param;
8 8  
  9 +import java.time.LocalDateTime;
9 10 import java.util.Collection;
10 11 import java.util.List;
11   -import java.util.Map;
12 12  
13 13 /**
14 14 * 限时折扣商城 Mapper
... ... @@ -18,10 +18,6 @@ import java.util.Map;
18 18 @Mapper
19 19 public interface DiscountProductMapper extends BaseMapperX<DiscountProductDO> {
20 20  
21   - default List<DiscountProductDO> selectListBySkuId(Collection<Long> skuIds) {
22   - return selectList(DiscountProductDO::getSkuId, skuIds);
23   - }
24   -
25 21 default List<DiscountProductDO> selectListByActivityId(Long activityId) {
26 22 return selectList(DiscountProductDO::getActivityId, activityId);
27 23 }
... ... @@ -30,22 +26,28 @@ public interface DiscountProductMapper extends BaseMapperX&lt;DiscountProductDO&gt; {
30 26 return selectList(DiscountProductDO::getActivityId, activityIds);
31 27 }
32 28  
33   - // TODO @zhangshuai：逻辑里，尽量避免写 join 语句哈，你可以看看这个查询，有什么办法优化？目前的一个思路，是分 2 次查询，性能也是 ok 的
34   - List<DiscountProductDO> getMatchDiscountProductList(@Param("skuIds") Collection<Long> skuIds);
35   -
36   - /**
37   - * 查询出指定 spuId 的 spu 参加的活动最接近现在的一条记录。多个的话，一个 spuId 对应一个最近的活动编号
38   - *
39   - * @param spuIds spu 编号
40   - * @param status 状态
41   - * @return 包含 spuId 和 activityId 的 map 对象列表
42   - */
43   - default List<Map<String, Object>> selectSpuIdAndActivityIdMapsBySpuIdsAndStatus(Collection<Long> spuIds, Integer status) {
44   - return selectMaps(new QueryWrapper<DiscountProductDO>()
45   - .select("spu_id AS spuId, MAX(DISTINCT(activity_id)) AS activityId")
46   - .in("spu_id", spuIds)
47   - .eq("activity_status", status)
48   - .groupBy("spu_id"));
  29 + default List<DiscountProductDO> selectListBySpuIdsAndStatus(Collection<Long> spuIds, Integer status) {
  30 + return selectList(new LambdaQueryWrapperX<DiscountProductDO>()
  31 + .in(DiscountProductDO::getSpuId, spuIds)
  32 + .eq(DiscountProductDO::getActivityStatus, status));
  33 + }
  34 +
  35 + default void updateByActivityId(DiscountProductDO discountProductDO) {
  36 + update(discountProductDO, new LambdaUpdateWrapper<DiscountProductDO>()
  37 + .eq(DiscountProductDO::getActivityId, discountProductDO.getActivityId()));
  38 + }
  39 +
  40 + default void deleteByActivityId(Long activityId) {
  41 + delete(DiscountProductDO::getActivityId, activityId);
  42 + }
  43 +
  44 + default List<DiscountProductDO> selectListBySkuIdsAndStatusAndNow(Collection<Long> skuIds, Integer status) {
  45 + LocalDateTime now = LocalDateTime.now();
  46 + return selectList(new LambdaQueryWrapperX<DiscountProductDO>()
  47 + .in(DiscountProductDO::getSkuId, skuIds)
  48 + .eq(DiscountProductDO::getActivityStatus,status)
  49 + .lt(DiscountProductDO::getActivityStartTime, now)
  50 + .gt(DiscountProductDO::getActivityEndTime, now));
49 51 }
50 52  
51 53 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/point/PointActivityMapper.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.dal.mysql.point;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  5 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
  6 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity.PointActivityPageReqVO;
  7 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointActivityDO;
  8 +import org.apache.ibatis.annotations.Mapper;
  9 +
  10 +/**
  11 + * 积分商城活动 Mapper
  12 + *
  13 + * @author HUIHUI
  14 + */
  15 +@Mapper
  16 +public interface PointActivityMapper extends BaseMapperX<PointActivityDO> {
  17 +
  18 + default PageResult<PointActivityDO> selectPage(PointActivityPageReqVO reqVO) {
  19 + return selectPage(reqVO, new LambdaQueryWrapperX<PointActivityDO>()
  20 + .eqIfPresent(PointActivityDO::getSpuId, reqVO.getSpuId())
  21 + .eqIfPresent(PointActivityDO::getStatus, reqVO.getStatus())
  22 + .eqIfPresent(PointActivityDO::getRemark, reqVO.getRemark())
  23 + .eqIfPresent(PointActivityDO::getSort, reqVO.getSort())
  24 + .betweenIfPresent(PointActivityDO::getCreateTime, reqVO.getCreateTime())
  25 + .orderByDesc(PointActivityDO::getId));
  26 + }
  27 +
  28 +}
0 29 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/point/PointProductMapper.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.dal.mysql.point;
  2 +
  3 +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  4 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointProductDO;
  5 +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
  6 +import org.apache.ibatis.annotations.Mapper;
  7 +
  8 +import java.util.Collection;
  9 +import java.util.List;
  10 +
  11 +/**
  12 + * 积分商城商品 Mapper
  13 + *
  14 + * @author HUIHUI
  15 + */
  16 +@Mapper
  17 +public interface PointProductMapper extends BaseMapperX<PointProductDO> {
  18 +
  19 + default List<PointProductDO> selectListByActivityId(Collection<Long> activityIds) {
  20 + return selectList(PointProductDO::getActivityId, activityIds);
  21 + }
  22 +
  23 + default List<PointProductDO> selectListByActivityId(Long activityId) {
  24 + return selectList(PointProductDO::getActivityId, activityId);
  25 + }
  26 +
  27 + default void updateByActivityId(PointProductDO pointProductDO) {
  28 + update(pointProductDO, new LambdaUpdateWrapper<PointProductDO>()
  29 + .eq(PointProductDO::getActivityId, pointProductDO.getActivityId()));
  30 + }
  31 +
  32 +}
0 33 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/reward/RewardActivityMapper.java
  View file @caf49aa
... ... @@ -6,7 +6,7 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
6 6 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
7 7 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
8 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
9   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
  9 +import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
10 10 import org.apache.ibatis.annotations.Mapper;
11 11  
12 12 import java.time.LocalDateTime;
... ... @@ -30,29 +30,23 @@ public interface RewardActivityMapper extends BaseMapperX&lt;RewardActivityDO&gt; {
30 30 .orderByDesc(RewardActivityDO::getId));
31 31 }
32 32  
33   - default List<RewardActivityDO> selectListBySpuIdsAndStatus(Collection<Long> spuIds, Integer status) {
  33 + default List<RewardActivityDO> selectListBySpuIdAndStatusAndNow(Collection<Long> spuIds,
  34 + Collection<Long> categoryIds,
  35 + Integer status) {
  36 + LocalDateTime now = LocalDateTime.now();
34 37 Function<Collection<Long>, String> productScopeValuesFindInSetFunc = ids -> ids.stream()
35 38 .map(id -> StrUtil.format("FIND_IN_SET({}, product_scope_values) ", id))
36 39 .collect(Collectors.joining(" OR "));
37   - return selectList(new QueryWrapper<RewardActivityDO>()
38   - .eq("status", status)
39   - .apply(productScopeValuesFindInSetFunc.apply(spuIds)));
40   - }
41   -
42   - /**
43   - * 获取指定活动编号的活动列表且
44   - * 开始时间和结束时间小于给定时间 dateTime 的活动列表
45   - *
46   - * @param status 状态
47   - * @param dateTime 指定日期
48   - * @return 活动列表
49   - */
50   - default List<RewardActivityDO> selectListByStatusAndDateTimeLt(Integer status, LocalDateTime dateTime) {
51 40 return selectList(new LambdaQueryWrapperX<RewardActivityDO>()
52 41 .eq(RewardActivityDO::getStatus, status)
53   - .lt(RewardActivityDO::getStartTime, dateTime)
54   - .gt(RewardActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间，也就是说获取指定时间段的活动
55   - .orderByAsc(RewardActivityDO::getStartTime)
  42 + .lt(RewardActivityDO::getStartTime, now)
  43 + .gt(RewardActivityDO::getEndTime, now)
  44 + .and(i -> i.eq(RewardActivityDO::getProductScope, PromotionProductScopeEnum.SPU.getScope())
  45 + .and(i1 -> i1.apply(productScopeValuesFindInSetFunc.apply(spuIds)))
  46 + .or(i1 -> i1.eq(RewardActivityDO::getProductScope, PromotionProductScopeEnum.ALL.getScope()))
  47 + .or(i1 -> i1.eq(RewardActivityDO::getProductScope, PromotionProductScopeEnum.CATEGORY.getScope())
  48 + .and(i2 -> i2.apply(productScopeValuesFindInSetFunc.apply(categoryIds)))))
  49 + .orderByDesc(RewardActivityDO::getId)
56 50 );
57 51 }
58 52  
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/seckill/seckillactivity/SeckillActivityMapper.java
  View file @caf49aa
... ... @@ -8,15 +8,11 @@ import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
8 8 import cn.iocoder.yudao.module.promotion.controller.admin.seckill.vo.activity.SeckillActivityPageReqVO;
9 9 import cn.iocoder.yudao.module.promotion.controller.app.seckill.vo.activity.AppSeckillActivityPageReqVO;
10 10 import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillActivityDO;
11   -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
12 11 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
13 12 import org.apache.ibatis.annotations.Mapper;
14   -import org.apache.ibatis.annotations.Param;
15 13  
16 14 import java.time.LocalDateTime;
17   -import java.util.Collection;
18 15 import java.util.List;
19   -import java.util.Map;
20 16  
21 17 /**
22 18 * 秒杀活动 Mapper
... ... @@ -51,7 +47,7 @@ public interface SeckillActivityMapper extends BaseMapperX&lt;SeckillActivityDO&gt; {
51 47 Assert.isTrue(count > 0);
52 48 return update(null, new LambdaUpdateWrapper<SeckillActivityDO>()
53 49 .eq(SeckillActivityDO::getId, id)
54   - .gt(SeckillActivityDO::getStock, count)
  50 + .ge(SeckillActivityDO::getStock, count)
55 51 .setSql("stock = stock - " + count));
56 52 }
57 53  
... ... @@ -69,41 +65,21 @@ public interface SeckillActivityMapper extends BaseMapperX&lt;SeckillActivityDO&gt; {
69 65 .setSql("stock = stock + " + count));
70 66 }
71 67  
72   - default PageResult<SeckillActivityDO> selectPage(AppSeckillActivityPageReqVO pageReqVO, Integer status) {
  68 + default PageResult<SeckillActivityDO> selectPage(AppSeckillActivityPageReqVO pageReqVO, Integer status, LocalDateTime dateTime) {
73 69 return selectPage(pageReqVO, new LambdaQueryWrapperX<SeckillActivityDO>()
74 70 .eqIfPresent(SeckillActivityDO::getStatus, status)
  71 + .lt(SeckillActivityDO::getStartTime, dateTime)
  72 + .gt(SeckillActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间，也就是说获取指定时间段的活动
75 73 .apply(ObjectUtil.isNotNull(pageReqVO.getConfigId()), "FIND_IN_SET(" + pageReqVO.getConfigId() + ",config_ids) > 0"));
76 74 }
77 75  
78   - /**
79   - * 查询出指定 spuId 的 spu 参加的活动最接近现在的一条记录。多个的话，一个 spuId 对应一个最近的活动编号
80   - *
81   - * @param spuIds spu 编号
82   - * @param status 状态
83   - * @return 包含 spuId 和 activityId 的 map 对象列表
84   - */
85   - default List<Map<String, Object>> selectSpuIdAndActivityIdMapsBySpuIdsAndStatus(@Param("spuIds") Collection<Long> spuIds, @Param("status") Integer status) {
86   - return selectMaps(new QueryWrapper<SeckillActivityDO>()
87   - .select("spu_id AS spuId, MAX(DISTINCT(id)) AS activityId") // 时间越大 id 也越大 直接用 id
88   - .in("spu_id", spuIds)
89   - .eq("status", status)
90   - .groupBy("spu_id"));
91   - }
92   -
93   - /**
94   - * 获取指定活动编号的活动列表且
95   - * 开始时间和结束时间小于给定时间 dateTime 的活动列表
96   - *
97   - * @param ids 活动编号
98   - * @param dateTime 指定日期
99   - * @return 活动列表
100   - */
101   - default List<SeckillActivityDO> selectListByIdsAndDateTimeLt(Collection<Long> ids, LocalDateTime dateTime) {
102   - return selectList(new LambdaQueryWrapperX<SeckillActivityDO>()
103   - .in(SeckillActivityDO::getId, ids)
104   - .lt(SeckillActivityDO::getStartTime, dateTime)
105   - .gt(SeckillActivityDO::getEndTime, dateTime)// 开始时间 < 指定时间 < 结束时间，也就是说获取指定时间段的活动
106   - .orderByDesc(SeckillActivityDO::getCreateTime));
  76 + default SeckillActivityDO selectBySpuIdAndStatusAndNow(Long spuId, Integer status) {
  77 + LocalDateTime now = LocalDateTime.now();
  78 + return selectOne(new LambdaQueryWrapperX<SeckillActivityDO>()
  79 + .eq(SeckillActivityDO::getSpuId, spuId)
  80 + .eq(SeckillActivityDO::getStatus, status)
  81 + .lt(SeckillActivityDO::getStartTime, now)
  82 + .gt(SeckillActivityDO::getEndTime, now)); // 开始时间 < now < 结束时间，也就是说获取指定时间段的活动
107 83 }
108 84  
109 85 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityService.java
  View file @caf49aa
... ... @@ -6,10 +6,8 @@ import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.activity.Ba
6 6 import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.activity.BargainActivityPageReqVO;
7 7 import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.activity.BargainActivityUpdateReqVO;
8 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.bargain.BargainActivityDO;
9   -
10 9 import jakarta.validation.Valid;
11   -import java.time.LocalDateTime;
12   -import java.util.Collection;
  10 +
13 11 import java.util.List;
14 12 import java.util.Set;
15 13  
... ... @@ -108,13 +106,11 @@ public interface BargainActivityService {
108 106 List<BargainActivityDO> getBargainActivityListByCount(Integer count);
109 107  
110 108 /**
111   - * 获取指定 spu 编号最近参加的活动，每个 spuId 只返回一条记录
  109 + * 获得 SPU 进行中的砍价活动
112 110 *
113   - * @param spuIds spu 编号
114   - * @param status 状态
115   - * @param dateTime 日期时间
116   - * @return 砍价活动列表
  111 + * @param spuId SPU 编号数组
  112 + * @return 砍价活动
117 113 */
118   - List<BargainActivityDO> getBargainActivityBySpuIdsAndStatusAndDateTimeLt(Collection<Long> spuIds, Integer status, LocalDateTime dateTime);
  114 + BargainActivityDO getMatchBargainActivityBySpuId(Long spuId);
119 115  
120 116 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/bargain/BargainActivityServiceImpl.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.service.bargain;
2 2  
3   -import cn.hutool.core.collection.CollUtil;
4   -import cn.hutool.core.map.MapUtil;
5 3 import cn.hutool.core.util.ObjectUtil;
6 4 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
7 5 import cn.iocoder.yudao.framework.common.pojo.PageParam;
... ... @@ -15,17 +13,17 @@ import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.activity.Ba
15 13 import cn.iocoder.yudao.module.promotion.convert.bargain.BargainActivityConvert;
16 14 import cn.iocoder.yudao.module.promotion.dal.dataobject.bargain.BargainActivityDO;
17 15 import cn.iocoder.yudao.module.promotion.dal.mysql.bargain.BargainActivityMapper;
  16 +import jakarta.annotation.Resource;
18 17 import org.springframework.stereotype.Service;
19 18 import org.springframework.transaction.annotation.Transactional;
20 19 import org.springframework.validation.annotation.Validated;
21 20  
22   -import jakarta.annotation.Resource;
23 21 import java.time.LocalDateTime;
24   -import java.util.*;
  22 +import java.util.List;
  23 +import java.util.Set;
25 24  
26 25 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
27 26 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.anyMatch;
28   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
29 27 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
30 28 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
31 29  
... ... @@ -194,15 +192,8 @@ public class BargainActivityServiceImpl implements BargainActivityService {
194 192 }
195 193  
196 194 @Override
197   - public List<BargainActivityDO> getBargainActivityBySpuIdsAndStatusAndDateTimeLt(Collection<Long> spuIds, Integer status, LocalDateTime dateTime) {
198   - // 1. 查询出指定 spuId 的 spu 参加的活动最接近现在的一条记录。多个的话，一个 spuId 对应一个最近的活动编号
199   - List<Map<String, Object>> spuIdAndActivityIdMaps = bargainActivityMapper.selectSpuIdAndActivityIdMapsBySpuIdsAndStatus(spuIds, status);
200   - if (CollUtil.isEmpty(spuIdAndActivityIdMaps)) {
201   - return Collections.emptyList();
202   - }
203   - // 2. 查询活动详情
204   - return bargainActivityMapper.selectListByIdsAndDateTimeLt(
205   - convertSet(spuIdAndActivityIdMaps, map -> MapUtil.getLong(map, "activityId")), dateTime);
  195 + public BargainActivityDO getMatchBargainActivityBySpuId(Long spuId) {
  196 + return bargainActivityMapper.selectBySpuIdAndStatusAndNow(spuId, CommonStatusEnum.ENABLE.getStatus());
206 197 }
207 198  
208 199 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityService.java
  View file @caf49aa
... ... @@ -7,9 +7,8 @@ import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activit
7 7 import cn.iocoder.yudao.module.promotion.controller.admin.combination.vo.activity.CombinationActivityUpdateReqVO;
8 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationActivityDO;
9 9 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationProductDO;
10   -
11 10 import jakarta.validation.Valid;
12   -import java.time.LocalDateTime;
  11 +
13 12 import java.util.Collection;
14 13 import java.util.Collections;
15 14 import java.util.List;
... ... @@ -109,22 +108,20 @@ public interface CombinationActivityService {
109 108 PageResult<CombinationActivityDO> getCombinationActivityPage(PageParam pageParam);
110 109  
111 110 /**
112   - * 获取指定活动、指定 sku 编号的商品
  111 + * 获取指定活动、指定 SKU 编号的商品
113 112 *
114 113 * @param activityId 活动编号
115   - * @param skuId sku 编号
  114 + * @param skuId SKU 编号
116 115 * @return 活动商品信息
117 116 */
118 117 CombinationProductDO selectByActivityIdAndSkuId(Long activityId, Long skuId);
119 118  
120 119 /**
121   - * 获取指定 spu 编号最近参加的活动，每个 spuId 只返回一条记录
  120 + * 获得 SPU 进行中的拼团活动
122 121 *
123   - * @param spuIds spu 编号
124   - * @param status 状态
125   - * @param dateTime 日期时间
126   - * @return 拼团活动列表
  122 + * @param spuId SPU 编号数组
  123 + * @return 拼团活动
127 124 */
128   - List<CombinationActivityDO> getCombinationActivityBySpuIdsAndStatusAndDateTimeLt(Collection<Long> spuIds, Integer status, LocalDateTime dateTime);
  125 + CombinationActivityDO getMatchCombinationActivityBySpuId(Long spuId);
129 126  
130 127 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/combination/CombinationActivityServiceImpl.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.service.combination;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4   -import cn.hutool.core.map.MapUtil;
5 4 import cn.hutool.core.util.ObjectUtil;
6 5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
7 6 import cn.iocoder.yudao.framework.common.pojo.PageParam;
... ... @@ -20,19 +19,18 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationA
20 19 import cn.iocoder.yudao.module.promotion.dal.dataobject.combination.CombinationProductDO;
21 20 import cn.iocoder.yudao.module.promotion.dal.mysql.combination.CombinationActivityMapper;
22 21 import cn.iocoder.yudao.module.promotion.dal.mysql.combination.CombinationProductMapper;
  22 +import jakarta.annotation.Resource;
23 23 import org.springframework.stereotype.Service;
24 24 import org.springframework.transaction.annotation.Transactional;
25 25 import org.springframework.validation.annotation.Validated;
26 26  
27   -import jakarta.annotation.Resource;
28   -import java.time.LocalDateTime;
29 27 import java.util.Collection;
30   -import java.util.Collections;
31 28 import java.util.List;
32 29 import java.util.Map;
33 30  
34 31 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
35   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
  32 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
  33 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
36 34 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
37 35 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_EXISTS;
38 36 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
... ... @@ -178,7 +176,7 @@ public class CombinationActivityServiceImpl implements CombinationActivityServic
178 176 combinationProductMapper.updateBatch(diffList.get(1));
179 177 }
180 178 if (CollUtil.isNotEmpty(diffList.get(2))) {
181   - combinationProductMapper.deleteBatchIds(CollectionUtils.convertList(diffList.get(2), CombinationProductDO::getId));
  179 + combinationProductMapper.deleteByIds(CollectionUtils.convertList(diffList.get(2), CombinationProductDO::getId));
182 180 }
183 181 }
184 182  
... ... @@ -238,15 +236,8 @@ public class CombinationActivityServiceImpl implements CombinationActivityServic
238 236 }
239 237  
240 238 @Override
241   - public List<CombinationActivityDO> getCombinationActivityBySpuIdsAndStatusAndDateTimeLt(Collection<Long> spuIds, Integer status, LocalDateTime dateTime) {
242   - // 1.查询出指定 spuId 的 spu 参加的活动最接近现在的一条记录。多个的话，一个 spuId 对应一个最近的活动编号
243   - List<Map<String, Object>> spuIdAndActivityIdMaps = combinationActivityMapper.selectSpuIdAndActivityIdMapsBySpuIdsAndStatus(spuIds, status);
244   - if (CollUtil.isEmpty(spuIdAndActivityIdMaps)) {
245   - return Collections.emptyList();
246   - }
247   - // 2.查询活动详情
248   - return combinationActivityMapper.selectListByIdsAndDateTimeLt(
249   - convertSet(spuIdAndActivityIdMaps, map -> MapUtil.getLong(map, "activityId")), dateTime);
  239 + public CombinationActivityDO getMatchCombinationActivityBySpuId(Long spuId) {
  240 + return combinationActivityMapper.selectBySpuIdAndStatusAndNow(spuId, CommonStatusEnum.ENABLE.getStatus());
250 241 }
251 242  
252 243 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
  View file @caf49aa
... ... @@ -279,7 +279,7 @@ public class CouponServiceImpl implements CouponService {
279 279 }
280 280 }
281 281 // 校验领取方式
282   - if (ObjectUtil.notEqual(couponTemplate.getTakeType(), takeType.getValue())) {
  282 + if (ObjectUtil.notEqual(couponTemplate.getTakeType(), takeType.getType())) {
283 283 throw exception(COUPON_TEMPLATE_CANNOT_TAKE);
284 284 }
285 285 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImpl.java
  View file @caf49aa
... ... @@ -12,10 +12,10 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponTemplateDO;
12 12 import cn.iocoder.yudao.module.promotion.dal.mysql.coupon.CouponTemplateMapper;
13 13 import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
14 14 import cn.iocoder.yudao.module.promotion.enums.coupon.CouponTakeTypeEnum;
  15 +import jakarta.annotation.Resource;
15 16 import org.springframework.stereotype.Service;
16 17 import org.springframework.validation.annotation.Validated;
17 18  
18   -import jakarta.annotation.Resource;
19 19 import java.util.Collection;
20 20 import java.util.List;
21 21 import java.util.Objects;
... ... @@ -57,8 +57,10 @@ public class CouponTemplateServiceImpl implements CouponTemplateService {
57 57 public void updateCouponTemplate(CouponTemplateUpdateReqVO updateReqVO) {
58 58 // 校验存在
59 59 CouponTemplateDO couponTemplate = validateCouponTemplateExists(updateReqVO.getId());
60   - // 校验发放数量不能过小
61   - if (updateReqVO.getTotalCount() < couponTemplate.getTakeCount()) {
  60 + // 校验发放数量不能过小（仅在 CouponTakeTypeEnum.USER 用户领取时）
  61 + if (CouponTakeTypeEnum.isUser(couponTemplate.getTakeType())
  62 + && updateReqVO.getTotalCount() > 0 // 大于 0 的原因，是因为 -1 不限制
  63 + && updateReqVO.getTotalCount() < couponTemplate.getTakeCount()) {
62 64 throw exception(COUPON_TEMPLATE_TOTAL_COUNT_TOO_SMALL, couponTemplate.getTakeCount());
63 65 }
64 66 // 校验商品范围
... ... @@ -118,7 +120,7 @@ public class CouponTemplateServiceImpl implements CouponTemplateService {
118 120  
119 121 @Override
120 122 public List<CouponTemplateDO> getCouponTemplateListByTakeType(CouponTakeTypeEnum takeType) {
121   - return couponTemplateMapper.selectListByTakeType(takeType.getValue());
  123 + return couponTemplateMapper.selectListByTakeType(takeType.getType());
122 124 }
123 125  
124 126 @Override
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityService.java
  View file @caf49aa
... ... @@ -8,7 +8,6 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountActivit
8 8 import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountProductDO;
9 9 import jakarta.validation.Valid;
10 10  
11   -import java.time.LocalDateTime;
12 11 import java.util.Collection;
13 12 import java.util.List;
14 13  
... ... @@ -27,7 +26,7 @@ public interface DiscountActivityService {
27 26 * @param skuIds SKU 编号数组
28 27 * @return 匹配的限时折扣商品
29 28 */
30   - List<DiscountProductDO> getMatchDiscountProductList(Collection<Long> skuIds);
  29 + List<DiscountProductDO> getMatchDiscountProductListBySkuIds(Collection<Long> skuIds);
31 30  
32 31 /**
33 32 * 创建限时折扣活动
... ... @@ -90,15 +89,4 @@ public interface DiscountActivityService {
90 89 */
91 90 List<DiscountProductDO> getDiscountProductsByActivityId(Collection<Long> activityIds);
92 91  
93   - /**
94   - * 获取指定 spu 编号最近参加的活动，每个 spuId 只返回一条记录
95   - *
96   - * @param spuIds spu 编号
97   - * @param status 状态
98   - * @param dateTime 当前日期时间
99   - * @return 折扣活动列表
100   - */
101   - List<DiscountActivityDO> getDiscountActivityBySpuIdsAndStatusAndDateTimeLt(
102   - Collection<Long> spuIds, Integer status, LocalDateTime dateTime);
103   -
104 92 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImpl.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.service.discount;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4   -import cn.hutool.core.collection.CollectionUtil;
5   -import cn.hutool.core.map.MapUtil;
  4 +import cn.hutool.core.util.ObjectUtil;
6 5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
7 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  7 +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
8 8 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  9 +import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
  10 +import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
9 11 import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityBaseVO;
10 12 import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityCreateReqVO;
11 13 import cn.iocoder.yudao.module.promotion.controller.admin.discount.vo.DiscountActivityPageReqVO;
... ... @@ -15,23 +17,20 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountActivit
15 17 import cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountProductDO;
16 18 import cn.iocoder.yudao.module.promotion.dal.mysql.discount.DiscountActivityMapper;
17 19 import cn.iocoder.yudao.module.promotion.dal.mysql.discount.DiscountProductMapper;
18   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionActivityStatusEnum;
19   -import cn.iocoder.yudao.module.promotion.util.PromotionUtils;
20 20 import jakarta.annotation.Resource;
21 21 import org.springframework.stereotype.Service;
22 22 import org.springframework.transaction.annotation.Transactional;
23 23 import org.springframework.validation.annotation.Validated;
24 24  
25   -import java.time.LocalDateTime;
26 25 import java.util.Collection;
27   -import java.util.Collections;
28 26 import java.util.List;
29 27 import java.util.Map;
30   -import java.util.stream.Collectors;
31 28  
  29 +import static cn.hutool.core.collection.CollUtil.intersectionDistinct;
32 30 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
33   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
34   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  31 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
  32 +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
  33 +import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
35 34 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
36 35  
37 36 /**
... ... @@ -48,16 +47,16 @@ public class DiscountActivityServiceImpl implements DiscountActivityService {
48 47 @Resource
49 48 private DiscountProductMapper discountProductMapper;
50 49  
51   - @Override
52   - public List<DiscountProductDO> getMatchDiscountProductList(Collection<Long> skuIds) {
53   - return discountProductMapper.getMatchDiscountProductList(skuIds);
54   - }
  50 + @Resource
  51 + private ProductSkuApi productSkuApi;
55 52  
56 53 @Override
57 54 @Transactional(rollbackFor = Exception.class)
58 55 public Long createDiscountActivity(DiscountActivityCreateReqVO createReqVO) {
59 56 // 校验商品是否冲突
60 57 validateDiscountActivityProductConflicts(null, createReqVO.getProducts());
  58 + // 校验商品是否存在
  59 + validateProductExists(createReqVO.getProducts());
61 60  
62 61 // 插入活动
63 62 DiscountActivityDO discountActivity = DiscountActivityConvert.INSTANCE.convert(createReqVO)
... ... @@ -65,7 +64,8 @@ public class DiscountActivityServiceImpl implements DiscountActivityService {
65 64 discountActivityMapper.insert(discountActivity);
66 65 // 插入商品
67 66 List<DiscountProductDO> discountProducts = BeanUtils.toBean(createReqVO.getProducts(), DiscountProductDO.class,
68   - product -> product.setActivityId(discountActivity.getId()).setActivityStatus(discountActivity.getStatus())
  67 + product -> product.setActivityId(discountActivity.getId())
  68 + .setActivityName(discountActivity.getName()).setActivityStatus(discountActivity.getStatus())
69 69 .setActivityStartTime(createReqVO.getStartTime()).setActivityEndTime(createReqVO.getEndTime()));
70 70 discountProductMapper.insertBatch(discountProducts);
71 71 // 返回
... ... @@ -82,36 +82,40 @@ public class DiscountActivityServiceImpl implements DiscountActivityService {
82 82 }
83 83 // 校验商品是否冲突
84 84 validateDiscountActivityProductConflicts(updateReqVO.getId(), updateReqVO.getProducts());
  85 + // 校验商品是否存在
  86 + validateProductExists(updateReqVO.getProducts());
85 87  
86 88 // 更新活动
87   - DiscountActivityDO updateObj = DiscountActivityConvert.INSTANCE.convert(updateReqVO)
88   - .setStatus(PromotionUtils.calculateActivityStatus(updateReqVO.getEndTime()));
  89 + DiscountActivityDO updateObj = DiscountActivityConvert.INSTANCE.convert(updateReqVO);
89 90 discountActivityMapper.updateById(updateObj);
90 91 // 更新商品
91   - updateDiscountProduct(updateReqVO);
  92 + updateDiscountProduct(updateObj, updateReqVO.getProducts());
92 93 }
93 94  
94   - private void updateDiscountProduct(DiscountActivityUpdateReqVO updateReqVO) {
95   - // TODO @zhangshuai：这里的逻辑，可以优化下哈；参考 CombinationActivityServiceImpl 的 updateCombinationProduct，主要是 CollectionUtils.diffList 的使用哈；
96   - // 然后原先是使用 DiscountActivityConvert.INSTANCE.isEquals 对比，现在看看是不是简化就基于 skuId 对比就完事了；之前写的太精细，意义不大；
97   - List<DiscountProductDO> dbDiscountProducts = discountProductMapper.selectListByActivityId(updateReqVO.getId());
98   - // 计算要删除的记录
99   - List<Long> deleteIds = convertList(dbDiscountProducts, DiscountProductDO::getId,
100   - discountProductDO -> updateReqVO.getProducts().stream()
101   - .noneMatch(product -> DiscountActivityConvert.INSTANCE.isEquals(discountProductDO, product)));
102   - if (CollUtil.isNotEmpty(deleteIds)) {
103   - discountProductMapper.deleteBatchIds(deleteIds);
  95 + private void updateDiscountProduct(DiscountActivityDO activity, List<DiscountActivityCreateReqVO.Product> products) {
  96 + // 第一步，对比新老数据，获得添加、修改、删除的列表
  97 + List<DiscountProductDO> newList = BeanUtils.toBean(products, DiscountProductDO.class,
  98 + product -> product.setActivityId(activity.getId())
  99 + .setActivityName(activity.getName()).setActivityStatus(activity.getStatus())
  100 + .setActivityStartTime(activity.getStartTime()).setActivityEndTime(activity.getEndTime()));
  101 + List<DiscountProductDO> oldList = discountProductMapper.selectListByActivityId(activity.getId());
  102 + List<List<DiscountProductDO>> diffList = CollectionUtils.diffList(oldList, newList, (oldVal, newVal) -> {
  103 + boolean same = ObjectUtil.equal(oldVal.getSkuId(), newVal.getSkuId());
  104 + if (same) {
  105 + newVal.setId(oldVal.getId());
  106 + }
  107 + return same;
  108 + });
  109 +
  110 + // 第二步，批量添加、修改、删除
  111 + if (CollUtil.isNotEmpty(diffList.get(0))) {
  112 + discountProductMapper.insertBatch(diffList.get(0));
  113 + }
  114 + if (CollUtil.isNotEmpty(diffList.get(1))) {
  115 + discountProductMapper.updateBatch(diffList.get(1));
104 116 }
105   - // 计算新增的记录
106   - List<DiscountProductDO> newDiscountProducts = convertList(updateReqVO.getProducts(),
107   - product -> DiscountActivityConvert.INSTANCE.convert(product)
108   - .setActivityId(updateReqVO.getId())
109   - .setActivityStartTime(updateReqVO.getStartTime())
110   - .setActivityEndTime(updateReqVO.getEndTime()));
111   - newDiscountProducts.removeIf(product -> dbDiscountProducts.stream().anyMatch(
112   - dbProduct -> DiscountActivityConvert.INSTANCE.isEquals(dbProduct, product))); // 如果匹配到，说明是更新的
113   - if (CollectionUtil.isNotEmpty(newDiscountProducts)) {
114   - discountProductMapper.insertBatch(newDiscountProducts);
  117 + if (CollUtil.isNotEmpty(diffList.get(2))) {
  118 + discountProductMapper.deleteByIds(convertList(diffList.get(2), DiscountProductDO::getId));
115 119 }
116 120 }
117 121  
... ... @@ -122,22 +126,44 @@ public class DiscountActivityServiceImpl implements DiscountActivityService {
122 126 * @param products 商品列表
123 127 */
124 128 private void validateDiscountActivityProductConflicts(Long id, List<DiscountActivityBaseVO.Product> products) {
125   - if (CollUtil.isEmpty(products)) {
126   - return;
127   - }
128   - // 查询商品参加的活动
129   - // TODO @zhangshuai：下面 121 这个查询，是不是不用做呀；直接 convert 出 skuId 集合就 ok 啦；
130   - List<DiscountProductDO> list = discountProductMapper.selectListByActivityId(id);
131   - // TODO @zhangshuai：一般简单的 stream 方法，建议是使用 CollectionUtils，例如说这里是 convertList 对把。
132   - List<Long> skuIds = list.stream().map(item -> item.getSkuId()).collect(Collectors.toList());
133   - List<DiscountProductDO> matchDiscountProductList = getMatchDiscountProductList(skuIds);
134   - if (id != null) { // 排除自己这个活动
135   - matchDiscountProductList.removeIf(product -> id.equals(product.getActivityId()));
136   - }
137   - // 如果非空，则说明冲突
138   - if (CollUtil.isNotEmpty(matchDiscountProductList)) {
139   - throw exception(DISCOUNT_ACTIVITY_SPU_CONFLICTS);
  129 + // 1.1 查询所有开启的折扣活动
  130 + List<DiscountActivityDO> activityList = discountActivityMapper.selectList(DiscountActivityDO::getStatus,
  131 + CommonStatusEnum.ENABLE.getStatus());
  132 + if (id != null) { // 时排除自己
  133 + activityList.removeIf(item -> ObjectUtil.equal(item.getId(), id));
140 134 }
  135 + // 1.2 查询活动下的所有商品
  136 + List<DiscountProductDO> productList = discountProductMapper.selectListByActivityId(
  137 + convertList(activityList, DiscountActivityDO::getId));
  138 + Map<Long, List<DiscountProductDO>> productListMap = convertMultiMap(productList, DiscountProductDO::getActivityId);
  139 +
  140 + // 2. 校验商品是否冲突
  141 + activityList.forEach(item -> {
  142 + findAndThen(productListMap, item.getId(), discountProducts -> {
  143 + if (!intersectionDistinct(convertList(discountProducts, DiscountProductDO::getSpuId),
  144 + convertList(products, DiscountActivityBaseVO.Product::getSpuId)).isEmpty()) {
  145 + throw exception(DISCOUNT_ACTIVITY_SPU_CONFLICTS, item.getName());
  146 + }
  147 + });
  148 + });
  149 + }
  150 +
  151 + /**
  152 + * 校验活动商品是否都存在
  153 + *
  154 + * @param products 活动商品
  155 + */
  156 + private void validateProductExists(List<DiscountActivityBaseVO.Product> products) {
  157 + // 1.获得商品所有的 sku
  158 + List<ProductSkuRespDTO> skus = productSkuApi.getSkuListBySpuId(
  159 + convertList(products, DiscountActivityBaseVO.Product::getSpuId));
  160 + Map<Long, ProductSkuRespDTO> skuMap = convertMap(skus, ProductSkuRespDTO::getId);
  161 + // 2. 校验商品 sku 都存在
  162 + products.forEach(product -> {
  163 + if (!skuMap.containsKey(product.getSkuId())) {
  164 + throw exception(SKU_NOT_EXISTS);
  165 + }
  166 + });
141 167 }
142 168  
143 169 @Override
... ... @@ -148,9 +174,11 @@ public class DiscountActivityServiceImpl implements DiscountActivityService {
148 174 throw exception(DISCOUNT_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED);
149 175 }
150 176  
151   - // 更新
152   - DiscountActivityDO updateObj = new DiscountActivityDO().setId(id).setStatus(PromotionActivityStatusEnum.CLOSE.getStatus());
153   - discountActivityMapper.updateById(updateObj);
  177 + // 更新活动状态
  178 + discountActivityMapper.updateById(new DiscountActivityDO().setId(id).setStatus(CommonStatusEnum.DISABLE.getStatus()));
  179 + // 更新活动商品状态
  180 + discountProductMapper.updateByActivityId(new DiscountProductDO().setActivityId(id).setActivityStatus(
  181 + CommonStatusEnum.DISABLE.getStatus()));
154 182 }
155 183  
156 184 @Override
... ... @@ -161,8 +189,10 @@ public class DiscountActivityServiceImpl implements DiscountActivityService {
161 189 throw exception(DISCOUNT_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED);
162 190 }
163 191  
164   - // 删除
  192 + // 删除活动
165 193 discountActivityMapper.deleteById(id);
  194 + // 删除活动商品
  195 + discountProductMapper.deleteByActivityId(id);
166 196 }
167 197  
168 198 private DiscountActivityDO validateDiscountActivityExists(Long id) {
... ... @@ -190,20 +220,12 @@ public class DiscountActivityServiceImpl implements DiscountActivityService {
190 220  
191 221 @Override
192 222 public List<DiscountProductDO> getDiscountProductsByActivityId(Collection<Long> activityIds) {
193   - return discountProductMapper.selectList("activity_id", activityIds);
  223 + return discountProductMapper.selectList(DiscountProductDO::getActivityId, activityIds);
194 224 }
195 225  
196 226 @Override
197   - public List<DiscountActivityDO> getDiscountActivityBySpuIdsAndStatusAndDateTimeLt(Collection<Long> spuIds, Integer status, LocalDateTime dateTime) {
198   - // 1. 查询出指定 spuId 的 spu 参加的活动最接近现在的一条记录。多个的话，一个 spuId 对应一个最近的活动编号
199   - List<Map<String, Object>> spuIdAndActivityIdMaps = discountProductMapper.selectSpuIdAndActivityIdMapsBySpuIdsAndStatus(spuIds, status);
200   - if (CollUtil.isEmpty(spuIdAndActivityIdMaps)) {
201   - return Collections.emptyList();
202   - }
203   -
204   - // 2. 查询活动详情
205   - return discountActivityMapper.selectListByIdsAndDateTimeLt(
206   - convertSet(spuIdAndActivityIdMaps, map -> MapUtil.getLong(map, "activityId")), dateTime);
  227 + public List<DiscountProductDO> getMatchDiscountProductListBySkuIds(Collection<Long> skuIds) {
  228 + return discountProductMapper.selectListBySkuIdsAndStatusAndNow(skuIds, CommonStatusEnum.ENABLE.getStatus());
207 229 }
208 230  
209 231 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/point/PointActivityService.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.service.point;
  2 +
  3 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  4 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity.PointActivityPageReqVO;
  5 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity.PointActivitySaveReqVO;
  6 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointActivityDO;
  7 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointProductDO;
  8 +import jakarta.validation.Valid;
  9 +
  10 +import java.util.Collection;
  11 +import java.util.List;
  12 +
  13 +/**
  14 + * 积分商城活动 Service 接口
  15 + *
  16 + * @author HUIHUI
  17 + */
  18 +public interface PointActivityService {
  19 +
  20 + /**
  21 + * 创建积分商城活动
  22 + *
  23 + * @param createReqVO 创建信息
  24 + * @return 编号
  25 + */
  26 + Long createPointActivity(@Valid PointActivitySaveReqVO createReqVO);
  27 +
  28 + /**
  29 + * 更新积分商城活动
  30 + *
  31 + * @param updateReqVO 更新信息
  32 + */
  33 + void updatePointActivity(@Valid PointActivitySaveReqVO updateReqVO);
  34 +
  35 + /**
  36 + * 关闭积分商城活动
  37 + *
  38 + * @param id 编号
  39 + */
  40 + void closePointActivity(Long id);
  41 +
  42 + /**
  43 + * 删除积分商城活动
  44 + *
  45 + * @param id 编号
  46 + */
  47 + void deletePointActivity(Long id);
  48 +
  49 + /**
  50 + * 获得积分商城活动
  51 + *
  52 + * @param id 编号
  53 + * @return 积分商城活动
  54 + */
  55 + PointActivityDO getPointActivity(Long id);
  56 +
  57 + /**
  58 + * 获得积分商城活动分页
  59 + *
  60 + * @param pageReqVO 分页查询
  61 + * @return 积分商城活动分页
  62 + */
  63 + PageResult<PointActivityDO> getPointActivityPage(PointActivityPageReqVO pageReqVO);
  64 +
  65 + /**
  66 + * 获得积分商城活动列表
  67 + *
  68 + * @param ids 活动编号
  69 + * @return 积分商城活动列表
  70 + */
  71 + List<PointActivityDO> getPointActivityListByIds(Collection<Long> ids);
  72 +
  73 + /**
  74 + * 获得活动商品
  75 + *
  76 + * @param activityIds 活动编号
  77 + * @return 获得活动商品
  78 + */
  79 + List<PointProductDO> getPointProductListByActivityIds(Collection<Long> activityIds);
  80 +
  81 +}
0 82 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/point/PointActivityServiceImpl.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.promotion.service.point;
  2 +
  3 +import cn.hutool.core.util.ObjectUtil;
  4 +import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
  5 +import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  7 +import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
  8 +import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
  9 +import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
  10 +import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
  11 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity.PointActivityPageReqVO;
  12 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.activity.PointActivitySaveReqVO;
  13 +import cn.iocoder.yudao.module.promotion.controller.admin.point.vo.product.PointProductSaveReqVO;
  14 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointActivityDO;
  15 +import cn.iocoder.yudao.module.promotion.dal.dataobject.point.PointProductDO;
  16 +import cn.iocoder.yudao.module.promotion.dal.mysql.point.PointActivityMapper;
  17 +import cn.iocoder.yudao.module.promotion.dal.mysql.point.PointProductMapper;
  18 +import jakarta.annotation.Resource;
  19 +import org.springframework.stereotype.Service;
  20 +import org.springframework.transaction.annotation.Transactional;
  21 +import org.springframework.validation.annotation.Validated;
  22 +
  23 +import java.util.Collection;
  24 +import java.util.List;
  25 +import java.util.Map;
  26 +
  27 +import static cn.hutool.core.collection.CollUtil.intersectionDistinct;
  28 +import static cn.hutool.core.collection.CollUtil.isNotEmpty;
  29 +import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
  30 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
  31 +import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
  32 +import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
  33 +import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SPU_NOT_EXISTS;
  34 +import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
  35 +import static java.util.Collections.singletonList;
  36 +
  37 +/**
  38 + * 积分商城活动 Service 实现类
  39 + *
  40 + * @author HUIHUI
  41 + */
  42 +@Service
  43 +@Validated
  44 +public class PointActivityServiceImpl implements PointActivityService {
  45 +
  46 + @Resource
  47 + private PointActivityMapper pointActivityMapper;
  48 + @Resource
  49 + private PointProductMapper pointProductMapper;
  50 +
  51 + @Resource
  52 + private ProductSpuApi productSpuApi;
  53 + @Resource
  54 + private ProductSkuApi productSkuApi;
  55 +
  56 + private static List<PointProductDO> buildPointProductDO(PointActivityDO pointActivity, List<PointProductSaveReqVO> products) {
  57 + return BeanUtils.toBean(products, PointProductDO.class, product ->
  58 + product.setSpuId(pointActivity.getSpuId()).setActivityId(pointActivity.getId())
  59 + .setActivityStatus(pointActivity.getStatus()));
  60 + }
  61 +
  62 + @Override
  63 + @Transactional(rollbackFor = Exception.class)
  64 + public Long createPointActivity(PointActivitySaveReqVO createReqVO) {
  65 + // 1.1 校验商品是否存在
  66 + validateProductExists(createReqVO.getSpuId(), createReqVO.getProducts());
  67 + // 1.2 校验商品是否已经参加别的活动
  68 + validatePointActivityProductConflicts(null, createReqVO.getProducts());
  69 +
  70 + // 2.1 插入积分商城活动
  71 + PointActivityDO pointActivity = BeanUtils.toBean(createReqVO, PointActivityDO.class)
  72 + .setStatus(CommonStatusEnum.ENABLE.getStatus())
  73 + .setStock(getSumValue(createReqVO.getProducts(), PointProductSaveReqVO::getStock, Integer::sum));
  74 + pointActivity.setTotalStock(pointActivity.getStock());
  75 + pointActivityMapper.insert(pointActivity);
  76 + // 2.2 插入积分商城活动商品
  77 + pointProductMapper.insertBatch(buildPointProductDO(pointActivity, createReqVO.getProducts()));
  78 + return pointActivity.getId();
  79 + }
  80 +
  81 + @Override
  82 + @Transactional(rollbackFor = Exception.class)
  83 + public void updatePointActivity(PointActivitySaveReqVO updateReqVO) {
  84 + // 1.1 校验存在
  85 + PointActivityDO activity = validatePointActivityExists(updateReqVO.getId());
  86 + if (CommonStatusEnum.DISABLE.getStatus().equals(activity.getStatus())) {
  87 + throw exception(POINT_ACTIVITY_UPDATE_FAIL_STATUS_CLOSED);
  88 + }
  89 + // 1.2 校验商品是否存在
  90 + validateProductExists(updateReqVO.getSpuId(), updateReqVO.getProducts());
  91 + // 1.3 校验商品是否已经参加别的活动
  92 + validatePointActivityProductConflicts(updateReqVO.getId(), updateReqVO.getProducts());
  93 +
  94 + // 2.1 更新积分商城活动
  95 + PointActivityDO updateObj = BeanUtils.toBean(updateReqVO, PointActivityDO.class)
  96 + .setStock(getSumValue(updateReqVO.getProducts(), PointProductSaveReqVO::getStock, Integer::sum));
  97 + if (updateObj.getStock() > activity.getTotalStock()) { // 如果更新的库存大于原来的库存，则更新总库存
  98 + updateObj.setTotalStock(updateObj.getStock());
  99 + }
  100 + pointActivityMapper.updateById(updateObj);
  101 + // 2.2 更新商品
  102 + updateSeckillProduct(updateObj, updateReqVO.getProducts());
  103 + }
  104 +
  105 + @Override
  106 + @Transactional(rollbackFor = Exception.class)
  107 + public void closePointActivity(Long id) {
  108 + // 校验存在
  109 + PointActivityDO pointActivity = validatePointActivityExists(id);
  110 + if (CommonStatusEnum.DISABLE.getStatus().equals(pointActivity.getStatus())) {
  111 + throw exception(POINT_ACTIVITY_CLOSE_FAIL_STATUS_CLOSED);
  112 + }
  113 +
  114 + // 更新
  115 + pointActivityMapper.updateById(new PointActivityDO().setId(id).setStatus(CommonStatusEnum.DISABLE.getStatus()));
  116 + // 更新活动商品状态
  117 + pointProductMapper.updateByActivityId(new PointProductDO().setActivityId(id).setActivityStatus(
  118 + CommonStatusEnum.DISABLE.getStatus()));
  119 + }
  120 +
  121 + /**
  122 + * 更新秒杀商品
  123 + *
  124 + * @param activity 秒杀活动
  125 + * @param products 该活动的最新商品配置
  126 + */
  127 + private void updateSeckillProduct(PointActivityDO activity, List<PointProductSaveReqVO> products) {
  128 + // 第一步，对比新老数据，获得添加、修改、删除的列表
  129 + List<PointProductDO> newList = buildPointProductDO(activity, products);
  130 + List<PointProductDO> oldList = pointProductMapper.selectListByActivityId(activity.getId());
  131 + List<List<PointProductDO>> diffList = diffList(oldList, newList, (oldVal, newVal) -> {
  132 + boolean same = ObjectUtil.equal(oldVal.getSkuId(), newVal.getSkuId());
  133 + if (same) {
  134 + newVal.setId(oldVal.getId());
  135 + }
  136 + return same;
  137 + });
  138 +
  139 + // 第二步，批量添加、修改、删除
  140 + if (isNotEmpty(diffList.get(0))) {
  141 + pointProductMapper.insertBatch(diffList.get(0));
  142 + }
  143 + if (isNotEmpty(diffList.get(1))) {
  144 + pointProductMapper.updateBatch(diffList.get(1));
  145 + }
  146 + if (isNotEmpty(diffList.get(2))) {
  147 + pointProductMapper.deleteByIds(convertList(diffList.get(2), PointProductDO::getId));
  148 + }
  149 + }
  150 +
  151 + @Override
  152 + @Transactional(rollbackFor = Exception.class)
  153 + public void deletePointActivity(Long id) {
  154 + // 校验存在
  155 + PointActivityDO pointActivity = validatePointActivityExists(id);
  156 + if (CommonStatusEnum.ENABLE.getStatus().equals(pointActivity.getStatus())) {
  157 + throw exception(POINT_ACTIVITY_DELETE_FAIL_STATUS_NOT_CLOSED_OR_END);
  158 + }
  159 +
  160 + // 删除商城活动
  161 + pointActivityMapper.deleteById(id);
  162 + // 删除活动商品
  163 + List<PointProductDO> products = pointProductMapper.selectListByActivityId(id);
  164 + pointProductMapper.deleteByIds(convertSet(products, PointProductDO::getId));
  165 + }
  166 +
  167 + private PointActivityDO validatePointActivityExists(Long id) {
  168 + PointActivityDO pointActivityDO = pointActivityMapper.selectById(id);
  169 + if (pointActivityDO == null) {
  170 + throw exception(POINT_ACTIVITY_NOT_EXISTS);
  171 + }
  172 + return pointActivityDO;
  173 + }
  174 +
  175 + /**
  176 + * 校验秒杀商品是否都存在
  177 + *
  178 + * @param spuId 商品 SPU 编号
  179 + * @param products 秒杀商品
  180 + */
  181 + private void validateProductExists(Long spuId, List<PointProductSaveReqVO> products) {
  182 + // 1. 校验商品 spu 是否存在
  183 + ProductSpuRespDTO spu = productSpuApi.getSpu(spuId);
  184 + if (spu == null) {
  185 + throw exception(SPU_NOT_EXISTS);
  186 + }
  187 +
  188 + // 2. 校验商品 sku 都存在
  189 + List<ProductSkuRespDTO> skus = productSkuApi.getSkuListBySpuId(singletonList(spuId));
  190 + Map<Long, ProductSkuRespDTO> skuMap = convertMap(skus, ProductSkuRespDTO::getId);
  191 + products.forEach(product -> {
  192 + if (!skuMap.containsKey(product.getSkuId())) {
  193 + throw exception(SKU_NOT_EXISTS);
  194 + }
  195 + });
  196 + }
  197 +
  198 + /**
  199 + * 校验商品是否冲突
  200 + *
  201 + * @param id 编号
  202 + * @param products 商品列表
  203 + */
  204 + private void validatePointActivityProductConflicts(Long id, List<PointProductSaveReqVO> products) {
  205 + // 1.1 查询所有开启的积分商城活动
  206 + List<PointActivityDO> activityList = pointActivityMapper.selectList(PointActivityDO::getStatus,
  207 + CommonStatusEnum.ENABLE.getStatus());
  208 + if (id != null) { // 更新时排除自己
  209 + activityList.removeIf(item -> ObjectUtil.equal(item.getId(), id));
  210 + }
  211 + // 1.2 查询活动下的所有商品
  212 + List<PointProductDO> productList = pointProductMapper.selectListByActivityId(
  213 + convertList(activityList, PointActivityDO::getId));
  214 + Map<Long, List<PointProductDO>> productListMap = convertMultiMap(productList, PointProductDO::getActivityId);
  215 +
  216 + // 2. 校验商品是否冲突
  217 + activityList.forEach(item -> {
  218 + findAndThen(productListMap, item.getId(), discountProducts -> {
  219 + if (!intersectionDistinct(convertList(discountProducts, PointProductDO::getSpuId),
  220 + convertList(products, PointProductSaveReqVO::getSpuId)).isEmpty()) {
  221 + throw exception(POINT_ACTIVITY_SPU_CONFLICTS);
  222 + }
  223 + });
  224 + });
  225 + }
  226 +
  227 + @Override
  228 + public PointActivityDO getPointActivity(Long id) {
  229 + return pointActivityMapper.selectById(id);
  230 + }
  231 +
  232 + @Override
  233 + public PageResult<PointActivityDO> getPointActivityPage(PointActivityPageReqVO pageReqVO) {
  234 + return pointActivityMapper.selectPage(pageReqVO);
  235 + }
  236 +
  237 + @Override
  238 + public List<PointActivityDO> getPointActivityListByIds(Collection<Long> ids) {
  239 + return pointActivityMapper.selectList(PointActivityDO::getId, ids);
  240 + }
  241 +
  242 + @Override
  243 + public List<PointProductDO> getPointProductListByActivityIds(Collection<Long> activityIds) {
  244 + return pointProductMapper.selectListByActivityId(activityIds);
  245 + }
  246 +
  247 +}
0 248 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityService.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.service.reward;
2 2  
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.util.StrUtil;
3 5 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  6 +import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
4 7 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
5 8 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
6 9 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
7 10 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
8 11 import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
  12 +import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
9 13 import jakarta.validation.Valid;
10 14  
11   -import java.time.LocalDateTime;
  15 +import java.util.ArrayList;
12 16 import java.util.Collection;
13 17 import java.util.List;
14 18  
  19 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue;
  20 +
15 21 /**
16 22 * 满减送活动 Service 接口
17 23 *
... ... @@ -65,20 +71,35 @@ public interface RewardActivityService {
65 71 PageResult<RewardActivityDO> getRewardActivityPage(RewardActivityPageReqVO pageReqVO);
66 72  
67 73 /**
68   - * 基于指定的 SPU 编号数组，获得它们匹配的满减送活动
  74 + * 获得 spuId 商品匹配的的满减送活动列表
69 75 *
70   - * @param spuIds SPU 编号数组
  76 + * @param spuIds SPU 编号数组
71 77 * @return 满减送活动列表
72 78 */
73   - List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds);
  79 + List<RewardActivityMatchRespDTO> getMatchRewardActivityListBySpuIds(Collection<Long> spuIds);
74 80  
75   - /**
76   - * 获取指定 spu 编号最近参加的活动，每个 spuId 只返回一条记录
77   - *
78   - * @param status 状态
79   - * @param dateTime 当前日期时间
80   - * @return 满减送活动列表
81   - */
82   - List<RewardActivityDO> getRewardActivityListByStatusAndDateTimeLt(Integer status, LocalDateTime dateTime);
  81 + default String getRewardActivityRuleDescription(Integer conditionType, RewardActivityDO.Rule rule) {
  82 + String description = "";
  83 + if (PromotionConditionTypeEnum.PRICE.getType().equals(conditionType)) {
  84 + description += StrUtil.format("满 {} 元", MoneyUtils.fenToYuanStr(rule.getLimit()));
  85 + } else {
  86 + description += StrUtil.format("满 {} 件", rule.getLimit());
  87 + }
  88 + List<String> tips = new ArrayList<>(10);
  89 + if (rule.getDiscountPrice() != null) {
  90 + tips.add(StrUtil.format("减 {}", MoneyUtils.fenToYuanStr(rule.getDiscountPrice())));
  91 + }
  92 + if (Boolean.TRUE.equals(rule.getFreeDelivery())) {
  93 + tips.add("包邮");
  94 + }
  95 + if (rule.getPoint() != null && rule.getPoint() > 0) {
  96 + tips.add(StrUtil.format("送 {} 积分", rule.getPoint()));
  97 + }
  98 + if (CollUtil.isNotEmpty(rule.getGiveCouponTemplateCounts())) {
  99 + tips.add(StrUtil.format("送 {} 张优惠券",
  100 + getSumValue(rule.getGiveCouponTemplateCounts().values(), count -> count, Integer::sum)));
  101 + }
  102 + return description + StrUtil.join("、", tips);
  103 + }
83 104  
84 105 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.service.reward;
2 2  
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.hutool.core.date.LocalDateTimeUtil;
3 5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5 7 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
6 8 import cn.iocoder.yudao.module.product.api.category.ProductCategoryApi;
7 9 import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
  10 +import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
8 11 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
9 12 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityBaseVO;
10 13 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
... ... @@ -13,19 +16,15 @@ import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivi
13 16 import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
14 17 import cn.iocoder.yudao.module.promotion.dal.mysql.reward.RewardActivityMapper;
15 18 import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
16   -import cn.iocoder.yudao.module.promotion.util.PromotionUtils;
17 19 import jakarta.annotation.Resource;
18 20 import org.springframework.stereotype.Service;
19 21 import org.springframework.validation.annotation.Validated;
20 22  
21   -import java.time.LocalDateTime;
22   -import java.util.Collection;
23   -import java.util.List;
24   -import java.util.Objects;
  23 +import java.util.*;
25 24  
26 25 import static cn.hutool.core.collection.CollUtil.intersectionDistinct;
27 26 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
28   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.anyMatch;
  27 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
29 28 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
30 29  
31 30 /**
... ... @@ -52,9 +51,9 @@ public class RewardActivityServiceImpl implements RewardActivityService {
52 51 // 1.2 校验商品是否冲突
53 52 validateRewardActivitySpuConflicts(null, createReqVO);
54 53  
55   - // 2. 插入
  54 + // 插入
56 55 RewardActivityDO rewardActivity = BeanUtils.toBean(createReqVO, RewardActivityDO.class)
57   - .setStatus(PromotionUtils.calculateActivityStatus(createReqVO.getEndTime()));
  56 + .setStatus(CommonStatusEnum.ENABLE.getStatus());
58 57 rewardActivityMapper.insert(rewardActivity);
59 58 // 返回
60 59 return rewardActivity.getId();
... ... @@ -73,8 +72,7 @@ public class RewardActivityServiceImpl implements RewardActivityService {
73 72 validateRewardActivitySpuConflicts(updateReqVO.getId(), updateReqVO);
74 73  
75 74 // 2. 更新
76   - RewardActivityDO updateObj = BeanUtils.toBean(updateReqVO, RewardActivityDO.class)
77   - .setStatus(PromotionUtils.calculateActivityStatus(updateReqVO.getEndTime()));
  75 + RewardActivityDO updateObj = BeanUtils.toBean(updateReqVO, RewardActivityDO.class);
78 76 rewardActivityMapper.updateById(updateObj);
79 77 }
80 78  
... ... @@ -87,8 +85,7 @@ public class RewardActivityServiceImpl implements RewardActivityService {
87 85 }
88 86  
89 87 // 更新
90   - RewardActivityDO updateObj = new RewardActivityDO().setId(id).setStatus(CommonStatusEnum.DISABLE.getStatus());
91   - rewardActivityMapper.updateById(updateObj);
  88 + rewardActivityMapper.updateById(new RewardActivityDO().setId(id).setStatus(CommonStatusEnum.DISABLE.getStatus()));
92 89 }
93 90  
94 91 @Override
... ... @@ -118,22 +115,61 @@ public class RewardActivityServiceImpl implements RewardActivityService {
118 115 * @param rewardActivity 请求
119 116 */
120 117 private void validateRewardActivitySpuConflicts(Long id, RewardActivityBaseVO rewardActivity) {
121   - List<RewardActivityDO> list = rewardActivityMapper.selectList(RewardActivityDO::getProductScope,
122   - rewardActivity.getProductScope(), RewardActivityDO::getStatus, CommonStatusEnum.ENABLE.getStatus());
  118 + // 1. 获得开启的所有的活动
  119 + List<RewardActivityDO> list = rewardActivityMapper.selectList(RewardActivityDO::getStatus, CommonStatusEnum.ENABLE.getStatus());
123 120 if (id != null) { // 排除自己这个活动
124 121 list.removeIf(activity -> id.equals(activity.getId()));
125 122 }
126 123  
127   - // 情况一：全部商品参加
128   - if (PromotionProductScopeEnum.isAll(rewardActivity.getProductScope()) && !list.isEmpty()) {
129   - throw exception(REWARD_ACTIVITY_SCOPE_ALL_EXISTS);
130   - }
131   - if (PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope()) || // 情况二：指定商品参加
132   - PromotionProductScopeEnum.isCategory(rewardActivity.getProductScope())) { // 情况三：指定商品类型参加
133   - if (anyMatch(list, item -> !intersectionDistinct(item.getProductScopeValues(),
134   - rewardActivity.getProductScopeValues()).isEmpty())) {
135   - throw exception(PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope()) ?
136   - REWARD_ACTIVITY_SPU_CONFLICTS : REWARD_ACTIVITY_SCOPE_CATEGORY_EXISTS);
  124 + // 2. 完全不允许重叠
  125 + for (RewardActivityDO item : list) {
  126 + // 2.1 校验满减送活动时间是否冲突，如果时段不冲突那么不同的时间段内则可以存在相同的商品范围
  127 + if (!LocalDateTimeUtil.isOverlap(item.getStartTime(), item.getEndTime(),
  128 + rewardActivity.getStartTime(), rewardActivity.getEndTime())) {
  129 + continue;
  130 + }
  131 + // 2.2 校验商品范围是否重叠
  132 + // 情况一：如果与该时间段内商品范围为全部的活动冲突，或 rewardActivity 商品范围为全部，那么则直接校验不通过
  133 + // 例如说，rewardActivity 是全部活动，结果有个 db 里的 activity 是某个分类，它也是冲突的。也就是说，当前时间段内，有且仅有只能有一个活动！
  134 + if (PromotionProductScopeEnum.isAll(item.getProductScope()) ||
  135 + PromotionProductScopeEnum.isAll(rewardActivity.getProductScope())) {
  136 + throw exception(REWARD_ACTIVITY_SCOPE_EXISTS, item.getName(),
  137 + PromotionProductScopeEnum.isAll(item.getProductScope()) ?
  138 + "该活动商品范围为全部已覆盖包含本活动范围" : "本活动商品范围为全部已覆盖包含了该活动商品范围");
  139 + }
  140 + // 情况二：如果与该时间段内商品范围为类别的活动冲突
  141 + if (PromotionProductScopeEnum.isCategory(item.getProductScope())) {
  142 + // 校验分类是否冲突
  143 + if (PromotionProductScopeEnum.isCategory(rewardActivity.getProductScope())) {
  144 + if (!intersectionDistinct(item.getProductScopeValues(), rewardActivity.getProductScopeValues()).isEmpty()) {
  145 + throw exception(REWARD_ACTIVITY_SCOPE_EXISTS, item.getName(), "商品分类范围重叠");
  146 + }
  147 + }
  148 + // 校验商品分类是否冲突
  149 + if (PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope())) {
  150 + List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(rewardActivity.getProductScopeValues());
  151 + if (!intersectionDistinct(item.getProductScopeValues(),
  152 + convertSet(spuList, ProductSpuRespDTO::getCategoryId)).isEmpty()) {
  153 + throw exception(REWARD_ACTIVITY_SCOPE_EXISTS, item.getName(), "该活动商品分类范围已包含本活动所选商品");
  154 + }
  155 + }
  156 + }
  157 + // 情况三：如果与该时间段内商品范围为商品的活动冲突
  158 + if (PromotionProductScopeEnum.isSpu(item.getProductScope())) {
  159 + // 校验商品是否冲突
  160 + if (PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope())) {
  161 + if (!intersectionDistinct(item.getProductScopeValues(), rewardActivity.getProductScopeValues()).isEmpty()) {
  162 + throw exception(REWARD_ACTIVITY_SCOPE_EXISTS, item.getName(), "活动商品范围所选商品重叠");
  163 + }
  164 + }
  165 + // 校验商品分类是否冲突
  166 + if (PromotionProductScopeEnum.isCategory(rewardActivity.getProductScope())) {
  167 + List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(item.getProductScopeValues());
  168 + if (!intersectionDistinct(rewardActivity.getProductScopeValues(),
  169 + convertSet(spuList, ProductSpuRespDTO::getCategoryId)).isEmpty()) {
  170 + throw exception(REWARD_ACTIVITY_SCOPE_EXISTS, item.getName(), "本活动商品分类范围包含了该活动所选商品");
  171 + }
  172 + }
137 173 }
138 174 }
139 175 }
... ... @@ -157,14 +193,47 @@ public class RewardActivityServiceImpl implements RewardActivityService {
157 193 }
158 194  
159 195 @Override
160   - public List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds) {
161   - List<RewardActivityDO> list = rewardActivityMapper.selectListBySpuIdsAndStatus(spuIds, CommonStatusEnum.ENABLE.getStatus());
162   - return BeanUtils.toBean(list, RewardActivityMatchRespDTO.class);
163   - }
  196 + public List<RewardActivityMatchRespDTO> getMatchRewardActivityListBySpuIds(Collection<Long> spuIds) {
  197 + // 1. 查询商品分类
  198 + List<ProductSpuRespDTO> spuList = productSpuApi.getSpuList(spuIds);
  199 + if (CollUtil.isEmpty(spuList)) {
  200 + return Collections.emptyList();
  201 + }
  202 + Map<Long, ProductSpuRespDTO> spuMap = convertMap(spuList, ProductSpuRespDTO::getId);
164 203  
165   - @Override
166   - public List<RewardActivityDO> getRewardActivityListByStatusAndDateTimeLt(Integer status, LocalDateTime dateTime) {
167   - return rewardActivityMapper.selectListByStatusAndDateTimeLt(status, dateTime);
  204 + // 2. 查询出指定 spuId 的 spu 参加的活动
  205 + List<RewardActivityDO> activityList = rewardActivityMapper.selectListBySpuIdAndStatusAndNow(
  206 + spuIds, convertSet(spuList, ProductSpuRespDTO::getCategoryId), CommonStatusEnum.ENABLE.getStatus());
  207 + if (CollUtil.isEmpty(activityList)) {
  208 + return Collections.emptyList();
  209 + }
  210 +
  211 + // 3. 转换成 Response DTO
  212 + return convertList(activityList, activity -> {
  213 + RewardActivityMatchRespDTO activityDTO = BeanUtils.toBean(activity, RewardActivityMatchRespDTO.class);
  214 + // 3.1 设置对应匹配的 spuIds
  215 + activityDTO.setSpuIds(new ArrayList<>());
  216 + for (Long spuId : spuIds) {
  217 + if (PromotionProductScopeEnum.isAll(activityDTO.getProductScope())) {
  218 + activityDTO.getSpuIds().add(spuId);
  219 + } else if (PromotionProductScopeEnum.isSpu(activityDTO.getProductScope())) {
  220 + if (CollUtil.contains(activityDTO.getProductScopeValues(), spuId)) {
  221 + activityDTO.getSpuIds().add(spuId);
  222 + }
  223 + } else if (PromotionProductScopeEnum.isCategory(activityDTO.getProductScope())) {
  224 + ProductSpuRespDTO spu = spuMap.get(spuId);
  225 + if (spu != null && CollUtil.contains(activityDTO.getProductScopeValues(), spu.getCategoryId())) {
  226 + activityDTO.getSpuIds().add(spuId);
  227 + }
  228 + }
  229 + }
  230 +
  231 + // 3.2 设置每个 Rule 的描述
  232 + activityDTO.setRules(convertList(activity.getRules(), rule ->
  233 + BeanUtils.toBean(rule, RewardActivityMatchRespDTO.Rule.class)
  234 + .setDescription(getRewardActivityRuleDescription(activityDTO.getConditionType(), rule))));
  235 + return activityDTO;
  236 + });
168 237 }
169 238  
170 239 }
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityService.java
  View file @caf49aa
... ... @@ -10,7 +10,6 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillActivityD
10 10 import cn.iocoder.yudao.module.promotion.dal.dataobject.seckill.SeckillProductDO;
11 11 import jakarta.validation.Valid;
12 12  
13   -import java.time.LocalDateTime;
14 13 import java.util.Collection;
15 14 import java.util.List;
16 15  
... ... @@ -110,7 +109,7 @@ public interface SeckillActivityService {
110 109 List<SeckillActivityDO> getSeckillActivityListByConfigIdAndStatus(Long configId, Integer status);
111 110  
112 111 /**
113   - * 通过活动时段获取秒杀活动
  112 + * 通过活动时段获取开始的秒杀活动
114 113 *
115 114 * @param pageReqVO 请求
116 115 * @return 秒杀活动列表
... ... @@ -130,14 +129,12 @@ public interface SeckillActivityService {
130 129 SeckillValidateJoinRespDTO validateJoinSeckill(Long activityId, Long skuId, Integer count);
131 130  
132 131 /**
133   - * 获取指定 spu 编号最近参加的活动，每个 spuId 只返回一条记录
  132 + * 获得 SPU 进行中的秒杀活动
134 133 *
135   - * @param spuIds spu 编号
136   - * @param status 状态
137   - * @param dateTime 日期时间
138   - * @return 秒杀活动列表
  134 + * @param spuId SPU 编号数组
  135 + * @return 秒杀活动
139 136 */
140   - List<SeckillActivityDO> getSeckillActivityBySpuIdsAndStatusAndDateTimeLt(Collection<Long> spuIds, Integer status, LocalDateTime dateTime);
  137 + SeckillActivityDO getMatchSeckillActivityBySpuId(Long spuId);
141 138  
142 139 /**
143 140 * 获得拼团活动列表
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/seckill/SeckillActivityServiceImpl.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.promotion.service.seckill;
2 2  
3   -import cn.hutool.core.collection.CollUtil;
4 3 import cn.hutool.core.collection.CollectionUtil;
5   -import cn.hutool.core.map.MapUtil;
6 4 import cn.hutool.core.util.ObjectUtil;
7 5 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
8 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
... ... @@ -30,7 +28,6 @@ import org.springframework.validation.annotation.Validated;
30 28  
31 29 import java.time.LocalDateTime;
32 30 import java.util.Collection;
33   -import java.util.Collections;
34 31 import java.util.List;
35 32 import java.util.Map;
36 33  
... ... @@ -56,8 +53,10 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
56 53 private SeckillActivityMapper seckillActivityMapper;
57 54 @Resource
58 55 private SeckillProductMapper seckillProductMapper;
  56 +
59 57 @Resource
60 58 private SeckillConfigService seckillConfigService;
  59 +
61 60 @Resource
62 61 private ProductSpuApi productSpuApi;
63 62 @Resource
... ... @@ -219,7 +218,7 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
219 218 seckillProductMapper.updateBatch(diffList.get(1));
220 219 }
221 220 if (isNotEmpty(diffList.get(2))) {
222   - seckillProductMapper.deleteBatchIds(convertList(diffList.get(2), SeckillProductDO::getId));
  221 + seckillProductMapper.deleteByIds(convertList(diffList.get(2), SeckillProductDO::getId));
223 222 }
224 223 }
225 224  
... ... @@ -249,7 +248,7 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
249 248 seckillActivityMapper.deleteById(id);
250 249 // 删除活动商品
251 250 List<SeckillProductDO> products = seckillProductMapper.selectListByActivityId(id);
252   - seckillProductMapper.deleteBatchIds(convertSet(products, SeckillProductDO::getId));
  251 + seckillProductMapper.deleteByIds(convertSet(products, SeckillProductDO::getId));
253 252 }
254 253  
255 254 private SeckillActivityDO validateSeckillActivityExists(Long id) {
... ... @@ -289,7 +288,7 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
289 288  
290 289 @Override
291 290 public PageResult<SeckillActivityDO> getSeckillActivityAppPageByConfigId(AppSeckillActivityPageReqVO pageReqVO) {
292   - return seckillActivityMapper.selectPage(pageReqVO, CommonStatusEnum.ENABLE.getStatus());
  291 + return seckillActivityMapper.selectPage(pageReqVO, CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now());
293 292 }
294 293  
295 294 @Override
... ... @@ -325,15 +324,8 @@ public class SeckillActivityServiceImpl implements SeckillActivityService {
325 324 }
326 325  
327 326 @Override
328   - public List<SeckillActivityDO> getSeckillActivityBySpuIdsAndStatusAndDateTimeLt(Collection<Long> spuIds, Integer status, LocalDateTime dateTime) {
329   - // 1.查询出指定 spuId 的 spu 参加的活动最接近现在的一条记录。多个的话，一个 spuId 对应一个最近的活动编号
330   - List<Map<String, Object>> spuIdAndActivityIdMaps = seckillActivityMapper.selectSpuIdAndActivityIdMapsBySpuIdsAndStatus(spuIds, status);
331   - if (CollUtil.isEmpty(spuIdAndActivityIdMaps)) {
332   - return Collections.emptyList();
333   - }
334   - // 2.查询活动详情
335   - return seckillActivityMapper.selectListByIdsAndDateTimeLt(
336   - convertSet(spuIdAndActivityIdMaps, map -> MapUtil.getLong(map, "activityId")), dateTime);
  327 + public SeckillActivityDO getMatchSeckillActivityBySpuId(Long spuId) {
  328 + return seckillActivityMapper.selectBySpuIdAndStatusAndNow(spuId, CommonStatusEnum.ENABLE.getStatus());
337 329 }
338 330  
339 331 @Override
... ...
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/util/PromotionUtils.java deleted
View file @3278d38
1   -package cn.iocoder.yudao.module.promotion.util;
2   -
3   -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4   -import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
5   -
6   -import java.time.LocalDateTime;
7   -
8   -/**
9   - * 活动工具类
10   - *
11   - * @author 芋道源码
12   - */
13   -public class PromotionUtils {
14   -
15   - /**
16   - * 根据时间，计算活动状态
17   - *
18   - * @param endTime 结束时间
19   - * @return 活动状态
20   - */
21   - public static Integer calculateActivityStatus(LocalDateTime endTime) {
22   - return LocalDateTimeUtils.beforeNow(endTime) ? CommonStatusEnum.DISABLE.getStatus() : CommonStatusEnum.ENABLE.getStatus();
23   - }
24   -
25   -}
yudao-module-mall/yudao-module-promotion-biz/src/main/resources/mapper/discount/DiscountProductMapper.xml deleted
View file @3278d38
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3   -<mapper namespace="cn.iocoder.yudao.module.promotion.dal.mysql.discount.DiscountProductMapper">
4   -
5   -
6   - <select id="getMatchDiscountProductList" resultType="cn.iocoder.yudao.module.promotion.dal.dataobject.discount.DiscountProductDO">
7   - SELECT pdp.*
8   - FROM promotion_discount_product pdp
9   - LEFT JOIN promotion_discount_activity pda
10   - ON pdp.activity_id = pda.id
11   - <where>
12   - <if test="skuIds != null and skuIds.size > 0">
13   - AND pdp.sku_id in
14   - <foreach collection="skuIds" item="skuId" index="index" open="(" close=")" separator=",">
15   - #{skuId}
16   - </foreach>
17   - </if>
18   - AND pda.start_time &lt;= CURRENT_TIME AND pda.end_time &gt;= CURRENT_TIME
19   - AND pda.`status` = 20
20   - AND pda.deleted != 1
21   - </where>
22   - </select>
23   -
24   -</mapper>
yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImplTest.java
  View file @caf49aa
... ... @@ -2,8 +2,9 @@ package cn.iocoder.yudao.module.promotion.service.reward;
2 2  
3 3 import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
5   -import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
6   -import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
  5 +import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
  6 +import cn.iocoder.yudao.module.product.api.category.ProductCategoryApi;
  7 +import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
7 8 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
8 9 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
9 10 import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
... ... @@ -11,17 +12,14 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
11 12 import cn.iocoder.yudao.module.promotion.dal.mysql.reward.RewardActivityMapper;
12 13 import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
13 14 import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
14   -import jakarta.annotation.Resource;
15 15 import org.junit.jupiter.api.Disabled;
16 16 import org.junit.jupiter.api.Test;
17   -import org.springframework.context.annotation.Import;
  17 +import org.mockito.InjectMocks;
  18 +import org.mockito.Mock;
18 19  
19 20 import java.time.Duration;
20   -import java.util.List;
21   -import java.util.Set;
22 21  
23 22 import static cn.hutool.core.util.RandomUtil.randomEle;
24   -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
25 23 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.addTime;
26 24 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
27 25 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
... ... @@ -29,8 +27,6 @@ import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServic
29 27 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId;
30 28 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
31 29 import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.REWARD_ACTIVITY_NOT_EXISTS;
32   -import static com.google.common.primitives.Longs.asList;
33   -import static java.util.Collections.singletonList;
34 30 import static org.junit.jupiter.api.Assertions.*;
35 31  
36 32 /**
... ... @@ -39,14 +35,17 @@ import static org.junit.jupiter.api.Assertions.*;
39 35 * @author 芋道源码
40 36 */
41 37 @Disabled // TODO 芋艿：后续 fix 补充的单测
42   -@Import(RewardActivityServiceImpl.class)
43   -public class RewardActivityServiceImplTest extends BaseDbUnitTest {
  38 +public class RewardActivityServiceImplTest extends BaseMockitoUnitTest {
44 39  
45   - @Resource
46   - private RewardActivityServiceImpl rewardActivityService;
  40 + @InjectMocks
  41 + private RewardActivityServiceImpl rewardActivityServiceImpl;
47 42  
48   - @Resource
  43 + @Mock
49 44 private RewardActivityMapper rewardActivityMapper;
  45 + @Mock
  46 + private ProductCategoryApi productCategoryApi;
  47 + @Mock
  48 + private ProductSpuApi productSpuApi;
50 49  
51 50 @Test
52 51 public void testCreateRewardActivity_success() {
... ... @@ -59,7 +58,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
59 58 });
60 59  
61 60 // 调用
62   - Long rewardActivityId = rewardActivityService.createRewardActivity(reqVO);
  61 + Long rewardActivityId = rewardActivityServiceImpl.createRewardActivity(reqVO);
63 62 // 断言
64 63 assertNotNull(rewardActivityId);
65 64 // 校验记录的属性是否正确
... ... @@ -86,7 +85,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
86 85 });
87 86  
88 87 // 调用
89   - rewardActivityService.updateRewardActivity(reqVO);
  88 + rewardActivityServiceImpl.updateRewardActivity(reqVO);
90 89 // 校验是否更新正确
91 90 RewardActivityDO rewardActivity = rewardActivityMapper.selectById(reqVO.getId()); // 获取最新的
92 91 assertPojoEquals(reqVO, rewardActivity, "rules");
... ... @@ -105,7 +104,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
105 104 Long id = dbRewardActivity.getId();
106 105  
107 106 // 调用
108   - rewardActivityService.closeRewardActivity(id);
  107 + rewardActivityServiceImpl.closeRewardActivity(id);
109 108 // 校验状态
110 109 RewardActivityDO rewardActivity = rewardActivityMapper.selectById(id);
111 110 assertEquals(rewardActivity.getStatus(), CommonStatusEnum.DISABLE.getStatus());
... ... @@ -117,7 +116,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
117 116 RewardActivityUpdateReqVO reqVO = randomPojo(RewardActivityUpdateReqVO.class);
118 117  
119 118 // 调用, 并断言异常
120   - assertServiceException(() -> rewardActivityService.updateRewardActivity(reqVO), REWARD_ACTIVITY_NOT_EXISTS);
  119 + assertServiceException(() -> rewardActivityServiceImpl.updateRewardActivity(reqVO), REWARD_ACTIVITY_NOT_EXISTS);
121 120 }
122 121  
123 122 @Test
... ... @@ -129,7 +128,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
129 128 Long id = dbRewardActivity.getId();
130 129  
131 130 // 调用
132   - rewardActivityService.deleteRewardActivity(id);
  131 + rewardActivityServiceImpl.deleteRewardActivity(id);
133 132 // 校验数据不存在了
134 133 assertNull(rewardActivityMapper.selectById(id));
135 134 }
... ... @@ -140,7 +139,7 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
140 139 Long id = randomLongId();
141 140  
142 141 // 调用, 并断言异常
143   - assertServiceException(() -> rewardActivityService.deleteRewardActivity(id), REWARD_ACTIVITY_NOT_EXISTS);
  142 + assertServiceException(() -> rewardActivityServiceImpl.deleteRewardActivity(id), REWARD_ACTIVITY_NOT_EXISTS);
144 143 }
145 144  
146 145 @Test
... ... @@ -161,66 +160,98 @@ public class RewardActivityServiceImplTest extends BaseDbUnitTest {
161 160 reqVO.setStatus(CommonStatusEnum.DISABLE.getStatus());
162 161  
163 162 // 调用
164   - PageResult<RewardActivityDO> pageResult = rewardActivityService.getRewardActivityPage(reqVO);
  163 + PageResult<RewardActivityDO> pageResult = rewardActivityServiceImpl.getRewardActivityPage(reqVO);
165 164 // 断言
166 165 assertEquals(1, pageResult.getTotal());
167 166 assertEquals(1, pageResult.getList().size());
168 167 assertPojoEquals(dbRewardActivity, pageResult.getList().get(0), "rules");
169 168 }
170 169  
171   - @Test
172   - public void testGetRewardActivities_all() {
173   - // mock 数据
174   - RewardActivityDO allActivity = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
175   - .setProductScope(PromotionProductScopeEnum.ALL.getScope()));
176   - rewardActivityMapper.insert(allActivity);
177   - RewardActivityDO productActivity = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
178   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L)));
179   - rewardActivityMapper.insert(productActivity);
180   - // 准备参数
181   - Set<Long> spuIds = asSet(1L, 2L);
182   -
183   - // 调用 TODO getMatchRewardActivities 没有这个方法，但是找到了 getMatchRewardActivityList
184   - List<RewardActivityMatchRespDTO> matchRewardActivityList = rewardActivityService.getMatchRewardActivityList(spuIds);
185   - // 断言
186   - assertEquals(matchRewardActivityList.size(), 1);
187   - matchRewardActivityList.forEach((activity) -> {
188   - if (activity.getId().equals(productActivity.getId())) {
189   - assertPojoEquals(activity, productActivity);
190   - assertEquals(activity.getProductScopeValues(), asList(1L, 2L));
191   - } else {
192   - fail();
193   - }
194   - });
195   - }
196   -
197   - @Test
198   - public void testGetRewardActivities_product() {
199   - // mock 数据
200   - RewardActivityDO productActivity01 = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
201   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L)));
202   - rewardActivityMapper.insert(productActivity01);
203   - RewardActivityDO productActivity02 = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
204   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(singletonList(3L)));
205   - rewardActivityMapper.insert(productActivity02);
206   - // 准备参数
207   - Set<Long> spuIds = asSet(1L, 2L, 3L);
208   -
209   - // 调用 TODO getMatchRewardActivities 没有这个方法，但是找到了 getMatchRewardActivityList
210   - List<RewardActivityMatchRespDTO> matchRewardActivityList = rewardActivityService.getMatchRewardActivityList(spuIds);
211   - // 断言
212   - assertEquals(matchRewardActivityList.size(), 2);
213   - matchRewardActivityList.forEach((activity) -> {
214   - if (activity.getId().equals(productActivity01.getId())) {
215   - assertPojoEquals(activity, productActivity01);
216   - assertEquals(activity.getProductScopeValues(), asList(1L, 2L));
217   - } else if (activity.getId().equals(productActivity02.getId())) {
218   - assertPojoEquals(activity, productActivity02);
219   - assertEquals(activity.getProductScopeValues(), singletonList(3L));
220   - } else {
221   - fail();
222   - }
223   - });
224   - }
  170 + // TODO 芋艿：后续完善单测
  171 +// @Test
  172 +// public void testGetRewardActivities_all() {
  173 +// LocalDateTime now = LocalDateTime.now();
  174 +// // mock 数据
  175 +// RewardActivityDO allActivity = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
  176 +// .setProductScope(PromotionProductScopeEnum.ALL.getScope()).setStartTime(now.minusDays(1)).setEndTime(now.plusDays(1)));
  177 +// rewardActivityMapper.insert(allActivity);
  178 +// RewardActivityDO productActivity = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
  179 +// .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L))
  180 +// .setStartTime(now.minusDays(1)).setEndTime(now.plusDays(1)));
  181 +// rewardActivityMapper.insert(productActivity);
  182 +// // 准备参数
  183 +// Set<Long> spuIds = asSet(1L, 2L);
  184 +//
  185 +// // 调用
  186 +// List<RewardActivityDO> activityList = rewardActivityServiceImpl.getRewardActivityListByStatusAndDateTimeLt(
  187 +// CommonStatusEnum.ENABLE.getStatus(), now);
  188 +// List<RewardActivityDO> matchRewardActivityList = filterMatchActivity(spuIds, activityList);
  189 +// // 断言
  190 +// assertEquals(matchRewardActivityList.size(), 1);
  191 +// matchRewardActivityList.forEach((activity) -> {
  192 +// if (activity.getId().equals(productActivity.getId())) {
  193 +// assertPojoEquals(activity, productActivity);
  194 +// assertEquals(activity.getProductScopeValues(), asList(1L, 2L));
  195 +// } else {
  196 +// fail();
  197 +// }
  198 +// });
  199 +// }
  200 +//
  201 +// @Test
  202 +// public void testGetRewardActivities_product() {
  203 +// LocalDateTime now = LocalDateTime.now();
  204 +// // mock 数据
  205 +// RewardActivityDO productActivity01 = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
  206 +// .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L))
  207 +// .setStartTime(now.minusDays(1)).setEndTime(now.plusDays(1)));
  208 +// rewardActivityMapper.insert(productActivity01);
  209 +// RewardActivityDO productActivity02 = randomPojo(RewardActivityDO.class, o -> o.setStatus(CommonStatusEnum.ENABLE.getStatus())
  210 +// .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(singletonList(3L))
  211 +// .setStartTime(now.minusDays(1)).setEndTime(now.plusDays(1)));
  212 +// rewardActivityMapper.insert(productActivity02);
  213 +// // 准备参数
  214 +// Set<Long> spuIds = asSet(1L, 2L, 3L);
  215 +//
  216 +// List<RewardActivityDO> activityList = rewardActivityServiceImpl.getRewardActivityListByStatusAndDateTimeLt(
  217 +// CommonStatusEnum.ENABLE.getStatus(), now);
  218 +// List<RewardActivityDO> matchRewardActivityList = filterMatchActivity(spuIds, activityList);
  219 +// // 断言
  220 +// assertEquals(matchRewardActivityList.size(), 2);
  221 +// matchRewardActivityList.forEach((activity) -> {
  222 +// if (activity.getId().equals(productActivity01.getId())) {
  223 +// assertPojoEquals(activity, productActivity01);
  224 +// assertEquals(activity.getProductScopeValues(), asList(1L, 2L));
  225 +// } else if (activity.getId().equals(productActivity02.getId())) {
  226 +// assertPojoEquals(activity, productActivity02);
  227 +// assertEquals(activity.getProductScopeValues(), singletonList(3L));
  228 +// } else {
  229 +// fail();
  230 +// }
  231 +// });
  232 +// }
  233 +//
  234 +// /**
  235 +// * 获得满减送的订单项（商品）列表
  236 +// *
  237 +// * @param spuIds 商品编号
  238 +// * @param activityList 活动列表
  239 +// * @return 订单项（商品）列表
  240 +// */
  241 +// private List<RewardActivityDO> filterMatchActivity(Collection<Long> spuIds, List<RewardActivityDO> activityList) {
  242 +// List<RewardActivityDO> resultActivityList = new ArrayList<>();
  243 +// for (RewardActivityDO activity : activityList) {
  244 +// // 情况一：全部商品都可以参与
  245 +// if (PromotionProductScopeEnum.isAll(activity.getProductScope())) {
  246 +// resultActivityList.add(activity);
  247 +// }
  248 +// // 情况二：指定商品参与
  249 +// if (PromotionProductScopeEnum.isSpu(activity.getProductScope()) &&
  250 +// !intersectionDistinct(activity.getProductScopeValues(), spuIds).isEmpty()) {
  251 +// resultActivityList.add(activity);
  252 +// }
  253 +// }
  254 +// return resultActivityList;
  255 +// }
225 256  
226 257 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.http
  View file @caf49aa
... ... @@ -62,3 +62,8 @@ tenant-id: {{appTenentId}}
62 62 GET {{appApi}}/trade/order/get-express-track-list?id=70
63 63 Authorization: Bearer {{appToken}}
64 64 tenant-id: {{appTenentId}}
  65 +
  66 +### /trade-order/settlement-product 获得商品结算信息
  67 +GET {{appApi}}/trade/order/settlement-product?spuIds=633
  68 +Authorization: Bearer {{appToken}}
  69 +tenant-id: {{appTenentId}}
65 70 \ No newline at end of file
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
  View file @caf49aa
... ... @@ -17,9 +17,11 @@ import cn.iocoder.yudao.module.trade.service.aftersale.AfterSaleService;
17 17 import cn.iocoder.yudao.module.trade.service.delivery.DeliveryExpressService;
18 18 import cn.iocoder.yudao.module.trade.service.order.TradeOrderQueryService;
19 19 import cn.iocoder.yudao.module.trade.service.order.TradeOrderUpdateService;
  20 +import cn.iocoder.yudao.module.trade.service.price.TradePriceService;
20 21 import com.google.common.collect.Maps;
21 22 import io.swagger.v3.oas.annotations.Operation;
22 23 import io.swagger.v3.oas.annotations.Parameter;
  24 +import io.swagger.v3.oas.annotations.Parameters;
23 25 import io.swagger.v3.oas.annotations.tags.Tag;
24 26 import jakarta.annotation.Resource;
25 27 import jakarta.validation.Valid;
... ... @@ -47,9 +49,10 @@ public class AppTradeOrderController {
47 49 private TradeOrderQueryService tradeOrderQueryService;
48 50 @Resource
49 51 private DeliveryExpressService deliveryExpressService;
50   -
51 52 @Resource
52 53 private AfterSaleService afterSaleService;
  54 + @Resource
  55 + private TradePriceService priceService;
53 56  
54 57 @Resource
55 58 private TradeOrderProperties tradeOrderProperties;
... ... @@ -61,6 +64,13 @@ public class AppTradeOrderController {
61 64 return success(tradeOrderUpdateService.settlementOrder(getLoginUserId(), settlementReqVO));
62 65 }
63 66  
  67 + @GetMapping("/settlement-product")
  68 + @Operation(summary = "获得商品结算信息", description = "用于商品列表、商品详情，获得参与活动后的价格信息")
  69 + @Parameter(name = "spuIds", description = "商品 SPU 编号数组")
  70 + public CommonResult<List<AppTradeProductSettlementRespVO>> settlementProduct(@RequestParam("spuIds") List<Long> spuIds) {
  71 + return success(priceService.calculateProductPrice(getLoginUserId(), spuIds));
  72 + }
  73 +
64 74 @PostMapping("/create")
65 75 @Operation(summary = "创建订单")
66 76 @PreAuthenticated
... ... @@ -79,21 +89,32 @@ public class AppTradeOrderController {
79 89  
80 90 @GetMapping("/get-detail")
81 91 @Operation(summary = "获得交易订单")
82   - @Parameter(name = "id", description = "交易订单编号")
  92 + @Parameters({
  93 + @Parameter(name = "id", description = "交易订单编号"),
  94 + @Parameter(name = "sync", description = "是否同步支付状态", example = "true")
  95 + })
83 96 @PreAuthenticated
84   - public CommonResult<AppTradeOrderDetailRespVO> getOrder(@RequestParam("id") Long id) {
85   - // 查询订单
  97 + public CommonResult<AppTradeOrderDetailRespVO> getOrderDetail(@RequestParam("id") Long id,
  98 + @RequestParam(value = "sync", required = false) Boolean sync) {
  99 + // 1.1 查询订单
86 100 TradeOrderDO order = tradeOrderQueryService.getOrder(getLoginUserId(), id);
87 101 if (order == null) {
88 102 return success(null);
89 103 }
  104 + // 1.2 sync 仅在等待支付
  105 + if (Boolean.TRUE.equals(sync)
  106 + && TradeOrderStatusEnum.isUnpaid(order.getStatus()) && !order.getPayStatus()) {
  107 + tradeOrderUpdateService.syncOrderPayStatusQuietly(order.getId(), order.getPayOrderId());
  108 + // 重新查询，因为同步后，可能会有变化
  109 + order = tradeOrderQueryService.getOrder(id);
  110 + }
90 111  
91   - // 查询订单项
  112 + // 2.1 查询订单项
92 113 List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(order.getId());
93   - // 查询物流公司
  114 + // 2.2 查询物流公司
94 115 DeliveryExpressDO express = order.getLogisticsId() != null && order.getLogisticsId() > 0 ?
95 116 deliveryExpressService.getDeliveryExpress(order.getLogisticsId()) : null;
96   - // 最终组合
  117 + // 2.3 最终组合
97 118 return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems, tradeOrderProperties, express));
98 119 }
99 120  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.trade.controller.app.order.vo;
2 2  
3 3 import cn.iocoder.yudao.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
  4 +import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
4 5 import io.swagger.v3.oas.annotations.media.Schema;
5 6 import lombok.AllArgsConstructor;
6 7 import lombok.Data;
... ... @@ -34,6 +35,13 @@ public class AppTradeOrderSettlementRespVO {
34 35 @Schema(description = "总积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
35 36 private Integer totalPoint;
36 37  
  38 + /**
  39 + * 营销活动数组
  40 + *
  41 + * 只对应 {@link TradePriceCalculateRespBO.Price#items} 商品匹配的活动
  42 + */
  43 + private List<TradePriceCalculateRespBO.Promotion> promotions;
  44 +
37 45 @Schema(description = "购物项")
38 46 @Data
39 47 public static class Item {
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeProductSettlementRespVO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.trade.controller.app.order.vo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +import java.io.Serializable;
  7 +import java.time.LocalDateTime;
  8 +import java.util.List;
  9 +import java.util.Map;
  10 +
  11 +@Schema(description = "用户 App - 商品结算信息 Response VO")
  12 +@Data
  13 +public class AppTradeProductSettlementRespVO {
  14 +
  15 + @Schema(description = "SPU 商品编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  16 + private Long spuId;
  17 +
  18 + @Schema(description = "SKU 价格信息数组", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  19 + private List<Sku> skus;
  20 +
  21 + @Schema(description = "满减送活动信息", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  22 + private RewardActivity rewardActivity;
  23 +
  24 + @Schema(description = "SKU 价格信息")
  25 + @Data
  26 + public static class Sku implements Serializable {
  27 +
  28 + @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  29 + private Long id;
  30 +
  31 + @Schema(description = "优惠后价格，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  32 + private Integer promotionPrice;
  33 +
  34 + @Schema(description = "营销类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "4")
  35 + private Integer promotionType; // 对应 PromotionTypeEnum 枚举，目前只有 4 和 6 两种
  36 +
  37 + @Schema(description = "营销编号", requiredMode = Schema.RequiredMode.REQUIRED)
  38 + private Long promotionId; // 目前只有限时折扣活动的编号
  39 +
  40 + @Schema(description = "活动结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
  41 + private LocalDateTime promotionEndTime;
  42 +
  43 + }
  44 +
  45 + @Schema(description = "满减送活动信息")
  46 + @Data
  47 + public static class RewardActivity {
  48 +
  49 + @Schema(description = "满减活动编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  50 + private Long id;
  51 +
  52 + @Schema(description = "条件类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
  53 + private Integer conditionType;
  54 +
  55 + @Schema(description = "优惠规则的数组", requiredMode = Schema.RequiredMode.REQUIRED)
  56 + private List<RewardActivityRule> rules;
  57 +
  58 + }
  59 +
  60 + @Schema(description = "优惠规则")
  61 + @Data
  62 + public static class RewardActivityRule {
  63 +
  64 + @Schema(description = "优惠门槛", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") // 1. 满 N 元，单位：分; 2. 满 N 件
  65 + private Integer limit;
  66 +
  67 + @Schema(description = "优惠价格", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  68 + private Integer discountPrice;
  69 +
  70 + @Schema(description = "是否包邮", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
  71 + private Boolean freeDelivery;
  72 +
  73 + @Schema(description = "赠送的积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
  74 + private Integer point;
  75 +
  76 + @Schema(description = "赠送的优惠劵编号的数组")
  77 + private Map<Long, Integer> giveCouponTemplateCounts;
  78 +
  79 + }
  80 +
  81 +}
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/aftersale/AfterSaleConvert.java
  View file @caf49aa
... ... @@ -46,8 +46,7 @@ public interface AfterSaleConvert {
46 46 @Mapping(source = "afterSale.refundPrice", target = "price"),
47 47 @Mapping(source = "orderProperties.payAppKey", target = "appKey")
48 48 })
49   - PayRefundCreateReqDTO convert(String userIp, AfterSaleDO afterSale,
50   - TradeOrderProperties orderProperties);
  49 + PayRefundCreateReqDTO convert(String userIp, AfterSaleDO afterSale, TradeOrderProperties orderProperties);
51 50  
52 51 MemberUserRespVO convert(MemberUserRespDTO bean);
53 52  
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/aftersale/AfterSaleServiceImpl.java
  View file @caf49aa
... ... @@ -386,7 +386,7 @@ public class AfterSaleServiceImpl implements AfterSaleService {
386 386 public void afterCommit() {
387 387 // 创建退款单
388 388 PayRefundCreateReqDTO createReqDTO = AfterSaleConvert.INSTANCE.convert(userIp, afterSale, tradeOrderProperties)
389   - .setReason(StrUtil.format("退款【{}】", afterSale.getSpuName()));
  389 + .setReason(StrUtil.format("退款【{}】", afterSale.getSpuName()));;
390 390 Long payRefundId = payRefundApi.createRefund(createReqDTO);
391 391 // 更新售后单的退款单号
392 392 tradeAfterSaleMapper.updateById(new AfterSaleDO().setId(afterSale.getId()).setPayRefundId(payRefundId));
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateService.java
  View file @caf49aa
... ... @@ -50,6 +50,17 @@ public interface TradeOrderUpdateService {
50 50 void updateOrderPaid(Long id, Long payOrderId);
51 51  
52 52 /**
  53 + * 同步订单的支付状态
  54 + *
  55 + * 1. Quietly 表示，即使同步失败，也不会抛出异常
  56 + * 2. 什么时候回出现异常？因为是主动同步，可能和支付模块的回调通知 {@link #updateOrderPaid(Long, Long)} 存在并发冲突，导致抛出异常
  57 + *
  58 + * @param id 订单编号
  59 + * @param payOrderId 支付订单编号
  60 + */
  61 + void syncOrderPayStatusQuietly(Long id, Long payOrderId);
  62 +
  63 + /**
53 64 * 【管理员】发货交易订单
54 65 *
55 66 * @param deliveryReqVO 发货请求
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/order/TradeOrderUpdateServiceImpl.java
  View file @caf49aa
... ... @@ -9,7 +9,6 @@ import cn.hutool.core.util.ObjectUtil;
9 9 import cn.hutool.core.util.RandomUtil;
10 10 import cn.hutool.core.util.StrUtil;
11 11 import cn.hutool.extra.spring.SpringUtil;
12   -import cn.iocoder.yudao.framework.common.core.KeyValue;
13 12 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
14 13 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
15 14 import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
... ... @@ -166,7 +165,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
166 165 TradePriceCalculateReqBO calculateReqBO = TradeOrderConvert.INSTANCE.convert(userId, settlementReqVO, cartList);
167 166 calculateReqBO.getItems().forEach(item -> Assert.isTrue(item.getSelected(), // 防御性编程，保证都是选中的
168 167 "商品({}) 未设置为选中", item.getSkuId()));
169   - return tradePriceService.calculatePrice(calculateReqBO);
  168 + return tradePriceService.calculateOrderPrice(calculateReqBO);
170 169 }
171 170  
172 171 @Override
... ... @@ -269,12 +268,24 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
269 268 @Transactional(rollbackFor = Exception.class)
270 269 @TradeOrderLog(operateType = TradeOrderOperateTypeEnum.MEMBER_PAY)
271 270 public void updateOrderPaid(Long id, Long payOrderId) {
272   - // 1. 校验并获得交易订单（可支付）
273   - KeyValue<TradeOrderDO, PayOrderRespDTO> orderResult = validateOrderPayable(id, payOrderId);
274   - TradeOrderDO order = orderResult.getKey();
275   - PayOrderRespDTO payOrder = orderResult.getValue();
  271 + // 1.1 校验订单是否存在
  272 + TradeOrderDO order = validateOrderExists(id);
  273 + // 1.2 校验订单已支付
  274 + if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayStatus()) {
  275 + // 特殊：如果订单已支付，且支付单号相同，直接返回，说明重复回调
  276 + if (ObjectUtil.equals(order.getPayOrderId(), payOrderId)) {
  277 + log.warn("[updateOrderPaid][order({}) 已支付，且支付单号相同({})，直接返回]", order, payOrderId);
  278 + return;
  279 + }
  280 + log.error("[updateOrderPaid][order({}) 支付单不匹配({})，请进行处理！order 数据是：{}]",
  281 + id, payOrderId, JsonUtils.toJsonString(order));
  282 + throw exception(ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR);
  283 + }
276 284  
277   - // 2. 更新 TradeOrderDO 状态为已支付，等待发货
  285 + // 2. 校验支付订单的合法性
  286 + PayOrderRespDTO payOrder = validatePayOrderPaid(order, payOrderId);
  287 +
  288 + // 3. 更新 TradeOrderDO 状态为已支付，等待发货
278 289 int updateCount = tradeOrderMapper.updateByIdAndStatus(id, order.getStatus(),
279 290 new TradeOrderDO().setStatus(TradeOrderStatusEnum.UNDELIVERED.getStatus()).setPayStatus(true)
280 291 .setPayTime(LocalDateTime.now()).setPayChannelCode(payOrder.getChannelCode()));
... ... @@ -282,66 +293,65 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
282 293 throw exception(ORDER_UPDATE_PAID_STATUS_NOT_UNPAID);
283 294 }
284 295  
285   - // 3. 执行 TradeOrderHandler 的后置处理
  296 + // 4. 执行 TradeOrderHandler 的后置处理
286 297 List<TradeOrderItemDO> orderItems = tradeOrderItemMapper.selectListByOrderId(id);
287 298 tradeOrderHandlers.forEach(handler -> handler.afterPayOrder(order, orderItems));
288 299  
289   - // 4. 记录订单日志
  300 + // 5. 记录订单日志
290 301 TradeOrderLogUtils.setOrderInfo(order.getId(), order.getStatus(), TradeOrderStatusEnum.UNDELIVERED.getStatus());
291 302 TradeOrderLogUtils.setUserInfo(order.getUserId(), UserTypeEnum.MEMBER.getValue());
292 303 }
293 304  
  305 + @Override
  306 + public void syncOrderPayStatusQuietly(Long id, Long payOrderId) {
  307 + PayOrderRespDTO payOrder = payOrderApi.getOrder(payOrderId);
  308 + if (payOrder == null) {
  309 + return;
  310 + }
  311 + if (!PayOrderStatusEnum.isSuccess(payOrder.getStatus())) {
  312 + return;
  313 + }
  314 + try {
  315 + getSelf().updateOrderPaid(id, payOrderId);
  316 + } catch (Throwable e) {
  317 + log.warn("[syncOrderPayStatusQuietly][id({}) payOrderId({}) 同步支付状态失败]", id, payOrderId, e);
  318 + }
  319 + }
  320 +
294 321 /**
295   - * 校验交易订单满足被支付的条件
296   - * <p>
297   - * 1. 交易订单未支付
298   - * 2. 支付单已支付
  322 + * 校验支付订单的合法性
299 323 *
300   - * @param id 交易订单编号
  324 + * @param order 交易订单
301 325 * @param payOrderId 支付订单编号
302   - * @return 交易订单
  326 + * @return 支付订单
303 327 */
304   - private KeyValue<TradeOrderDO, PayOrderRespDTO> validateOrderPayable(Long id, Long payOrderId) {
305   - // 校验订单是否存在
306   - TradeOrderDO order = validateOrderExists(id);
307   - // 校验订单未支付
308   - if (!TradeOrderStatusEnum.isUnpaid(order.getStatus()) || order.getPayStatus()) {
309   - log.error("[validateOrderPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]",
310   - id, JsonUtils.toJsonString(order));
311   - throw exception(ORDER_UPDATE_PAID_STATUS_NOT_UNPAID);
312   - }
313   - // 校验支付订单匹配
314   - if (ObjectUtil.notEqual(order.getPayOrderId(), payOrderId)) { // 支付单号
315   - log.error("[validateOrderPaid][order({}) 支付单不匹配({})，请进行处理！order 数据是：{}]",
316   - id, payOrderId, JsonUtils.toJsonString(order));
317   - throw exception(ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR);
318   - }
319   -
320   - // 校验支付单是否存在
  328 + private PayOrderRespDTO validatePayOrderPaid(TradeOrderDO order, Long payOrderId) {
  329 + // 1. 校验支付单是否存在
321 330 PayOrderRespDTO payOrder = payOrderApi.getOrder(payOrderId);
322 331 if (payOrder == null) {
323   - log.error("[validateOrderPaid][order({}) payOrder({}) 不存在，请进行处理！]", id, payOrderId);
  332 + log.error("[validatePayOrderPaid][order({}) payOrder({}) 不存在，请进行处理！]", order.getId(), payOrderId);
324 333 throw exception(ORDER_NOT_FOUND);
325 334 }
326   - // 校验支付单已支付
  335 +
  336 + // 2.1 校验支付单已支付
327 337 if (!PayOrderStatusEnum.isSuccess(payOrder.getStatus())) {
328   - log.error("[validateOrderPaid][order({}) payOrder({}) 未支付，请进行处理！payOrder 数据是：{}]",
329   - id, payOrderId, JsonUtils.toJsonString(payOrder));
  338 + log.error("[validatePayOrderPaid][order({}) payOrder({}) 未支付，请进行处理！payOrder 数据是：{}]",
  339 + order.getId(), payOrderId, JsonUtils.toJsonString(payOrder));
330 340 throw exception(ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS);
331 341 }
332   - // 校验支付金额一致
  342 + // 2.2 校验支付金额一致
333 343 if (ObjectUtil.notEqual(payOrder.getPrice(), order.getPayPrice())) {
334   - log.error("[validateOrderPaid][order({}) payOrder({}) 支付金额不匹配，请进行处理！order 数据是：{}，payOrder 数据是：{}]",
335   - id, payOrderId, JsonUtils.toJsonString(order), JsonUtils.toJsonString(payOrder));
  344 + log.error("[validatePayOrderPaid][order({}) payOrder({}) 支付金额不匹配，请进行处理！order 数据是：{}，payOrder 数据是：{}]",
  345 + order.getId(), payOrderId, JsonUtils.toJsonString(order), JsonUtils.toJsonString(payOrder));
336 346 throw exception(ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH);
337 347 }
338   - // 校验支付订单匹配（二次）
339   - if (ObjectUtil.notEqual(payOrder.getMerchantOrderId(), id.toString())) {
340   - log.error("[validateOrderPaid][order({}) 支付单不匹配({})，请进行处理！payOrder 数据是：{}]",
341   - id, payOrderId, JsonUtils.toJsonString(payOrder));
  348 + // 2.2 校验支付订单匹配（二次）
  349 + if (ObjectUtil.notEqual(payOrder.getMerchantOrderId(), order.getId().toString())) {
  350 + log.error("[validatePayOrderPaid][order({}) 支付单不匹配({})，请进行处理！payOrder 数据是：{}]",
  351 + order.getId(), payOrderId, JsonUtils.toJsonString(payOrder));
342 352 throw exception(ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR);
343 353 }
344   - return new KeyValue<>(order, payOrder);
  354 + return payOrder;
345 355 }
346 356  
347 357 @Override
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceService.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.trade.service.price;
2 2  
  3 +import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeProductSettlementRespVO;
3 4 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
4 5 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
5   -
6 6 import jakarta.validation.Valid;
7 7  
  8 +import java.util.List;
  9 +
8 10 /**
9 11 * 价格计算 Service 接口
10 12 *
... ... @@ -13,11 +15,20 @@ import jakarta.validation.Valid;
13 15 public interface TradePriceService {
14 16  
15 17 /**
16   - * 价格计算
  18 + * 【订单】价格计算
17 19 *
18 20 * @param calculateReqDTO 计算信息
19 21 * @return 计算结果
20 22 */
21   - TradePriceCalculateRespBO calculatePrice(@Valid TradePriceCalculateReqBO calculateReqDTO);
  23 + TradePriceCalculateRespBO calculateOrderPrice(@Valid TradePriceCalculateReqBO calculateReqDTO);
  24 +
  25 + /**
  26 + * 【商品】价格计算，用于商品列表、商品详情
  27 + *
  28 + * @param userId 用户编号，允许为空
  29 + * @param spuIds 商品 SPU 编号数组
  30 + * @return 计算结果
  31 + */
  32 + List<AppTradeProductSettlementRespVO> calculateProductPrice(Long userId, List<Long> spuIds);
22 33  
23 34 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImpl.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.trade.service.price;
2 2  
  3 +import cn.hutool.core.collection.CollUtil;
  4 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
  5 +import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
3 6 import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
4 7 import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
5 8 import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
6 9 import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
  10 +import cn.iocoder.yudao.module.promotion.api.discount.DiscountActivityApi;
  11 +import cn.iocoder.yudao.module.promotion.api.discount.dto.DiscountProductRespDTO;
  12 +import cn.iocoder.yudao.module.promotion.api.reward.RewardActivityApi;
  13 +import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
  14 +import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
  15 +import cn.iocoder.yudao.module.trade.controller.app.order.vo.AppTradeProductSettlementRespVO;
7 16 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
8 17 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
  18 +import cn.iocoder.yudao.module.trade.service.price.calculator.TradeDiscountActivityPriceCalculator;
9 19 import cn.iocoder.yudao.module.trade.service.price.calculator.TradePriceCalculator;
10 20 import cn.iocoder.yudao.module.trade.service.price.calculator.TradePriceCalculatorHelper;
  21 +import jakarta.annotation.Resource;
11 22 import lombok.extern.slf4j.Slf4j;
12 23 import org.springframework.stereotype.Service;
13 24 import org.springframework.validation.annotation.Validated;
14 25  
15   -import jakarta.annotation.Resource;
16 26 import java.util.List;
17 27 import java.util.Map;
18 28  
19 29 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
20   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
21   -import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  30 +import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
22 31 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_NOT_EXISTS;
23 32 import static cn.iocoder.yudao.module.product.enums.ErrorCodeConstants.SKU_STOCK_NOT_ENOUGH;
24 33 import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PRICE_CALCULATE_PAY_PRICE_ILLEGAL;
... ... @@ -37,12 +46,19 @@ public class TradePriceServiceImpl implements TradePriceService {
37 46 private ProductSkuApi productSkuApi;
38 47 @Resource
39 48 private ProductSpuApi productSpuApi;
  49 + @Resource
  50 + private DiscountActivityApi discountActivityApi;
  51 + @Resource
  52 + private RewardActivityApi rewardActivityApi;
40 53  
41 54 @Resource
42 55 private List<TradePriceCalculator> priceCalculators;
43 56  
  57 + @Resource
  58 + private TradeDiscountActivityPriceCalculator discountActivityPriceCalculator;
  59 +
44 60 @Override
45   - public TradePriceCalculateRespBO calculatePrice(TradePriceCalculateReqBO calculateReqBO) {
  61 + public TradePriceCalculateRespBO calculateOrderPrice(TradePriceCalculateReqBO calculateReqBO) {
46 62 // 1.1 获得商品 SKU 数组
47 63 List<ProductSkuRespDTO> skuList = checkSkuList(calculateReqBO);
48 64 // 1.2 获得商品 SPU 数组
... ... @@ -85,4 +101,55 @@ public class TradePriceServiceImpl implements TradePriceService {
85 101 return productSpuApi.validateSpuList(convertSet(skuList, ProductSkuRespDTO::getSpuId));
86 102 }
87 103  
  104 + @Override
  105 + public List<AppTradeProductSettlementRespVO> calculateProductPrice(Long userId, List<Long> spuIds) {
  106 + // 1.1 获得 SPU 与 SKU 的映射
  107 + List<ProductSkuRespDTO> allSkuList = productSkuApi.getSkuListBySpuId(spuIds);
  108 + Map<Long, List<ProductSkuRespDTO>> spuIdAndSkuListMap = convertMultiMap(allSkuList, ProductSkuRespDTO::getSpuId);
  109 + // 1.2 获得会员等级
  110 + MemberLevelRespDTO level = discountActivityPriceCalculator.getMemberLevel(userId);
  111 + // 1.3 获得限时折扣活动
  112 + Map<Long, DiscountProductRespDTO> skuIdAndDiscountMap = convertMap(
  113 + discountActivityApi.getMatchDiscountProductListBySkuIds(convertSet(allSkuList, ProductSkuRespDTO::getId)),
  114 + DiscountProductRespDTO::getSkuId);
  115 + // 1.4 获得满减送活动
  116 + List<RewardActivityMatchRespDTO> rewardActivityMap = rewardActivityApi.getMatchRewardActivityListBySpuIds(spuIds);
  117 +
  118 + // 2. 价格计算
  119 + return convertList(spuIds, spuId -> {
  120 + AppTradeProductSettlementRespVO spuVO = new AppTradeProductSettlementRespVO().setSpuId(spuId);
  121 + // 2.1 优惠价格
  122 + List<ProductSkuRespDTO> skuList = spuIdAndSkuListMap.get(spuId);
  123 + List<AppTradeProductSettlementRespVO.Sku> skuVOList = convertList(skuList, sku -> {
  124 + AppTradeProductSettlementRespVO.Sku skuVO = new AppTradeProductSettlementRespVO.Sku()
  125 + .setId(sku.getId()).setPromotionPrice(sku.getPrice());
  126 + TradePriceCalculateRespBO.OrderItem orderItem = new TradePriceCalculateRespBO.OrderItem()
  127 + .setPayPrice(sku.getPrice()).setCount(1);
  128 + // 计算限时折扣的优惠价格
  129 + DiscountProductRespDTO discountProduct = skuIdAndDiscountMap.get(sku.getId());
  130 + Integer discountPrice = discountActivityPriceCalculator.calculateActivityPrice(discountProduct, orderItem);
  131 + // 计算 VIP 优惠金额
  132 + Integer vipPrice = discountActivityPriceCalculator.calculateVipPrice(level, orderItem);
  133 + if (discountPrice <= 0 && vipPrice <= 0) {
  134 + return skuVO;
  135 + }
  136 + // 选择一个大的优惠
  137 + if (discountPrice > vipPrice) {
  138 + return skuVO.setPromotionPrice(sku.getPrice() - discountPrice)
  139 + .setPromotionType(PromotionTypeEnum.DISCOUNT_ACTIVITY.getType())
  140 + .setPromotionId(discountProduct.getId()).setPromotionEndTime(discountProduct.getActivityEndTime());
  141 + } else {
  142 + return skuVO.setPromotionPrice(sku.getPrice() - vipPrice)
  143 + .setPromotionType(PromotionTypeEnum.MEMBER_LEVEL.getType());
  144 + }
  145 + });
  146 + spuVO.setSkus(skuVOList);
  147 + // 2.2 满减送活动
  148 + RewardActivityMatchRespDTO rewardActivity = CollUtil.findOne(rewardActivityMap,
  149 + activity -> CollUtil.contains(activity.getSpuIds(), spuId));
  150 + spuVO.setRewardActivity(BeanUtils.toBean(rewardActivity, AppTradeProductSettlementRespVO.RewardActivity.class));
  151 + return spuVO;
  152 + });
  153 + }
  154 +
88 155 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculator.java
  View file @caf49aa
... ... @@ -122,9 +122,9 @@ public class TradeDeliveryPriceCalculator implements TradePriceCalculator {
122 122 */
123 123 private boolean isGlobalExpressFree(TradePriceCalculateRespBO result) {
124 124 TradeConfigDO config = tradeConfigService.getTradeConfig();
125   - return config != null
126   - && Boolean.TRUE.equals(config.getDeliveryExpressFreeEnabled()) // 开启包邮
127   - && result.getPrice().getPayPrice() >= config.getDeliveryExpressFreePrice(); // 满足包邮的价格
  125 + return config == null
  126 + || Boolean.TRUE.equals(config.getDeliveryExpressFreeEnabled()) // 开启包邮
  127 + || result.getPrice().getPayPrice() >= config.getDeliveryExpressFreePrice(); // 满足包邮的价格
128 128 }
129 129  
130 130 private void calculateDeliveryPrice(List<OrderItem> selectedSkus,
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculator.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.trade.service.price.calculator;
2 2  
3   -import cn.hutool.core.collection.CollUtil;
4 3 import cn.hutool.core.util.ObjectUtil;
5 4 import cn.hutool.core.util.StrUtil;
  5 +import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
  6 +import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
  7 +import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
  8 +import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
6 9 import cn.iocoder.yudao.module.promotion.api.discount.DiscountActivityApi;
7 10 import cn.iocoder.yudao.module.promotion.api.discount.dto.DiscountProductRespDTO;
8 11 import cn.iocoder.yudao.module.promotion.enums.common.PromotionDiscountTypeEnum;
... ... @@ -10,20 +13,23 @@ import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
10 13 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
11 14 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
12 15 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
  16 +import jakarta.annotation.Resource;
13 17 import org.springframework.core.annotation.Order;
14 18 import org.springframework.stereotype.Component;
15 19  
16   -import jakarta.annotation.Resource;
17 20 import java.util.List;
18 21 import java.util.Map;
19 22  
20 23 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
21 24 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
  25 +import static cn.iocoder.yudao.framework.common.util.number.MoneyUtils.calculateRatePrice;
22 26 import static cn.iocoder.yudao.module.trade.service.price.calculator.TradePriceCalculatorHelper.formatPrice;
23 27  
24 28 /**
25 29 * 限时折扣的 {@link TradePriceCalculator} 实现类
26 30 *
  31 + * 由于“会员折扣”和“限时折扣”是冲突，需要选择优惠金额多的，所以也放在这里计算
  32 + *
27 33 * @author 芋道源码
28 34 */
29 35 @Component
... ... @@ -32,6 +38,10 @@ public class TradeDiscountActivityPriceCalculator implements TradePriceCalculato
32 38  
33 39 @Resource
34 40 private DiscountActivityApi discountActivityApi;
  41 + @Resource
  42 + private MemberLevelApi memberLevelApi;
  43 + @Resource
  44 + private MemberUserApi memberUserApi;
35 45  
36 46 @Override
37 47 public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
... ... @@ -39,51 +49,103 @@ public class TradeDiscountActivityPriceCalculator implements TradePriceCalculato
39 49 if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
40 50 return;
41 51 }
42   - // 获得 SKU 对应的限时折扣活动
43   - List<DiscountProductRespDTO> discountProducts = discountActivityApi.getMatchDiscountProductList(
  52 +
  53 + // 1.1 获得 SKU 对应的限时折扣活动
  54 + List<DiscountProductRespDTO> discountProducts = discountActivityApi.getMatchDiscountProductListBySkuIds(
44 55 convertSet(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSkuId));
45   - if (CollUtil.isEmpty(discountProducts)) {
46   - return;
47   - }
48 56 Map<Long, DiscountProductRespDTO> discountProductMap = convertMap(discountProducts, DiscountProductRespDTO::getSkuId);
  57 + // 1.2 获得会员等级
  58 + MemberLevelRespDTO level = getMemberLevel(param.getUserId());
49 59  
50   - // 处理每个 SKU 的限时折扣
  60 + // 2. 计算每个 SKU 的优惠金额
51 61 result.getItems().forEach(orderItem -> {
52   - // 1. 获取该 SKU 的优惠信息
  62 + if (!orderItem.getSelected()) {
  63 + return;
  64 + }
  65 + // 2.1 计算限时折扣的优惠金额
53 66 DiscountProductRespDTO discountProduct = discountProductMap.get(orderItem.getSkuId());
54   - if (discountProduct == null) {
  67 + Integer discountPrice = calculateActivityPrice(discountProduct, orderItem);
  68 + // 2.2 计算 VIP 优惠金额
  69 + Integer vipPrice = calculateVipPrice(level, orderItem);
  70 + if (discountPrice <= 0 && vipPrice <= 0) {
55 71 return;
56 72 }
57   - // 2. 计算优惠金额
58   - Integer newPayPrice = calculatePayPrice(discountProduct, orderItem);
59   - Integer newDiscountPrice = orderItem.getPayPrice() - newPayPrice;
60 73  
61   - // 3.1 记录优惠明细
62   - if (orderItem.getSelected()) {
63   - // 注意，只有在选中的情况下，才会记录到优惠明细。否则仅仅是更新 SKU 优惠金额，用于展示
  74 + // 3. 选择优惠金额多的
  75 + if (discountPrice > vipPrice) {
64 76 TradePriceCalculatorHelper.addPromotion(result, orderItem,
65 77 discountProduct.getActivityId(), discountProduct.getActivityName(), PromotionTypeEnum.DISCOUNT_ACTIVITY.getType(),
66   - StrUtil.format("限时折扣：省 {} 元", formatPrice(newDiscountPrice)),
67   - newDiscountPrice);
  78 + StrUtil.format("限时折扣：省 {} 元", formatPrice(discountPrice)),
  79 + discountPrice);
  80 + // 更新 SKU 优惠金额
  81 + orderItem.setDiscountPrice(orderItem.getDiscountPrice() + discountPrice);
  82 + } else {
  83 + assert level != null;
  84 + TradePriceCalculatorHelper.addPromotion(result, orderItem,
  85 + level.getId(), level.getName(), PromotionTypeEnum.MEMBER_LEVEL.getType(),
  86 + String.format("会员等级折扣：省 %s 元", formatPrice(vipPrice)),
  87 + vipPrice);
  88 + // 更新 SKU 的优惠金额
  89 + orderItem.setVipPrice(vipPrice);
68 90 }
69   - // 3.2 更新 SKU 优惠金额
70   - orderItem.setDiscountPrice(orderItem.getDiscountPrice() + newDiscountPrice);
  91 +
  92 + // 4. 分摊优惠
71 93 TradePriceCalculatorHelper.recountPayPrice(orderItem);
  94 + TradePriceCalculatorHelper.recountAllPrice(result);
72 95 });
73   - TradePriceCalculatorHelper.recountAllPrice(result);
74 96 }
75 97  
76   - private Integer calculatePayPrice(DiscountProductRespDTO discountProduct,
77   - TradePriceCalculateRespBO.OrderItem orderItem) {
78   - Integer price = orderItem.getPayPrice();
79   - if (PromotionDiscountTypeEnum.PRICE.getType().equals(discountProduct.getDiscountType())) { // 减价
80   - price -= discountProduct.getDiscountPrice() * orderItem.getCount();
81   - } else if (PromotionDiscountTypeEnum.PERCENT.getType().equals(discountProduct.getDiscountType())) { // 打折
82   - price = price * discountProduct.getDiscountPercent() / 100;
  98 + /**
  99 + * 获得用户的等级
  100 + *
  101 + * @param userId 用户编号
  102 + * @return 用户等级
  103 + */
  104 + public MemberLevelRespDTO getMemberLevel(Long userId) {
  105 + MemberUserRespDTO user = memberUserApi.getUser(userId);
  106 + if (user == null || user.getLevelId() == null || user.getLevelId() <= 0) {
  107 + return null;
  108 + }
  109 + return memberLevelApi.getMemberLevel(user.getLevelId());
  110 + }
  111 +
  112 + /**
  113 + * 计算优惠活动的价格
  114 + *
  115 + * @param discount 优惠活动
  116 + * @param orderItem 交易项
  117 + * @return 优惠价格
  118 + */
  119 + public Integer calculateActivityPrice(DiscountProductRespDTO discount,
  120 + TradePriceCalculateRespBO.OrderItem orderItem) {
  121 + if (discount == null) {
  122 + return 0;
  123 + }
  124 + Integer newPrice = orderItem.getPayPrice();
  125 + if (PromotionDiscountTypeEnum.PRICE.getType().equals(discount.getDiscountType())) { // 减价
  126 + newPrice -= discount.getDiscountPrice() * orderItem.getCount();
  127 + } else if (PromotionDiscountTypeEnum.PERCENT.getType().equals(discount.getDiscountType())) { // 打折
  128 + newPrice = calculateRatePrice(orderItem.getPayPrice(), discount.getDiscountPercent() / 100.0);
83 129 } else {
84   - throw new IllegalArgumentException(String.format("优惠活动的商品(%s) 的优惠类型不正确", discountProduct));
  130 + throw new IllegalArgumentException(String.format("优惠活动的商品(%s) 的优惠类型不正确", discount));
  131 + }
  132 + return orderItem.getPayPrice() - newPrice;
  133 + }
  134 +
  135 + /**
  136 + * 计算会员 VIP 的优惠价格
  137 + *
  138 + * @param level 会员等级
  139 + * @param orderItem 交易项
  140 + * @return 优惠价格
  141 + */
  142 + public Integer calculateVipPrice(MemberLevelRespDTO level,
  143 + TradePriceCalculateRespBO.OrderItem orderItem) {
  144 + if (level == null || level.getDiscountPercent() == null) {
  145 + return 0;
85 146 }
86   - return price;
  147 + Integer newPrice = calculateRatePrice(orderItem.getPayPrice(), level.getDiscountPercent().doubleValue());
  148 + return orderItem.getPayPrice() - newPrice;
87 149 }
88 150  
89 151 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculator.java deleted
View file @3278d38
1   -package cn.iocoder.yudao.module.trade.service.price.calculator;
2   -
3   -import cn.hutool.core.util.ObjectUtil;
4   -import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
5   -import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
6   -import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
7   -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
8   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
9   -import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
10   -import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
11   -import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
12   -import org.springframework.core.annotation.Order;
13   -import org.springframework.stereotype.Component;
14   -
15   -import jakarta.annotation.Resource;
16   -
17   -import static cn.iocoder.yudao.module.trade.service.price.calculator.TradePriceCalculatorHelper.formatPrice;
18   -
19   -/**
20   - * 会员 VIP 折扣的 {@link TradePriceCalculator} 实现类
21   - *
22   - * @author 芋道源码
23   - */
24   -@Component
25   -@Order(TradePriceCalculator.ORDER_MEMBER_LEVEL)
26   -public class TradeMemberLevelPriceCalculator implements TradePriceCalculator {
27   -
28   - @Resource
29   - private MemberLevelApi memberLevelApi;
30   - @Resource
31   - private MemberUserApi memberUserApi;
32   -
33   - @Override
34   - public void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result) {
35   - // 0. 只有【普通】订单，才计算该优惠
36   - if (ObjectUtil.notEqual(result.getType(), TradeOrderTypeEnum.NORMAL.getType())) {
37   - return;
38   - }
39   - // 1. 获得用户的会员等级
40   - MemberUserRespDTO user = memberUserApi.getUser(param.getUserId());
41   - if (user.getLevelId() == null || user.getLevelId() <= 0) {
42   - return;
43   - }
44   - MemberLevelRespDTO level = memberLevelApi.getMemberLevel(user.getLevelId());
45   - if (level == null || level.getDiscountPercent() == null) {
46   - return;
47   - }
48   -
49   - // 2. 计算每个 SKU 的优惠金额
50   - result.getItems().forEach(orderItem -> {
51   - // 2.1 计算优惠金额
52   - Integer vipPrice = calculateVipPrice(orderItem.getPayPrice(), level.getDiscountPercent());
53   - if (vipPrice <= 0) {
54   - return;
55   - }
56   -
57   - // 2.2 记录优惠明细
58   - if (orderItem.getSelected()) {
59   - // 注意，只有在选中的情况下，才会记录到优惠明细。否则仅仅是更新 SKU 优惠金额，用于展示
60   - TradePriceCalculatorHelper.addPromotion(result, orderItem,
61   - level.getId(), level.getName(), PromotionTypeEnum.MEMBER_LEVEL.getType(),
62   - String.format("会员等级折扣：省 %s 元", formatPrice(vipPrice)),
63   - vipPrice);
64   - }
65   -
66   - // 2.3 更新 SKU 的优惠金额
67   - orderItem.setVipPrice(vipPrice);
68   - TradePriceCalculatorHelper.recountPayPrice(orderItem);
69   - });
70   - TradePriceCalculatorHelper.recountAllPrice(result);
71   - }
72   -
73   - /**
74   - * 计算会员 VIP 优惠价格
75   - *
76   - * @param price 原价
77   - * @param discountPercent 折扣
78   - * @return 优惠价格
79   - */
80   - public Integer calculateVipPrice(Integer price, Integer discountPercent) {
81   - if (discountPercent == null) {
82   - return 0;
83   - }
84   - Integer newPrice = price * discountPercent / 100;
85   - return price - newPrice;
86   - }
87   -
88   -}
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePriceCalculator.java
  View file @caf49aa
... ... @@ -13,8 +13,6 @@ import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
13 13 */
14 14 public interface TradePriceCalculator {
15 15  
16   - int ORDER_MEMBER_LEVEL = 5;
17   -
18 16 int ORDER_SECKILL_ACTIVITY = 8;
19 17 int ORDER_BARGAIN_ACTIVITY = 8;
20 18 int ORDER_COMBINATION_ACTIVITY = 8;
... ...
yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculator.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.trade.service.price.calculator;
2 2  
3 3 import cn.hutool.core.collection.CollUtil;
4   -import cn.hutool.core.collection.ListUtil;
5 4 import cn.hutool.core.util.ObjectUtil;
6 5 import cn.hutool.core.util.StrUtil;
7   -import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
8 6 import cn.iocoder.yudao.module.promotion.api.reward.RewardActivityApi;
9 7 import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
10 8 import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
11   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
12 9 import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
13 10 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
14 11 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
... ... @@ -17,8 +14,6 @@ import jakarta.annotation.Resource;
17 14 import org.springframework.core.annotation.Order;
18 15 import org.springframework.stereotype.Component;
19 16  
20   -import java.util.ArrayList;
21   -import java.util.Comparator;
22 17 import java.util.List;
23 18 import java.util.Map;
24 19  
... ... @@ -47,14 +42,15 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
47 42 return;
48 43 }
49 44 // 获得 SKU 对应的满减送活动
50   - List<RewardActivityMatchRespDTO> rewardActivities = rewardActivityApi.getMatchRewardActivityList(
  45 + List<RewardActivityMatchRespDTO> rewardActivities = rewardActivityApi.getMatchRewardActivityListBySpuIds(
51 46 convertSet(result.getItems(), TradePriceCalculateRespBO.OrderItem::getSpuId));
52 47 if (CollUtil.isEmpty(rewardActivities)) {
53 48 return;
54 49 }
55   -
56   - // 处理每个满减送活动
57   - rewardActivities.forEach(rewardActivity -> calculate(param, result, rewardActivity));
  50 + // 处理最新的满减送活动
  51 + if (!rewardActivities.isEmpty()) {
  52 + calculate(param, result, rewardActivities.get(0));
  53 + }
58 54 }
59 55  
60 56 private void calculate(TradePriceCalculateReqBO param, TradePriceCalculateRespBO result,
... ... @@ -69,7 +65,7 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
69 65 if (rule == null) {
70 66 TradePriceCalculatorHelper.addNotMatchPromotion(result, orderItems,
71 67 rewardActivity.getId(), rewardActivity.getName(), PromotionTypeEnum.REWARD_ACTIVITY.getType(),
72   - getRewardActivityNotMeetTip(rewardActivity, orderItems));
  68 + "满减送：" + rewardActivity.getRules().get(0).getDescription());
73 69 return;
74 70 }
75 71  
... ... @@ -77,6 +73,10 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
77 73 Integer newDiscountPrice = rule.getDiscountPrice();
78 74 // 2.2 计算分摊的优惠金额
79 75 List<Integer> divideDiscountPrices = TradePriceCalculatorHelper.dividePrice(orderItems, newDiscountPrice);
  76 + // 2.3 计算是否包邮
  77 + if (Boolean.TRUE.equals(rule.getFreeDelivery())) {
  78 + result.setFreeDelivery(true);
  79 + }
80 80  
81 81 // 3.1 记录使用的优惠劵
82 82 result.setCouponId(param.getCouponId());
... ... @@ -110,16 +110,8 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
110 110 // 4.3 记录赠送的优惠券
111 111 if (CollUtil.isNotEmpty(rule.getGiveCouponTemplateCounts())) {
112 112 for (Map.Entry<Long, Integer> entry : rule.getGiveCouponTemplateCounts().entrySet()) {
113   - Map<Long, Integer> giveCouponTemplateCounts = result.getGiveCouponTemplateCounts();
114   - // TODO @puhui999：是不是有一种可能性，这个 key 没有，别的 key 有哈。
115   - // TODO 这里还有一种简化的写法。就是下面，大概两行就可以啦
116   -// result.getGiveCouponTemplateCounts().put(entry.getKey(),
117   -// result.getGiveCouponTemplateCounts().getOrDefault(entry.getKey(), 0) + entry.getValue());
118   - if (giveCouponTemplateCounts.get(entry.getKey()) == null) { // 情况一：还没有赠送的优惠券
119   - result.setGiveCouponTemplateCounts(rule.getGiveCouponTemplateCounts());
120   - } else { // 情况二：别的满减活动送过同类优惠券，则直接增加数量
121   - giveCouponTemplateCounts.put(entry.getKey(), giveCouponTemplateCounts.get(entry.getKey()) + entry.getValue());
122   - }
  113 + result.getGiveCouponTemplateCounts().put(entry.getKey(),
  114 + result.getGiveCouponTemplateCounts().getOrDefault(entry.getKey(), 0) + entry.getValue());
123 115 }
124 116 }
125 117 }
... ... @@ -133,28 +125,14 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
133 125 */
134 126 private List<TradePriceCalculateRespBO.OrderItem> filterMatchActivityOrderItems(TradePriceCalculateRespBO result,
135 127 RewardActivityMatchRespDTO rewardActivity) {
136   - // 情况一：全部商品都可以参与
137   - if (PromotionProductScopeEnum.isAll(rewardActivity.getProductScope())) {
138   - return result.getItems();
139   - }
140   - // 情况二：指定商品参与
141   - if (PromotionProductScopeEnum.isSpu(rewardActivity.getProductScope())) {
142   - return filterList(result.getItems(),
143   - orderItem -> CollUtil.contains(rewardActivity.getProductScopeValues(), orderItem.getSpuId()));
144   - }
145   - // 情况三：指定商品类型参与
146   - if (PromotionProductScopeEnum.isCategory(rewardActivity.getProductScope())) {
147   - return filterList(result.getItems(),
148   - orderItem -> CollUtil.contains(rewardActivity.getProductScopeValues(), orderItem.getCategoryId()));
149   - }
150   - return ListUtil.of();
  128 + return filterList(result.getItems(), orderItem -> CollUtil.contains(rewardActivity.getSpuIds(), orderItem.getSpuId()));
151 129 }
152 130  
153 131 /**
154 132 * 获得最大匹配的满减送活动的规则
155 133 *
156 134 * @param rewardActivity 满减送活动
157   - * @param orderItems 商品项
  135 + * @param orderItems 商品项
158 136 * @return 匹配的活动规则
159 137 */
160 138 private RewardActivityMatchRespDTO.Rule getMaxMatchRewardActivityRule(RewardActivityMatchRespDTO rewardActivity,
... ... @@ -179,31 +157,4 @@ public class TradeRewardActivityPriceCalculator implements TradePriceCalculator
179 157 return null;
180 158 }
181 159  
182   - /**
183   - * 获得满减送活动不匹配时的提示
184   - *
185   - * @param rewardActivity 满减送活动
186   - * @return 提示
187   - */
188   - private String getRewardActivityNotMeetTip(RewardActivityMatchRespDTO rewardActivity,
189   - List<TradePriceCalculateRespBO.OrderItem> orderItems) {
190   - // 1. 计算数量和价格
191   - Integer count = TradePriceCalculatorHelper.calculateTotalCount(orderItems);
192   - Integer price = TradePriceCalculatorHelper.calculateTotalPayPrice(orderItems);
193   - assert count != null && price != null;
194   -
195   - // 2. 构建不满足时的提示信息：按最低档规则算
196   - String meetTip = "满减送：购满 {} {}，可以减 {} 元";
197   - List<RewardActivityMatchRespDTO.Rule> rules = new ArrayList<>(rewardActivity.getRules());
198   - rules.sort(Comparator.comparing(RewardActivityMatchRespDTO.Rule::getLimit)); // 按优惠门槛升序
199   - RewardActivityMatchRespDTO.Rule rule = rules.get(0);
200   - if (PromotionConditionTypeEnum.PRICE.getType().equals(rewardActivity.getConditionType())) {
201   - return StrUtil.format(meetTip, rule.getLimit(), "元", MoneyUtils.fenToYuanStr(rule.getDiscountPrice()));
202   - }
203   - if (PromotionConditionTypeEnum.COUNT.getType().equals(rewardActivity.getConditionType())) {
204   - return StrUtil.format(meetTip, rule.getLimit(), "件", MoneyUtils.fenToYuanStr(rule.getDiscountPrice()));
205   - }
206   - return StrUtil.EMPTY;
207   - }
208   -
209 160 }
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/TradePriceServiceImplTest.java
  View file @caf49aa
... ... @@ -72,7 +72,7 @@ public class TradePriceServiceImplTest extends BaseMockitoUnitTest {
72 72 .setStatus(ProductSpuStatusEnum.ENABLE.getStatus())));
73 73  
74 74 // 调用
75   - TradePriceCalculateRespBO calculateRespBO = tradePriceService.calculatePrice(calculateReqBO);
  75 + TradePriceCalculateRespBO calculateRespBO = tradePriceService.calculateOrderPrice(calculateReqBO);
76 76 // 断言
77 77 assertEquals(TradeOrderTypeEnum.NORMAL.getType(), calculateRespBO.getType());
78 78 assertEquals(0, calculateRespBO.getPromotions().size());
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeCouponPriceCalculatorTest.java
  View file @caf49aa
... ... @@ -11,6 +11,7 @@ import cn.iocoder.yudao.module.promotion.enums.coupon.CouponStatusEnum;
11 11 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
12 12 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
13 13 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
  14 +import org.junit.jupiter.api.Disabled;
14 15 import org.junit.jupiter.api.Test;
15 16 import org.mockito.InjectMocks;
16 17 import org.mockito.Mock;
... ... @@ -31,6 +32,7 @@ import static org.mockito.Mockito.when;
31 32 *
32 33 * @author 芋道源码
33 34 */
  35 +@Disabled // TODO 芋艿：后续修复
34 36 public class TradeCouponPriceCalculatorTest extends BaseMockitoUnitTest {
35 37  
36 38 @InjectMocks
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDeliveryPriceCalculatorTest.java
  View file @caf49aa
... ... @@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.trade.service.delivery.bo.DeliveryExpressTemplate
13 13 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
14 14 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
15 15 import org.junit.jupiter.api.BeforeEach;
  16 +import org.junit.jupiter.api.Disabled;
16 17 import org.junit.jupiter.api.DisplayName;
17 18 import org.junit.jupiter.api.Test;
18 19 import org.mockito.InjectMocks;
... ... @@ -32,6 +33,7 @@ import static org.mockito.Mockito.when;
32 33 *
33 34 * @author jason
34 35 */
  36 +@Disabled // TODO 芋艿：后续修复
35 37 public class TradeDeliveryPriceCalculatorTest extends BaseMockitoUnitTest {
36 38  
37 39 @InjectMocks
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeDiscountActivityPriceCalculatorTest.java
  View file @caf49aa
... ... @@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
8 8 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
9 9 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
10 10 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
  11 +import org.junit.jupiter.api.Disabled;
11 12 import org.junit.jupiter.api.Test;
12 13 import org.mockito.InjectMocks;
13 14 import org.mockito.Mock;
... ... @@ -26,6 +27,7 @@ import static org.mockito.Mockito.when;
26 27 *
27 28 * @author 芋道源码
28 29 */
  30 +@Disabled // TODO 芋艿：后续修复
29 31 public class TradeDiscountActivityPriceCalculatorTest extends BaseMockitoUnitTest {
30 32  
31 33 @InjectMocks
... ... @@ -57,7 +59,7 @@ public class TradeDiscountActivityPriceCalculatorTest extends BaseMockitoUnitTes
57 59 TradePriceCalculatorHelper.recountAllPrice(result);
58 60  
59 61 // mock 方法（限时折扣活动）
60   - when(discountActivityApi.getMatchDiscountProductList(eq(asSet(10L, 20L)))).thenReturn(asList(
  62 + when(discountActivityApi.getMatchDiscountProductListBySkuIds(eq(asSet(10L, 20L)))).thenReturn(asList(
61 63 randomPojo(DiscountProductRespDTO.class, o -> o.setActivityId(1000L)
62 64 .setActivityName("活动 1000 号").setSkuId(10L)
63 65 .setDiscountType(PromotionDiscountTypeEnum.PRICE.getType()).setDiscountPrice(40)),
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeMemberLevelPriceCalculatorTest.java deleted
View file @3278d38
1   -package cn.iocoder.yudao.module.trade.service.price.calculator;
2   -
3   -import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
4   -import cn.iocoder.yudao.module.member.api.level.MemberLevelApi;
5   -import cn.iocoder.yudao.module.member.api.level.dto.MemberLevelRespDTO;
6   -import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
7   -import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
8   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
9   -import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
10   -import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
11   -import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
12   -import org.junit.jupiter.api.Test;
13   -import org.mockito.InjectMocks;
14   -import org.mockito.Mock;
15   -
16   -import java.util.ArrayList;
17   -
18   -import static java.util.Arrays.asList;
19   -import static org.junit.jupiter.api.Assertions.*;
20   -import static org.mockito.ArgumentMatchers.eq;
21   -import static org.mockito.Mockito.when;
22   -
23   -/**
24   - * {@link TradeMemberLevelPriceCalculator} 的单元测试类
25   - *
26   - * @author 芋道源码
27   - */
28   -public class TradeMemberLevelPriceCalculatorTest extends BaseMockitoUnitTest {
29   -
30   - @InjectMocks
31   - private TradeMemberLevelPriceCalculator memberLevelPriceCalculator;
32   -
33   - @Mock
34   - private MemberLevelApi memberLevelApi;
35   - @Mock
36   - private MemberUserApi memberUserApi;
37   -
38   - @Test
39   - public void testCalculate() {
40   - // 准备参数
41   - TradePriceCalculateReqBO param = new TradePriceCalculateReqBO()
42   - .setUserId(1024L)
43   - .setItems(asList(
44   - new TradePriceCalculateReqBO.Item().setSkuId(10L).setCount(2).setSelected(true), // 匹配活动，且已选中
45   - new TradePriceCalculateReqBO.Item().setSkuId(20L).setCount(3).setSelected(false) // 匹配活动，但未选中
46   - ));
47   - TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
48   - .setType(TradeOrderTypeEnum.NORMAL.getType())
49   - .setPrice(new TradePriceCalculateRespBO.Price())
50   - .setPromotions(new ArrayList<>())
51   - .setItems(asList(
52   - new TradePriceCalculateRespBO.OrderItem().setSkuId(10L).setCount(2).setSelected(true)
53   - .setPrice(100),
54   - new TradePriceCalculateRespBO.OrderItem().setSkuId(20L).setCount(3).setSelected(false)
55   - .setPrice(50)
56   - ));
57   - // 保证价格被初始化上
58   - TradePriceCalculatorHelper.recountPayPrice(result.getItems());
59   - TradePriceCalculatorHelper.recountAllPrice(result);
60   -
61   - // mock 方法（会员等级）
62   - when(memberUserApi.getUser(eq(1024L))).thenReturn(new MemberUserRespDTO().setLevelId(2048L));
63   - when(memberLevelApi.getMemberLevel(eq(2048L))).thenReturn(
64   - new MemberLevelRespDTO().setId(2048L).setName("VIP 会员").setDiscountPercent(60));
65   -
66   - // 调用
67   - memberLevelPriceCalculator.calculate(param, result);
68   - // 断言：Price 部分
69   - TradePriceCalculateRespBO.Price price = result.getPrice();
70   - assertEquals(price.getTotalPrice(), 200);
71   - assertEquals(price.getDiscountPrice(), 0);
72   - assertEquals(price.getPointPrice(), 0);
73   - assertEquals(price.getDeliveryPrice(), 0);
74   - assertEquals(price.getCouponPrice(), 0);
75   - assertEquals(price.getVipPrice(), 80);
76   - assertEquals(price.getPayPrice(), 120);
77   - assertNull(result.getCouponId());
78   - // 断言：SKU 1
79   - assertEquals(result.getItems().size(), 2);
80   - TradePriceCalculateRespBO.OrderItem orderItem01 = result.getItems().get(0);
81   - assertEquals(orderItem01.getSkuId(), 10L);
82   - assertEquals(orderItem01.getCount(), 2);
83   - assertEquals(orderItem01.getPrice(), 100);
84   - assertEquals(orderItem01.getDiscountPrice(), 0);
85   - assertEquals(orderItem01.getDeliveryPrice(), 0);
86   - assertEquals(orderItem01.getCouponPrice(), 0);
87   - assertEquals(orderItem01.getPointPrice(), 0);
88   - assertEquals(orderItem01.getVipPrice(), 80);
89   - assertEquals(orderItem01.getPayPrice(), 120);
90   - // 断言：SKU 2
91   - TradePriceCalculateRespBO.OrderItem orderItem02 = result.getItems().get(1);
92   - assertEquals(orderItem02.getSkuId(), 20L);
93   - assertEquals(orderItem02.getCount(), 3);
94   - assertEquals(orderItem02.getPrice(), 50);
95   - assertEquals(orderItem02.getDiscountPrice(), 0);
96   - assertEquals(orderItem02.getDeliveryPrice(), 0);
97   - assertEquals(orderItem02.getCouponPrice(), 0);
98   - assertEquals(orderItem02.getPointPrice(), 0);
99   - assertEquals(orderItem02.getVipPrice(), 60);
100   - assertEquals(orderItem02.getPayPrice(), 90);
101   - // 断言：Promotion 部分
102   - assertEquals(result.getPromotions().size(), 1);
103   - TradePriceCalculateRespBO.Promotion promotion01 = result.getPromotions().get(0);
104   - assertEquals(promotion01.getId(), 2048L);
105   - assertEquals(promotion01.getName(), "VIP 会员");
106   - assertEquals(promotion01.getType(), PromotionTypeEnum.MEMBER_LEVEL.getType());
107   - assertEquals(promotion01.getTotalPrice(), 200);
108   - assertEquals(promotion01.getDiscountPrice(), 80);
109   - assertTrue(promotion01.getMatch());
110   - assertEquals(promotion01.getDescription(), "会员等级折扣：省 0.80 元");
111   - TradePriceCalculateRespBO.PromotionItem promotionItem01 = promotion01.getItems().get(0);
112   - assertEquals(promotion01.getItems().size(), 1);
113   - assertEquals(promotionItem01.getSkuId(), 10L);
114   - assertEquals(promotionItem01.getTotalPrice(), 200);
115   - assertEquals(promotionItem01.getDiscountPrice(), 80);
116   - }
117   -
118   -}
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradePointUsePriceCalculatorTest.java
  View file @caf49aa
... ... @@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
9 9 import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
10 10 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
11 11 import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
  12 +import org.junit.jupiter.api.Disabled;
12 13 import org.junit.jupiter.api.Test;
13 14 import org.mockito.InjectMocks;
14 15 import org.mockito.Mock;
... ... @@ -27,6 +28,7 @@ import static org.mockito.Mockito.when;
27 28 *
28 29 * @author owen
29 30 */
  31 +@Disabled // TODO 芋艿：后续修复
30 32 public class TradePointUsePriceCalculatorTest extends BaseMockitoUnitTest {
31 33  
32 34 @InjectMocks
... ...
yudao-module-mall/yudao-module-trade-biz/src/test/java/cn/iocoder/yudao/module/trade/service/price/calculator/TradeRewardActivityPriceCalculatorTest.java
  View file @caf49aa
... ... @@ -2,28 +2,10 @@ package cn.iocoder.yudao.module.trade.service.price.calculator;
2 2  
3 3 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
4 4 import cn.iocoder.yudao.module.promotion.api.reward.RewardActivityApi;
5   -import cn.iocoder.yudao.module.promotion.api.reward.dto.RewardActivityMatchRespDTO;
6   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
7   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
8   -import cn.iocoder.yudao.module.promotion.enums.common.PromotionTypeEnum;
9   -import cn.iocoder.yudao.module.trade.enums.order.TradeOrderTypeEnum;
10   -import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateReqBO;
11   -import cn.iocoder.yudao.module.trade.service.price.bo.TradePriceCalculateRespBO;
12   -import org.junit.jupiter.api.Test;
13 5 import org.mockito.InjectMocks;
14 6 import org.mockito.Mock;
15 7  
16   -import java.util.ArrayList;
17   -import java.util.LinkedHashMap;
18   -
19   -import static cn.iocoder.yudao.framework.common.util.collection.SetUtils.asSet;
20   -import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
21   -import static java.util.Arrays.asList;
22   -import static java.util.Collections.singletonList;
23   -import static org.junit.jupiter.api.Assertions.*;
24   -import static org.mockito.ArgumentMatchers.eq;
25   -import static org.mockito.Mockito.when;
26   -
  8 +// TODO 芋艿：后续在修复
27 9 /**
28 10 * {@link TradeRewardActivityPriceCalculator} 的单元测试类
29 11 *
... ... @@ -37,210 +19,212 @@ public class TradeRewardActivityPriceCalculatorTest extends BaseMockitoUnitTest
37 19 @Mock
38 20 private RewardActivityApi rewardActivityApi;
39 21  
40   - @Test
41   - public void testCalculate_match() {
42   - // 准备参数
43   - TradePriceCalculateReqBO param = new TradePriceCalculateReqBO()
44   - .setItems(asList(
45   - new TradePriceCalculateReqBO.Item().setSkuId(10L).setCount(2).setSelected(true), // 匹配活动 1
46   - new TradePriceCalculateReqBO.Item().setSkuId(20L).setCount(3).setSelected(true), // 匹配活动 1
47   - new TradePriceCalculateReqBO.Item().setSkuId(30L).setCount(4).setSelected(true) // 匹配活动 2
48   - ));
49   - TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
50   - .setType(TradeOrderTypeEnum.NORMAL.getType())
51   - .setPrice(new TradePriceCalculateRespBO.Price())
52   - .setPromotions(new ArrayList<>()).setGiveCouponTemplateCounts(new LinkedHashMap<>())
53   - .setItems(asList(
54   - new TradePriceCalculateRespBO.OrderItem().setSkuId(10L).setCount(2).setSelected(true)
55   - .setPrice(100).setSpuId(1L),
56   - new TradePriceCalculateRespBO.OrderItem().setSkuId(20L).setCount(3).setSelected(true)
57   - .setPrice(50).setSpuId(2L),
58   - new TradePriceCalculateRespBO.OrderItem().setSkuId(30L).setCount(4).setSelected(true)
59   - .setPrice(30).setSpuId(3L)
60   - ));
61   - // 保证价格被初始化上
62   - TradePriceCalculatorHelper.recountPayPrice(result.getItems());
63   - TradePriceCalculatorHelper.recountAllPrice(result);
64   -
65   - // mock 方法（满减送 RewardActivity 信息）
66   - when(rewardActivityApi.getMatchRewardActivityList(eq(asSet(1L, 2L, 3L)))).thenReturn(asList(
67   - randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(1000L).setName("活动 1000 号")
68   - .setConditionType(PromotionConditionTypeEnum.PRICE.getType())
69   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L))
70   - .setRules(singletonList(new RewardActivityMatchRespDTO.Rule().setLimit(20).setDiscountPrice(70)
71   - .setFreeDelivery(false)))),
72   - randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(2000L).setName("活动 2000 号")
73   - .setConditionType(PromotionConditionTypeEnum.COUNT.getType())
74   - .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(singletonList(3L))
75   - .setRules(asList(new RewardActivityMatchRespDTO.Rule().setLimit(1).setDiscountPrice(10)
76   - .setPoint(50).setFreeDelivery(false),
77   - new RewardActivityMatchRespDTO.Rule().setLimit(2).setDiscountPrice(60)
78   - .setPoint(100).setFreeDelivery(false), // 最大可满足，因为是 4 个
79   - new RewardActivityMatchRespDTO.Rule().setLimit(10).setDiscountPrice(100)
80   - .setFreeDelivery(false))))
81   - ));
82   -
83   - // 调用
84   - tradeRewardActivityPriceCalculator.calculate(param, result);
85   - // 断言 Order 部分
86   - TradePriceCalculateRespBO.Price price = result.getPrice();
87   - assertEquals(price.getTotalPrice(), 470);
88   - assertEquals(price.getDiscountPrice(), 130);
89   - assertEquals(price.getPointPrice(), 0);
90   - assertEquals(price.getDeliveryPrice(), 0);
91   - assertEquals(price.getCouponPrice(), 0);
92   - assertEquals(price.getPayPrice(), 340);
93   - assertNull(result.getCouponId());
94   - // 断言：SKU 1
95   - assertEquals(result.getItems().size(), 3);
96   - TradePriceCalculateRespBO.OrderItem orderItem01 = result.getItems().get(0);
97   - assertEquals(orderItem01.getSkuId(), 10L);
98   - assertEquals(orderItem01.getCount(), 2);
99   - assertEquals(orderItem01.getPrice(), 100);
100   - assertEquals(orderItem01.getDiscountPrice(), 40);
101   - assertEquals(orderItem01.getDeliveryPrice(), 0);
102   - assertEquals(orderItem01.getCouponPrice(), 0);
103   - assertEquals(orderItem01.getPointPrice(), 0);
104   - assertEquals(orderItem01.getPayPrice(), 160);
105   - assertEquals(orderItem01.getGivePoint(), 0);
106   - // 断言：SKU 2
107   - TradePriceCalculateRespBO.OrderItem orderItem02 = result.getItems().get(1);
108   - assertEquals(orderItem02.getSkuId(), 20L);
109   - assertEquals(orderItem02.getCount(), 3);
110   - assertEquals(orderItem02.getPrice(), 50);
111   - assertEquals(orderItem02.getDiscountPrice(), 30);
112   - assertEquals(orderItem02.getDeliveryPrice(), 0);
113   - assertEquals(orderItem02.getCouponPrice(), 0);
114   - assertEquals(orderItem02.getPointPrice(), 0);
115   - assertEquals(orderItem02.getPayPrice(), 120);
116   - assertEquals(orderItem02.getGivePoint(), 0);
117   - // 断言：SKU 3
118   - TradePriceCalculateRespBO.OrderItem orderItem03 = result.getItems().get(2);
119   - assertEquals(orderItem03.getSkuId(), 30L);
120   - assertEquals(orderItem03.getCount(), 4);
121   - assertEquals(orderItem03.getPrice(), 30);
122   - assertEquals(orderItem03.getDiscountPrice(), 60);
123   - assertEquals(orderItem03.getDeliveryPrice(), 0);
124   - assertEquals(orderItem03.getCouponPrice(), 0);
125   - assertEquals(orderItem03.getPointPrice(), 0);
126   - assertEquals(orderItem03.getPayPrice(), 60);
127   - assertEquals(orderItem03.getGivePoint(), 100);
128   - // 断言：Promotion 部分（第一个）
129   - assertEquals(result.getPromotions().size(), 2);
130   - TradePriceCalculateRespBO.Promotion promotion01 = result.getPromotions().get(0);
131   - assertEquals(promotion01.getId(), 1000L);
132   - assertEquals(promotion01.getName(), "活动 1000 号");
133   - assertEquals(promotion01.getType(), PromotionTypeEnum.REWARD_ACTIVITY.getType());
134   - assertEquals(promotion01.getTotalPrice(), 350);
135   - assertEquals(promotion01.getDiscountPrice(), 70);
136   - assertTrue(promotion01.getMatch());
137   - assertEquals(promotion01.getDescription(), "满减送：省 0.70 元");
138   - assertEquals(promotion01.getItems().size(), 2);
139   - TradePriceCalculateRespBO.PromotionItem promotionItem011 = promotion01.getItems().get(0);
140   - assertEquals(promotionItem011.getSkuId(), 10L);
141   - assertEquals(promotionItem011.getTotalPrice(), 200);
142   - assertEquals(promotionItem011.getDiscountPrice(), 40);
143   - TradePriceCalculateRespBO.PromotionItem promotionItem012 = promotion01.getItems().get(1);
144   - assertEquals(promotionItem012.getSkuId(), 20L);
145   - assertEquals(promotionItem012.getTotalPrice(), 150);
146   - assertEquals(promotionItem012.getDiscountPrice(), 30);
147   - // 断言：Promotion 部分（第二个）
148   - TradePriceCalculateRespBO.Promotion promotion02 = result.getPromotions().get(1);
149   - assertEquals(promotion02.getId(), 2000L);
150   - assertEquals(promotion02.getName(), "活动 2000 号");
151   - assertEquals(promotion02.getType(), PromotionTypeEnum.REWARD_ACTIVITY.getType());
152   - assertEquals(promotion02.getTotalPrice(), 120);
153   - assertEquals(promotion02.getDiscountPrice(), 60);
154   - assertTrue(promotion02.getMatch());
155   - assertEquals(promotion02.getDescription(), "满减送：省 0.60 元");
156   - TradePriceCalculateRespBO.PromotionItem promotionItem02 = promotion02.getItems().get(0);
157   - assertEquals(promotion02.getItems().size(), 1);
158   - assertEquals(promotionItem02.getSkuId(), 30L);
159   - assertEquals(promotionItem02.getTotalPrice(), 120);
160   - assertEquals(promotionItem02.getDiscountPrice(), 60);
161   - }
162   -
163   - @Test
164   - public void testCalculate_notMatch() {
165   - // 准备参数
166   - TradePriceCalculateReqBO param = new TradePriceCalculateReqBO()
167   - .setItems(asList(
168   - new TradePriceCalculateReqBO.Item().setSkuId(10L).setCount(2).setSelected(true),
169   - new TradePriceCalculateReqBO.Item().setSkuId(20L).setCount(3).setSelected(true),
170   - new TradePriceCalculateReqBO.Item().setSkuId(30L).setCount(4).setSelected(true)
171   - ));
172   - TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
173   - .setType(TradeOrderTypeEnum.NORMAL.getType())
174   - .setPrice(new TradePriceCalculateRespBO.Price())
175   - .setPromotions(new ArrayList<>())
176   - .setItems(asList(
177   - new TradePriceCalculateRespBO.OrderItem().setSkuId(10L).setCount(2).setSelected(true)
178   - .setPrice(100).setSpuId(1L),
179   - new TradePriceCalculateRespBO.OrderItem().setSkuId(20L).setCount(3).setSelected(true)
180   - .setPrice(50).setSpuId(2L)
181   - ));
182   - // 保证价格被初始化上
183   - TradePriceCalculatorHelper.recountPayPrice(result.getItems());
184   - TradePriceCalculatorHelper.recountAllPrice(result);
185   -
186   - // mock 方法（限时折扣 DiscountActivity 信息）
187   - when(rewardActivityApi.getMatchRewardActivityList(eq(asSet(1L, 2L)))).thenReturn(singletonList(
188   - randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(1000L).setName("活动 1000 号")
189   - .setProductScopeValues(asList(1L, 2L)).setConditionType(PromotionConditionTypeEnum.PRICE.getType())
190   - .setRules(singletonList(new RewardActivityMatchRespDTO.Rule().setLimit(351).setDiscountPrice(70))))
191   - ));
192   -
193   - // 调用
194   - tradeRewardActivityPriceCalculator.calculate(param, result);
195   - // 断言 Order 部分
196   - TradePriceCalculateRespBO.Price price = result.getPrice();
197   - assertEquals(price.getTotalPrice(), 350);
198   - assertEquals(price.getDiscountPrice(), 0);
199   - assertEquals(price.getPointPrice(), 0);
200   - assertEquals(price.getDeliveryPrice(), 0);
201   - assertEquals(price.getCouponPrice(), 0);
202   - assertEquals(price.getPayPrice(), 350);
203   - assertNull(result.getCouponId());
204   - // 断言：SKU 1
205   - assertEquals(result.getItems().size(), 2);
206   - TradePriceCalculateRespBO.OrderItem orderItem01 = result.getItems().get(0);
207   - assertEquals(orderItem01.getSkuId(), 10L);
208   - assertEquals(orderItem01.getCount(), 2);
209   - assertEquals(orderItem01.getPrice(), 100);
210   - assertEquals(orderItem01.getDiscountPrice(), 0);
211   - assertEquals(orderItem01.getDeliveryPrice(), 0);
212   - assertEquals(orderItem01.getCouponPrice(), 0);
213   - assertEquals(orderItem01.getPointPrice(), 0);
214   - assertEquals(orderItem01.getPayPrice(), 200);
215   - // 断言：SKU 2
216   - TradePriceCalculateRespBO.OrderItem orderItem02 = result.getItems().get(1);
217   - assertEquals(orderItem02.getSkuId(), 20L);
218   - assertEquals(orderItem02.getCount(), 3);
219   - assertEquals(orderItem02.getPrice(), 50);
220   - assertEquals(orderItem02.getDiscountPrice(), 0);
221   - assertEquals(orderItem02.getDeliveryPrice(), 0);
222   - assertEquals(orderItem02.getCouponPrice(), 0);
223   - assertEquals(orderItem02.getPointPrice(), 0);
224   - assertEquals(orderItem02.getPayPrice(), 150);
225   - // 断言 Promotion 部分
226   - assertEquals(result.getPromotions().size(), 1);
227   - TradePriceCalculateRespBO.Promotion promotion01 = result.getPromotions().get(0);
228   - assertEquals(promotion01.getId(), 1000L);
229   - assertEquals(promotion01.getName(), "活动 1000 号");
230   - assertEquals(promotion01.getType(), PromotionTypeEnum.REWARD_ACTIVITY.getType());
231   - assertEquals(promotion01.getTotalPrice(), 350);
232   - assertEquals(promotion01.getDiscountPrice(), 0);
233   - assertFalse(promotion01.getMatch());
234   - assertEquals(promotion01.getDescription(), "TODO"); // TODO 芋艿：后面再想想
235   - assertEquals(promotion01.getItems().size(), 2);
236   - TradePriceCalculateRespBO.PromotionItem promotionItem011 = promotion01.getItems().get(0);
237   - assertEquals(promotionItem011.getSkuId(), 10L);
238   - assertEquals(promotionItem011.getTotalPrice(), 200);
239   - assertEquals(promotionItem011.getDiscountPrice(), 0);
240   - TradePriceCalculateRespBO.PromotionItem promotionItem012 = promotion01.getItems().get(1);
241   - assertEquals(promotionItem012.getSkuId(), 20L);
242   - assertEquals(promotionItem012.getTotalPrice(), 150);
243   - assertEquals(promotionItem012.getDiscountPrice(), 0);
244   - }
  22 +// @Test
  23 +// public void testCalculate_match() {
  24 +// // 准备参数
  25 +// TradePriceCalculateReqBO param = new TradePriceCalculateReqBO()
  26 +// .setItems(asList(
  27 +// new TradePriceCalculateReqBO.Item().setSkuId(10L).setCount(2).setSelected(true), // 匹配活动 1
  28 +// new TradePriceCalculateReqBO.Item().setSkuId(20L).setCount(3).setSelected(true), // 匹配活动 1
  29 +// new TradePriceCalculateReqBO.Item().setSkuId(30L).setCount(4).setSelected(true) // 匹配活动 2
  30 +// ));
  31 +// TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
  32 +// .setType(TradeOrderTypeEnum.NORMAL.getType())
  33 +// .setPrice(new TradePriceCalculateRespBO.Price())
  34 +// .setPromotions(new ArrayList<>()).setGiveCouponTemplateCounts(new LinkedHashMap<>())
  35 +// .setItems(asList(
  36 +// new TradePriceCalculateRespBO.OrderItem().setSkuId(10L).setCount(2).setSelected(true)
  37 +// .setPrice(100).setSpuId(1L),
  38 +// new TradePriceCalculateRespBO.OrderItem().setSkuId(20L).setCount(3).setSelected(true)
  39 +// .setPrice(50).setSpuId(2L),
  40 +// new TradePriceCalculateRespBO.OrderItem().setSkuId(30L).setCount(4).setSelected(true)
  41 +// .setPrice(30).setSpuId(3L)
  42 +// ));
  43 +// // 保证价格被初始化上
  44 +// TradePriceCalculatorHelper.recountPayPrice(result.getItems());
  45 +// TradePriceCalculatorHelper.recountAllPrice(result);
  46 +//
  47 +// // mock 方法（满减送 RewardActivity 信息）
  48 +// when(rewardActivityApi.getRewardActivityListByStatusAndNow(CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now()))
  49 +// .thenReturn(asList(
  50 +// randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(1000L).setName("活动 1000 号")
  51 +// .setConditionType(PromotionConditionTypeEnum.PRICE.getType())
  52 +// .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(asList(1L, 2L))
  53 +// .setRules(singletonList(new RewardActivityMatchRespDTO.Rule().setLimit(20).setDiscountPrice(70)
  54 +// .setFreeDelivery(false)))),
  55 +// randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(2000L).setName("活动 2000 号")
  56 +// .setConditionType(PromotionConditionTypeEnum.COUNT.getType())
  57 +// .setProductScope(PromotionProductScopeEnum.SPU.getScope()).setProductScopeValues(singletonList(3L))
  58 +// .setRules(asList(new RewardActivityMatchRespDTO.Rule().setLimit(1).setDiscountPrice(10)
  59 +// .setPoint(50).setFreeDelivery(false),
  60 +// new RewardActivityMatchRespDTO.Rule().setLimit(2).setDiscountPrice(60)
  61 +// .setPoint(100).setFreeDelivery(false), // 最大可满足，因为是 4 个
  62 +// new RewardActivityMatchRespDTO.Rule().setLimit(10).setDiscountPrice(100)
  63 +// .setFreeDelivery(false))))
  64 +// ));
  65 +//
  66 +// // 调用
  67 +// tradeRewardActivityPriceCalculator.calculate(param, result);
  68 +// // 断言 Order 部分
  69 +// TradePriceCalculateRespBO.Price price = result.getPrice();
  70 +// assertEquals(price.getTotalPrice(), 470);
  71 +// assertEquals(price.getDiscountPrice(), 130);
  72 +// assertEquals(price.getPointPrice(), 0);
  73 +// assertEquals(price.getDeliveryPrice(), 0);
  74 +// assertEquals(price.getCouponPrice(), 0);
  75 +// assertEquals(price.getPayPrice(), 340);
  76 +// assertNull(result.getCouponId());
  77 +// // 断言：SKU 1
  78 +// assertEquals(result.getItems().size(), 3);
  79 +// TradePriceCalculateRespBO.OrderItem orderItem01 = result.getItems().get(0);
  80 +// assertEquals(orderItem01.getSkuId(), 10L);
  81 +// assertEquals(orderItem01.getCount(), 2);
  82 +// assertEquals(orderItem01.getPrice(), 100);
  83 +// assertEquals(orderItem01.getDiscountPrice(), 40);
  84 +// assertEquals(orderItem01.getDeliveryPrice(), 0);
  85 +// assertEquals(orderItem01.getCouponPrice(), 0);
  86 +// assertEquals(orderItem01.getPointPrice(), 0);
  87 +// assertEquals(orderItem01.getPayPrice(), 160);
  88 +// assertEquals(orderItem01.getGivePoint(), 0);
  89 +// // 断言：SKU 2
  90 +// TradePriceCalculateRespBO.OrderItem orderItem02 = result.getItems().get(1);
  91 +// assertEquals(orderItem02.getSkuId(), 20L);
  92 +// assertEquals(orderItem02.getCount(), 3);
  93 +// assertEquals(orderItem02.getPrice(), 50);
  94 +// assertEquals(orderItem02.getDiscountPrice(), 30);
  95 +// assertEquals(orderItem02.getDeliveryPrice(), 0);
  96 +// assertEquals(orderItem02.getCouponPrice(), 0);
  97 +// assertEquals(orderItem02.getPointPrice(), 0);
  98 +// assertEquals(orderItem02.getPayPrice(), 120);
  99 +// assertEquals(orderItem02.getGivePoint(), 0);
  100 +// // 断言：SKU 3
  101 +// TradePriceCalculateRespBO.OrderItem orderItem03 = result.getItems().get(2);
  102 +// assertEquals(orderItem03.getSkuId(), 30L);
  103 +// assertEquals(orderItem03.getCount(), 4);
  104 +// assertEquals(orderItem03.getPrice(), 30);
  105 +// assertEquals(orderItem03.getDiscountPrice(), 60);
  106 +// assertEquals(orderItem03.getDeliveryPrice(), 0);
  107 +// assertEquals(orderItem03.getCouponPrice(), 0);
  108 +// assertEquals(orderItem03.getPointPrice(), 0);
  109 +// assertEquals(orderItem03.getPayPrice(), 60);
  110 +// assertEquals(orderItem03.getGivePoint(), 100);
  111 +// // 断言：Promotion 部分（第一个）
  112 +// assertEquals(result.getPromotions().size(), 2);
  113 +// TradePriceCalculateRespBO.Promotion promotion01 = result.getPromotions().get(0);
  114 +// assertEquals(promotion01.getId(), 1000L);
  115 +// assertEquals(promotion01.getName(), "活动 1000 号");
  116 +// assertEquals(promotion01.getType(), PromotionTypeEnum.REWARD_ACTIVITY.getType());
  117 +// assertEquals(promotion01.getTotalPrice(), 350);
  118 +// assertEquals(promotion01.getDiscountPrice(), 70);
  119 +// assertTrue(promotion01.getMatch());
  120 +// assertEquals(promotion01.getDescription(), "满减送：省 0.70 元");
  121 +// assertEquals(promotion01.getItems().size(), 2);
  122 +// TradePriceCalculateRespBO.PromotionItem promotionItem011 = promotion01.getItems().get(0);
  123 +// assertEquals(promotionItem011.getSkuId(), 10L);
  124 +// assertEquals(promotionItem011.getTotalPrice(), 200);
  125 +// assertEquals(promotionItem011.getDiscountPrice(), 40);
  126 +// TradePriceCalculateRespBO.PromotionItem promotionItem012 = promotion01.getItems().get(1);
  127 +// assertEquals(promotionItem012.getSkuId(), 20L);
  128 +// assertEquals(promotionItem012.getTotalPrice(), 150);
  129 +// assertEquals(promotionItem012.getDiscountPrice(), 30);
  130 +// // 断言：Promotion 部分（第二个）
  131 +// TradePriceCalculateRespBO.Promotion promotion02 = result.getPromotions().get(1);
  132 +// assertEquals(promotion02.getId(), 2000L);
  133 +// assertEquals(promotion02.getName(), "活动 2000 号");
  134 +// assertEquals(promotion02.getType(), PromotionTypeEnum.REWARD_ACTIVITY.getType());
  135 +// assertEquals(promotion02.getTotalPrice(), 120);
  136 +// assertEquals(promotion02.getDiscountPrice(), 60);
  137 +// assertTrue(promotion02.getMatch());
  138 +// assertEquals(promotion02.getDescription(), "满减送：省 0.60 元");
  139 +// TradePriceCalculateRespBO.PromotionItem promotionItem02 = promotion02.getItems().get(0);
  140 +// assertEquals(promotion02.getItems().size(), 1);
  141 +// assertEquals(promotionItem02.getSkuId(), 30L);
  142 +// assertEquals(promotionItem02.getTotalPrice(), 120);
  143 +// assertEquals(promotionItem02.getDiscountPrice(), 60);
  144 +// }
  145 +//
  146 +// @Test
  147 +// public void testCalculate_notMatch() {
  148 +// // 准备参数
  149 +// TradePriceCalculateReqBO param = new TradePriceCalculateReqBO()
  150 +// .setItems(asList(
  151 +// new TradePriceCalculateReqBO.Item().setSkuId(10L).setCount(2).setSelected(true),
  152 +// new TradePriceCalculateReqBO.Item().setSkuId(20L).setCount(3).setSelected(true),
  153 +// new TradePriceCalculateReqBO.Item().setSkuId(30L).setCount(4).setSelected(true)
  154 +// ));
  155 +// TradePriceCalculateRespBO result = new TradePriceCalculateRespBO()
  156 +// .setType(TradeOrderTypeEnum.NORMAL.getType())
  157 +// .setPrice(new TradePriceCalculateRespBO.Price())
  158 +// .setPromotions(new ArrayList<>())
  159 +// .setItems(asList(
  160 +// new TradePriceCalculateRespBO.OrderItem().setSkuId(10L).setCount(2).setSelected(true)
  161 +// .setPrice(100).setSpuId(1L),
  162 +// new TradePriceCalculateRespBO.OrderItem().setSkuId(20L).setCount(3).setSelected(true)
  163 +// .setPrice(50).setSpuId(2L)
  164 +// ));
  165 +// // 保证价格被初始化上
  166 +// TradePriceCalculatorHelper.recountPayPrice(result.getItems());
  167 +// TradePriceCalculatorHelper.recountAllPrice(result);
  168 +//
  169 +// // mock 方法（限时折扣 DiscountActivity 信息）
  170 +// when(rewardActivityApi.getRewardActivityListByStatusAndNow(CommonStatusEnum.ENABLE.getStatus(), LocalDateTime.now()))
  171 +// .thenReturn(singletonList(
  172 +// randomPojo(RewardActivityMatchRespDTO.class, o -> o.setId(1000L).setName("活动 1000 号")
  173 +// .setProductScopeValues(asList(1L, 2L)).setConditionType(PromotionConditionTypeEnum.PRICE.getType())
  174 +// .setRules(singletonList(new RewardActivityMatchRespDTO.Rule().setLimit(351).setDiscountPrice(70))))
  175 +// ));
  176 +//
  177 +// // 调用
  178 +// tradeRewardActivityPriceCalculator.calculate(param, result);
  179 +// // 断言 Order 部分
  180 +// TradePriceCalculateRespBO.Price price = result.getPrice();
  181 +// assertEquals(price.getTotalPrice(), 350);
  182 +// assertEquals(price.getDiscountPrice(), 0);
  183 +// assertEquals(price.getPointPrice(), 0);
  184 +// assertEquals(price.getDeliveryPrice(), 0);
  185 +// assertEquals(price.getCouponPrice(), 0);
  186 +// assertEquals(price.getPayPrice(), 350);
  187 +// assertNull(result.getCouponId());
  188 +// // 断言：SKU 1
  189 +// assertEquals(result.getItems().size(), 2);
  190 +// TradePriceCalculateRespBO.OrderItem orderItem01 = result.getItems().get(0);
  191 +// assertEquals(orderItem01.getSkuId(), 10L);
  192 +// assertEquals(orderItem01.getCount(), 2);
  193 +// assertEquals(orderItem01.getPrice(), 100);
  194 +// assertEquals(orderItem01.getDiscountPrice(), 0);
  195 +// assertEquals(orderItem01.getDeliveryPrice(), 0);
  196 +// assertEquals(orderItem01.getCouponPrice(), 0);
  197 +// assertEquals(orderItem01.getPointPrice(), 0);
  198 +// assertEquals(orderItem01.getPayPrice(), 200);
  199 +// // 断言：SKU 2
  200 +// TradePriceCalculateRespBO.OrderItem orderItem02 = result.getItems().get(1);
  201 +// assertEquals(orderItem02.getSkuId(), 20L);
  202 +// assertEquals(orderItem02.getCount(), 3);
  203 +// assertEquals(orderItem02.getPrice(), 50);
  204 +// assertEquals(orderItem02.getDiscountPrice(), 0);
  205 +// assertEquals(orderItem02.getDeliveryPrice(), 0);
  206 +// assertEquals(orderItem02.getCouponPrice(), 0);
  207 +// assertEquals(orderItem02.getPointPrice(), 0);
  208 +// assertEquals(orderItem02.getPayPrice(), 150);
  209 +// // 断言 Promotion 部分
  210 +// assertEquals(result.getPromotions().size(), 1);
  211 +// TradePriceCalculateRespBO.Promotion promotion01 = result.getPromotions().get(0);
  212 +// assertEquals(promotion01.getId(), 1000L);
  213 +// assertEquals(promotion01.getName(), "活动 1000 号");
  214 +// assertEquals(promotion01.getType(), PromotionTypeEnum.REWARD_ACTIVITY.getType());
  215 +// assertEquals(promotion01.getTotalPrice(), 350);
  216 +// assertEquals(promotion01.getDiscountPrice(), 0);
  217 +// assertFalse(promotion01.getMatch());
  218 +// assertEquals(promotion01.getDescription(), "TODO"); // TODO 芋艿：后面再想想
  219 +// assertEquals(promotion01.getItems().size(), 2);
  220 +// TradePriceCalculateRespBO.PromotionItem promotionItem011 = promotion01.getItems().get(0);
  221 +// assertEquals(promotionItem011.getSkuId(), 10L);
  222 +// assertEquals(promotionItem011.getTotalPrice(), 200);
  223 +// assertEquals(promotionItem011.getDiscountPrice(), 0);
  224 +// TradePriceCalculateRespBO.PromotionItem promotionItem012 = promotion01.getItems().get(1);
  225 +// assertEquals(promotionItem012.getSkuId(), 20L);
  226 +// assertEquals(promotionItem012.getTotalPrice(), 150);
  227 +// assertEquals(promotionItem012.getDiscountPrice(), 0);
  228 +// }
245 229  
246 230 }
... ...
yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/order/PayOrderStatusEnum.java
  View file @caf49aa
... ... @@ -31,6 +31,16 @@ public enum PayOrderStatusEnum implements IntArrayValuable {
31 31 }
32 32  
33 33 /**
  34 + * 判断是否等待支付
  35 + *
  36 + * @param status 状态
  37 + * @return 是否等待支付
  38 + */
  39 + public static boolean isWaiting(Integer status) {
  40 + return Objects.equals(status, WAITING.getStatus());
  41 + }
  42 +
  43 + /**
34 44 * 判断是否支付成功
35 45 *
36 46 * @param status 状态
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/order/PayOrderController.java
  View file @caf49aa
... ... @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil;
4 4 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
5 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
6 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  7 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
7 8 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
8 9 import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
9 10 import cn.iocoder.yudao.module.pay.controller.admin.order.vo.*;
... ... @@ -11,12 +12,14 @@ import cn.iocoder.yudao.module.pay.convert.order.PayOrderConvert;
11 12 import cn.iocoder.yudao.module.pay.dal.dataobject.app.PayAppDO;
12 13 import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderDO;
13 14 import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderExtensionDO;
  15 +import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
14 16 import cn.iocoder.yudao.module.pay.framework.pay.core.WalletPayClient;
15 17 import cn.iocoder.yudao.module.pay.service.app.PayAppService;
16 18 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
17 19 import com.google.common.collect.Maps;
18 20 import io.swagger.v3.oas.annotations.Operation;
19 21 import io.swagger.v3.oas.annotations.Parameter;
  22 +import io.swagger.v3.oas.annotations.Parameters;
20 23 import io.swagger.v3.oas.annotations.tags.Tag;
21 24 import jakarta.annotation.Resource;
22 25 import jakarta.servlet.http.HttpServletResponse;
... ... @@ -51,10 +54,21 @@ public class PayOrderController {
51 54  
52 55 @GetMapping("/get")
53 56 @Operation(summary = "获得支付订单")
54   - @Parameter(name = "id", description = "编号", required = true, example = "1024")
  57 + @Parameters({
  58 + @Parameter(name = "id", description = "编号", required = true, example = "1024"),
  59 + @Parameter(name = "sync", description = "是否同步", example = "true")
  60 + })
55 61 @PreAuthorize("@ss.hasPermission('pay:order:query')")
56   - public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id) {
57   - return success(PayOrderConvert.INSTANCE.convert(orderService.getOrder(id)));
  62 + public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id,
  63 + @RequestParam(value = "sync", required = false) Boolean sync) {
  64 + PayOrderDO order = orderService.getOrder(id);
  65 + // sync 仅在等待支付
  66 + if (Boolean.TRUE.equals(sync) && PayOrderStatusEnum.isWaiting(order.getStatus())) {
  67 + orderService.syncOrderQuietly(order.getId());
  68 + // 重新查询，因为同步后，可能会有变化
  69 + order = orderService.getOrder(id);
  70 + }
  71 + return success(BeanUtils.toBean(order, PayOrderRespVO.class));
58 72 }
59 73  
60 74 @GetMapping("/get-detail")
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/app/order/AppPayOrderController.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.pay.controller.app.order;
2 2  
3 3 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  4 +import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
4 5 import cn.iocoder.yudao.framework.pay.core.enums.channel.PayChannelEnum;
5 6 import cn.iocoder.yudao.module.pay.controller.admin.order.vo.PayOrderRespVO;
6 7 import cn.iocoder.yudao.module.pay.controller.admin.order.vo.PayOrderSubmitRespVO;
7 8 import cn.iocoder.yudao.module.pay.controller.app.order.vo.AppPayOrderSubmitReqVO;
8 9 import cn.iocoder.yudao.module.pay.controller.app.order.vo.AppPayOrderSubmitRespVO;
9 10 import cn.iocoder.yudao.module.pay.convert.order.PayOrderConvert;
  11 +import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderDO;
  12 +import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
10 13 import cn.iocoder.yudao.module.pay.framework.pay.core.WalletPayClient;
11 14 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
12 15 import com.google.common.collect.Maps;
13 16 import io.swagger.v3.oas.annotations.Operation;
14 17 import io.swagger.v3.oas.annotations.Parameter;
  18 +import io.swagger.v3.oas.annotations.Parameters;
15 19 import io.swagger.v3.oas.annotations.tags.Tag;
16 20 import lombok.extern.slf4j.Slf4j;
17 21 import org.springframework.validation.annotation.Validated;
... ... @@ -37,12 +41,22 @@ public class AppPayOrderController {
37 41 @Resource
38 42 private PayOrderService payOrderService;
39 43  
40   - // TODO 芋艿：临时 demo，技术打样。
41 44 @GetMapping("/get")
42 45 @Operation(summary = "获得支付订单")
43   - @Parameter(name = "id", description = "编号", required = true, example = "1024")
44   - public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id) {
45   - return success(PayOrderConvert.INSTANCE.convert(payOrderService.getOrder(id)));
  46 + @Parameters({
  47 + @Parameter(name = "id", description = "编号", required = true, example = "1024"),
  48 + @Parameter(name = "sync", description = "是否同步", example = "true")
  49 + })
  50 + public CommonResult<PayOrderRespVO> getOrder(@RequestParam("id") Long id,
  51 + @RequestParam(value = "sync", required = false) Boolean sync) {
  52 + PayOrderDO order = payOrderService.getOrder(id);
  53 + // sync 仅在等待支付
  54 + if (Boolean.TRUE.equals(sync) && PayOrderStatusEnum.isWaiting(order.getStatus())) {
  55 + payOrderService.syncOrderQuietly(order.getId());
  56 + // 重新查询，因为同步后，可能会有变化
  57 + order = payOrderService.getOrder(id);
  58 + }
  59 + return success(BeanUtils.toBean(order, PayOrderRespVO.class));
46 60 }
47 61  
48 62 @PostMapping("/submit")
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/mysql/order/PayOrderExtensionMapper.java
  View file @caf49aa
... ... @@ -24,6 +24,11 @@ public interface PayOrderExtensionMapper extends BaseMapperX&lt;PayOrderExtensionDO
24 24 return selectList(PayOrderExtensionDO::getOrderId, orderId);
25 25 }
26 26  
  27 + default List<PayOrderExtensionDO> selectListByOrderIdAndStatus(Long orderId, Integer status) {
  28 + return selectList(PayOrderExtensionDO::getOrderId, orderId,
  29 + PayOrderExtensionDO::getStatus, status);
  30 + }
  31 +
27 32 default List<PayOrderExtensionDO> selectListByStatusAndCreateTimeGe(Integer status, LocalDateTime minCreateTime) {
28 33 return selectList(new LambdaQueryWrapper<PayOrderExtensionDO>()
29 34 .eq(PayOrderExtensionDO::getStatus, status)
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/redis/RedisKeyConstants.java
  View file @caf49aa
... ... @@ -17,6 +17,15 @@ public interface RedisKeyConstants {
17 17 String PAY_NOTIFY_LOCK = "pay_notify:lock:%d";
18 18  
19 19 /**
  20 + * 支付钱包的分布式锁
  21 + *
  22 + * KEY 格式：pay_wallet:lock:%d
  23 + * VALUE 数据格式：HASH // RLock.class：Redisson 的 Lock 锁，使用 Hash 数据结构
  24 + * 过期时间：不固定
  25 + */
  26 + String PAY_WALLET_LOCK = "pay_wallet:lock:%d";
  27 +
  28 + /**
20 29 * 支付序号的缓存
21 30 *
22 31 * KEY 格式：pay_no:{prefix}
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/dal/redis/wallet/PayWalletLockRedisDAO.java 0 → 100644
  View file @caf49aa
  1 +package cn.iocoder.yudao.module.pay.dal.redis.wallet;
  2 +
  3 +import jakarta.annotation.Resource;
  4 +import org.redisson.api.RLock;
  5 +import org.redisson.api.RedissonClient;
  6 +import org.springframework.stereotype.Repository;
  7 +
  8 +import java.util.concurrent.Callable;
  9 +import java.util.concurrent.TimeUnit;
  10 +
  11 +import static cn.iocoder.yudao.module.pay.dal.redis.RedisKeyConstants.PAY_WALLET_LOCK;
  12 +
  13 +/**
  14 + * 支付钱包的锁 Redis DAO
  15 + *
  16 + * @author 芋道源码
  17 + */
  18 +@Repository
  19 +public class PayWalletLockRedisDAO {
  20 +
  21 + @Resource
  22 + private RedissonClient redissonClient;
  23 +
  24 + public <V> V lock(Long id, Long timeoutMillis, Callable<V> callable) throws Exception {
  25 + String lockKey = formatKey(id);
  26 + RLock lock = redissonClient.getLock(lockKey);
  27 + try {
  28 + lock.lock(timeoutMillis, TimeUnit.MILLISECONDS);
  29 + // 执行逻辑
  30 + return callable.call();
  31 + } catch (Exception e) {
  32 + throw e;
  33 + } finally {
  34 + lock.unlock();
  35 + }
  36 + }
  37 +
  38 + private static String formatKey(Long id) {
  39 + return String.format(PAY_WALLET_LOCK, id);
  40 + }
  41 +
  42 +}
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/demo/PayDemoOrderServiceImpl.java
  View file @caf49aa
1 1 package cn.iocoder.yudao.module.pay.service.demo;
2 2  
3 3 import cn.hutool.core.lang.Assert;
  4 +import cn.hutool.core.util.ObjectUtil;
4 5 import cn.iocoder.yudao.framework.common.pojo.PageParam;
5 6 import cn.iocoder.yudao.framework.common.pojo.PageResult;
6 7 import cn.iocoder.yudao.module.pay.api.order.PayOrderApi;
... ... @@ -14,11 +15,11 @@ import cn.iocoder.yudao.module.pay.dal.dataobject.demo.PayDemoOrderDO;
14 15 import cn.iocoder.yudao.module.pay.dal.mysql.demo.PayDemoOrderMapper;
15 16 import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
16 17 import cn.iocoder.yudao.module.pay.enums.refund.PayRefundStatusEnum;
  18 +import jakarta.annotation.Resource;
17 19 import lombok.extern.slf4j.Slf4j;
18 20 import org.springframework.stereotype.Service;
19 21 import org.springframework.validation.annotation.Validated;
20 22  
21   -import jakarta.annotation.Resource;
22 23 import java.time.Duration;
23 24 import java.time.LocalDateTime;
24 25 import java.util.HashMap;
... ... @@ -111,10 +112,29 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
111 112  
112 113 @Override
113 114 public void updateDemoOrderPaid(Long id, Long payOrderId) {
114   - // 校验并获得支付订单（可支付）
115   - PayOrderRespDTO payOrder = validateDemoOrderCanPaid(id, payOrderId);
  115 + // 1.1 校验订单是否存在
  116 + PayDemoOrderDO order = payDemoOrderMapper.selectById(id);
  117 + if (order == null) {
  118 + log.error("[updateDemoOrderPaid][order({}) payOrder({}) 不存在订单，请进行处理！]", id, payOrderId);
  119 + throw exception(DEMO_ORDER_NOT_FOUND);
  120 + }
  121 + // 1.2 校验订单已支付
  122 + if (order.getPayStatus()) {
  123 + // 特殊：如果订单已支付，且支付单号相同，直接返回，说明重复回调
  124 + if (ObjectUtil.equals(order.getPayOrderId(), payOrderId)) {
  125 + log.warn("[updateDemoOrderPaid][order({}) 已支付，且支付单号相同({})，直接返回]", order, payOrderId);
  126 + return;
  127 + }
  128 + // 异常：支付单号不同，说明支付单号错误
  129 + log.error("[updateDemoOrderPaid][order({}) 支付单不匹配({})，请进行处理！order 数据是：{}]",
  130 + order, payOrderId, toJsonString(order));
  131 + throw exception(DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR);
  132 + }
  133 +
  134 + // 2. 校验支付订单的合法性
  135 + PayOrderRespDTO payOrder = validatePayOrderPaid(order, payOrderId);
116 136  
117   - // 更新 PayDemoOrderDO 状态为已支付
  137 + // 3. 更新 PayDemoOrderDO 状态为已支付
118 138 int updateCount = payDemoOrderMapper.updateByIdAndPayed(id, false,
119 139 new PayDemoOrderDO().setPayStatus(true).setPayTime(LocalDateTime.now())
120 140 .setPayChannelCode(payOrder.getChannelCode()));
... ... @@ -124,56 +144,35 @@ public class PayDemoOrderServiceImpl implements PayDemoOrderService {
124 144 }
125 145  
126 146 /**
127   - * 校验交易订单满足被支付的条件
128   - *
129   - * 1. 交易订单未支付
130   - * 2. 支付单已支付
  147 + * 校验支付订单的合法性
131 148 *
132   - * @param id 交易订单编号
  149 + * @param order 交易订单
133 150 * @param payOrderId 支付订单编号
134   - * @return 交易订单
  151 + * @return 支付订单
135 152 */
136   - private PayOrderRespDTO validateDemoOrderCanPaid(Long id, Long payOrderId) {
137   - // 1.1 校验订单是否存在
138   - PayDemoOrderDO order = payDemoOrderMapper.selectById(id);
139   - if (order == null) {
140   - throw exception(DEMO_ORDER_NOT_FOUND);
141   - }
142   - // 1.2 校验订单未支付
143   - if (order.getPayStatus()) {
144   - log.error("[validateDemoOrderCanPaid][order({}) 不处于待支付状态，请进行处理！order 数据是：{}]",
145   - id, toJsonString(order));
146   - throw exception(DEMO_ORDER_UPDATE_PAID_STATUS_NOT_UNPAID);
147   - }
148   - // 1.3 校验支付订单匹配
149   - if (notEqual(order.getPayOrderId(), payOrderId)) { // 支付单号
150   - log.error("[validateDemoOrderCanPaid][order({}) 支付单不匹配({})，请进行处理！order 数据是：{}]",
151   - id, payOrderId, toJsonString(order));
152   - throw exception(DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR);
153   - }
154   -
155   - // 2.1 校验支付单是否存在
  153 + private PayOrderRespDTO validatePayOrderPaid(PayDemoOrderDO order, Long payOrderId) {
  154 + // 1. 校验支付单是否存在
156 155 PayOrderRespDTO payOrder = payOrderApi.getOrder(payOrderId);
157 156 if (payOrder == null) {
158   - log.error("[validateDemoOrderCanPaid][order({}) payOrder({}) 不存在，请进行处理！]", id, payOrderId);
  157 + log.error("[validatePayOrderPaid][order({}) payOrder({}) 不存在，请进行处理！]", order.getId(), payOrderId);
159 158 throw exception(PAY_ORDER_NOT_FOUND);
160 159 }
161   - // 2.2 校验支付单已支付
  160 + // 2.1 校验支付单已支付
162 161 if (!PayOrderStatusEnum.isSuccess(payOrder.getStatus())) {
163   - log.error("[validateDemoOrderCanPaid][order({}) payOrder({}) 未支付，请进行处理！payOrder 数据是：{}]",
164   - id, payOrderId, toJsonString(payOrder));
  162 + log.error("[validatePayOrderPaid][order({}) payOrder({}) 未支付，请进行处理！payOrder 数据是：{}]",
  163 + order.getId(), payOrderId, toJsonString(payOrder));
165 164 throw exception(DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_STATUS_NOT_SUCCESS);
166 165 }
167   - // 2.3 校验支付金额一致
  166 + // 2.1 校验支付金额一致
168 167 if (notEqual(payOrder.getPrice(), order.getPrice())) {
169   - log.error("[validateDemoOrderCanPaid][order({}) payOrder({}) 支付金额不匹配，请进行处理！order 数据是：{}，payOrder 数据是：{}]",
170   - id, payOrderId, toJsonString(order), toJsonString(payOrder));
  168 + log.error("[validatePayOrderPaid][order({}) payOrder({}) 支付金额不匹配，请进行处理！order 数据是：{}，payOrder 数据是：{}]",
  169 + order.getId(), payOrderId, toJsonString(order), toJsonString(payOrder));
171 170 throw exception(DEMO_ORDER_UPDATE_PAID_FAIL_PAY_PRICE_NOT_MATCH);
172 171 }
173   - // 2.4 校验支付订单匹配（二次）
174   - if (notEqual(payOrder.getMerchantOrderId(), id.toString())) {
175   - log.error("[validateDemoOrderCanPaid][order({}) 支付单不匹配({})，请进行处理！payOrder 数据是：{}]",
176   - id, payOrderId, toJsonString(payOrder));
  172 + // 2.2 校验支付订单匹配（二次）
  173 + if (notEqual(payOrder.getMerchantOrderId(), order.getId().toString())) {
  174 + log.error("[validatePayOrderPaid][order({}) 支付单不匹配({})，请进行处理！payOrder 数据是：{}]",
  175 + order.getId(), payOrderId, toJsonString(payOrder));
177 176 throw exception(DEMO_ORDER_UPDATE_PAID_FAIL_PAY_ORDER_ID_ERROR);
178 177 }
179 178 return payOrder;
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderService.java
  View file @caf49aa
... ... @@ -140,6 +140,16 @@ public interface PayOrderService {
140 140 int syncOrder(LocalDateTime minCreateTime);
141 141  
142 142 /**
  143 + * 同步订单的支付状态
  144 + *
  145 + * 1. Quietly 表示，即使同步失败，也不会抛出异常
  146 + * 2. 什么时候回出现异常？因为是主动同步，可能和支付渠道的异步回调存在并发冲突，导致抛出异常
  147 + *
  148 + * @param id 订单编号
  149 + */
  150 + void syncOrderQuietly(Long id);
  151 +
  152 + /**
143 153 * 将已过期的订单，状态修改为已关闭
144 154 *
145 155 * @return 过期的订单数量
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/order/PayOrderServiceImpl.java
  View file @caf49aa
... ... @@ -163,7 +163,14 @@ public class PayOrderServiceImpl implements PayOrderService {
163 163  
164 164 // 4. 如果调用直接支付成功，则直接更新支付单状态为成功。例如说：付款码支付，免密支付时，就直接验证支付成功
165 165 if (unifiedOrderResp != null) {
166   - getSelf().notifyOrder(channel, unifiedOrderResp);
  166 + try {
  167 + getSelf().notifyOrder(channel, unifiedOrderResp);
  168 + } catch (Exception e) {
  169 + // 兼容 https://gitee.com/zhijiantianya/yudao-cloud/issues/I8SM9H 场景
  170 + // 支付宝或微信扫码之后时，由于 PayClient 是直接返回支付成功，而支付也会有回调，导致存在并发更新问题，此时一般是可以 try catch 直接忽略
  171 + log.warn("[submitOrder][order({}) channel({}) 支付结果({}) 通知时发生异常，可能是并发问题]",
  172 + order, channel, unifiedOrderResp, e);
  173 + }
167 174 // 如有渠道错误码，则抛出业务异常，提示用户
168 175 if (StrUtil.isNotEmpty(unifiedOrderResp.getChannelErrorCode())) {
169 176 throw exception(PAY_ORDER_SUBMIT_CHANNEL_ERROR, unifiedOrderResp.getChannelErrorCode(),
... ... @@ -460,6 +467,18 @@ public class PayOrderServiceImpl implements PayOrderService {
460 467 return count;
461 468 }
462 469  
  470 + @Override
  471 + public void syncOrderQuietly(Long id) {
  472 + // 1. 查询待支付订单
  473 + List<PayOrderExtensionDO> orderExtensions = orderExtensionMapper.selectListByOrderIdAndStatus(id,
  474 + PayOrderStatusEnum.WAITING.getStatus());
  475 +
  476 + // 2. 遍历执行
  477 + for (PayOrderExtensionDO orderExtension : orderExtensions) {
  478 + syncOrder(orderExtension);
  479 + }
  480 + }
  481 +
463 482 /**
464 483 * 同步单个支付拓展单
465 484 *
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletRechargeServiceImpl.java
  View file @caf49aa
... ... @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.pay.service.wallet;
2 2  
3 3 import cn.hutool.core.date.LocalDateTimeUtil;
4 4 import cn.hutool.core.lang.Assert;
  5 +import cn.hutool.core.util.ObjectUtil;
5 6 import cn.hutool.extra.spring.SpringUtil;
6 7 import cn.iocoder.yudao.framework.common.pojo.PageParam;
7 8 import cn.iocoder.yudao.framework.common.pojo.PageResult;
... ... @@ -113,16 +114,28 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
113 114 @Override
114 115 @Transactional(rollbackFor = Exception.class)
115 116 public void updateWalletRechargerPaid(Long id, Long payOrderId) {
116   - // 1.1 获取钱包充值记录
117   - PayWalletRechargeDO walletRecharge = walletRechargeMapper.selectById(id);
118   - if (walletRecharge == null) {
119   - log.error("[updateWalletRechargerPaid][钱包充值记录不存在，钱包充值记录 id({})]", id);
  117 + // 1.1 校验钱包充值是否存在
  118 + PayWalletRechargeDO recharge = walletRechargeMapper.selectById(id);
  119 + if (recharge == null) {
  120 + log.error("[updateWalletRechargerPaid][recharge({}) payOrder({}) 不存在充值订单，请进行处理！]", id, payOrderId);
120 121 throw exception(WALLET_RECHARGE_NOT_FOUND);
121 122 }
122 123 // 1.2 校验钱包充值是否可以支付
123   - PayOrderDO payOrderDO = validateWalletRechargerCanPaid(walletRecharge, payOrderId);
  124 + if (recharge.getPayStatus()) {
  125 + // 特殊：如果订单已支付，且支付单号相同，直接返回，说明重复回调
  126 + if (ObjectUtil.equals(recharge.getPayOrderId(), payOrderId)) {
  127 + log.warn("[updateWalletRechargerPaid][recharge({}) 已支付，且支付单号相同({})，直接返回]", recharge, payOrderId);
  128 + return;
  129 + }
  130 + // 异常：支付单号不同，说明支付单号错误
  131 + log.error("[updateWalletRechargerPaid][recharge({}) 已支付，但是支付单号不同({})，请进行处理！]", recharge, payOrderId);
  132 + throw exception(WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_ID_ERROR);
  133 + }
124 134  
125   - // 2. 更新钱包充值的支付状态
  135 + // 2. 校验支付订单的合法性
  136 + PayOrderDO payOrderDO = validatePayOrderPaid(recharge, payOrderId);
  137 +
  138 + // 3. 更新钱包充值的支付状态
126 139 int updateCount = walletRechargeMapper.updateByIdAndPaid(id, false,
127 140 new PayWalletRechargeDO().setId(id).setPayStatus(true).setPayTime(LocalDateTime.now())
128 141 .setPayChannelCode(payOrderDO.getChannelCode()));
... ... @@ -130,14 +143,14 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
130 143 throw exception(WALLET_RECHARGE_UPDATE_PAID_STATUS_NOT_UNPAID);
131 144 }
132 145  
133   - // 3. 更新钱包余额
  146 + // 4. 更新钱包余额
134 147 // TODO @jason：这样的话，未来提现会不会把充值的，也提现走哈。类似先充 100，送 110；然后提现 110；
135 148 // TODO 需要钱包中加个可提现余额
136   - payWalletService.addWalletBalance(walletRecharge.getWalletId(), String.valueOf(id),
137   - PayWalletBizTypeEnum.RECHARGE, walletRecharge.getTotalPrice());
  149 + payWalletService.addWalletBalance(recharge.getWalletId(), String.valueOf(id),
  150 + PayWalletBizTypeEnum.RECHARGE, recharge.getTotalPrice());
138 151  
139   - // 4. 发送订阅消息
140   - getSelf().sendWalletRechargerPaidMessage(payOrderId, walletRecharge);
  152 + // 5. 发送订阅消息
  153 + getSelf().sendWalletRechargerPaidMessage(payOrderId, recharge);
141 154 }
142 155  
143 156 @Async
... ... @@ -266,43 +279,38 @@ public class PayWalletRechargeServiceImpl implements PayWalletRechargeService {
266 279 return wallet;
267 280 }
268 281  
269   - private PayOrderDO validateWalletRechargerCanPaid(PayWalletRechargeDO walletRecharge, Long payOrderId) {
270   - // 1.1 校验充值记录的支付状态
271   - if (walletRecharge.getPayStatus()) {
272   - log.error("[validateWalletRechargerCanPaid][钱包({}) 不处于未支付状态! 钱包数据是：{}]",
273   - walletRecharge.getId(), toJsonString(walletRecharge));
274   - throw exception(WALLET_RECHARGE_UPDATE_PAID_STATUS_NOT_UNPAID);
275   - }
276   - // 1.2 校验支付订单匹配
277   - if (notEqual(walletRecharge.getPayOrderId(), payOrderId)) { // 支付单号
278   - log.error("[validateWalletRechargerCanPaid][钱包({}) 支付单不匹配({})，请进行处理！ 钱包数据是：{}]",
279   - walletRecharge.getId(), payOrderId, toJsonString(walletRecharge));
280   - throw exception(WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_ID_ERROR);
281   - }
282   -
283   - // 2.1 校验支付单是否存在
  282 + /**
  283 + * 校验支付订单的合法性
  284 + *
  285 + * @param recharge 充值订单
  286 + * @param payOrderId 支付订单编号
  287 + * @return 支付订单
  288 + */
  289 + private PayOrderDO validatePayOrderPaid(PayWalletRechargeDO recharge, Long payOrderId) {
  290 + // 1. 校验支付单是否存在
284 291 PayOrderDO payOrder = payOrderService.getOrder(payOrderId);
285 292 if (payOrder == null) {
286   - log.error("[validateWalletRechargerCanPaid][钱包({}) payOrder({}) 不存在，请进行处理！]",
287   - walletRecharge.getId(), payOrderId);
  293 + log.error("[validatePayOrderPaid][充值订单({}) payOrder({}) 不存在，请进行处理！]",
  294 + recharge.getId(), payOrderId);
288 295 throw exception(PAY_ORDER_NOT_FOUND);
289 296 }
290   - // 2.2 校验支付单已支付
  297 +
  298 + // 2.1 校验支付单已支付
291 299 if (!PayOrderStatusEnum.isSuccess(payOrder.getStatus())) {
292   - log.error("[validateWalletRechargerCanPaid][钱包({}) payOrder({}) 未支付，请进行处理！payOrder 数据是：{}]",
293   - walletRecharge.getId(), payOrderId, toJsonString(payOrder));
  300 + log.error("[validatePayOrderPaid][充值订单({}) payOrder({}) 未支付，请进行处理！payOrder 数据是：{}]",
  301 + recharge.getId(), payOrderId, toJsonString(payOrder));
294 302 throw exception(WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_STATUS_NOT_SUCCESS);
295 303 }
296   - // 2.3 校验支付金额一致
297   - if (notEqual(payOrder.getPrice(), walletRecharge.getPayPrice())) {
298   - log.error("[validateDemoOrderCanPaid][钱包({}) payOrder({}) 支付金额不匹配，请进行处理！钱包 数据是：{}，payOrder 数据是：{}]",
299   - walletRecharge.getId(), payOrderId, toJsonString(walletRecharge), toJsonString(payOrder));
  304 + // 2.2 校验支付金额一致
  305 + if (notEqual(payOrder.getPrice(), recharge.getPayPrice())) {
  306 + log.error("[validatePayOrderPaid][充值订单({}) payOrder({}) 支付金额不匹配，请进行处理！钱包 数据是：{}，payOrder 数据是：{}]",
  307 + recharge.getId(), payOrderId, toJsonString(recharge), toJsonString(payOrder));
300 308 throw exception(WALLET_RECHARGE_UPDATE_PAID_PAY_PRICE_NOT_MATCH);
301 309 }
302   - // 2.4 校验支付订单的商户订单匹配
303   - if (notEqual(payOrder.getMerchantOrderId(), walletRecharge.getId().toString())) {
304   - log.error("[validateDemoOrderCanPaid][钱包({}) 支付单不匹配({})，请进行处理！payOrder 数据是：{}]",
305   - walletRecharge.getId(), payOrderId, toJsonString(payOrder));
  310 + // 2.3 校验支付订单的商户订单匹配
  311 + if (notEqual(payOrder.getMerchantOrderId(), recharge.getId().toString())) {
  312 + log.error("[validatePayOrderPaid][充值订单({}) 支付单不匹配({})，请进行处理！payOrder 数据是：{}]",
  313 + recharge.getId(), payOrderId, toJsonString(payOrder));
306 314 throw exception(WALLET_RECHARGE_UPDATE_PAID_PAY_ORDER_ID_ERROR);
307 315 }
308 316 return payOrder;
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletServiceImpl.java
  View file @caf49aa
... ... @@ -2,17 +2,20 @@ package cn.iocoder.yudao.module.pay.service.wallet;
2 2  
3 3 import cn.hutool.core.lang.Assert;
4 4 import cn.iocoder.yudao.framework.common.pojo.PageResult;
  5 +import cn.iocoder.yudao.framework.common.util.date.DateUtils;
5 6 import cn.iocoder.yudao.module.pay.controller.admin.wallet.vo.wallet.PayWalletPageReqVO;
6 7 import cn.iocoder.yudao.module.pay.dal.dataobject.order.PayOrderExtensionDO;
7 8 import cn.iocoder.yudao.module.pay.dal.dataobject.refund.PayRefundDO;
8 9 import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletDO;
9 10 import cn.iocoder.yudao.module.pay.dal.dataobject.wallet.PayWalletTransactionDO;
10 11 import cn.iocoder.yudao.module.pay.dal.mysql.wallet.PayWalletMapper;
  12 +import cn.iocoder.yudao.module.pay.dal.redis.wallet.PayWalletLockRedisDAO;
11 13 import cn.iocoder.yudao.module.pay.enums.wallet.PayWalletBizTypeEnum;
12 14 import cn.iocoder.yudao.module.pay.service.order.PayOrderService;
13 15 import cn.iocoder.yudao.module.pay.service.refund.PayRefundService;
14 16 import cn.iocoder.yudao.module.pay.service.wallet.bo.WalletTransactionCreateReqBO;
15 17 import jakarta.annotation.Resource;
  18 +import lombok.SneakyThrows;
16 19 import lombok.extern.slf4j.Slf4j;
17 20 import org.springframework.context.annotation.Lazy;
18 21 import org.springframework.stereotype.Service;
... ... @@ -32,10 +35,17 @@ import static cn.iocoder.yudao.module.pay.enums.wallet.PayWalletBizTypeEnum.PAYM
32 35 */
33 36 @Service
34 37 @Slf4j
35   -public class PayWalletServiceImpl implements PayWalletService {
  38 +public class PayWalletServiceImpl implements PayWalletService {
  39 +
  40 + /**
  41 + * 通知超时时间，单位：毫秒
  42 + */
  43 + public static final long UPDATE_TIMEOUT_MILLIS = 120 * DateUtils.SECOND_MILLIS;
36 44  
37 45 @Resource
38 46 private PayWalletMapper walletMapper;
  47 + @Resource
  48 + private PayWalletLockRedisDAO lockRedisDAO;
39 49  
40 50 @Resource
41 51 @Lazy // 延迟加载，避免循环依赖
... ... @@ -122,76 +132,86 @@ public class PayWalletServiceImpl implements PayWalletService {
122 132  
123 133 @Override
124 134 @Transactional(rollbackFor = Exception.class)
  135 + @SneakyThrows
125 136 public PayWalletTransactionDO reduceWalletBalance(Long walletId, Long bizId,
126 137 PayWalletBizTypeEnum bizType, Integer price) {
127 138 // 1. 获取钱包
128 139 PayWalletDO payWallet = getWallet(walletId);
129 140 if (payWallet == null) {
130   - log.error("[reduceWalletBalance]，用户钱包({})不存在.", walletId);
  141 + log.error("[reduceWalletBalance][用户钱包({})不存在]", walletId);
131 142 throw exception(WALLET_NOT_FOUND);
132 143 }
133 144  
134   - // 2.1 扣除余额
135   - int updateCounts;
136   - switch (bizType) {
137   - case PAYMENT: {
138   - updateCounts = walletMapper.updateWhenConsumption(payWallet.getId(), price);
139   - break;
  145 + // 2. 加锁，更新钱包余额（目的：避免钱包流水的并发更新时，余额变化不连贯）
  146 + return lockRedisDAO.lock(walletId, UPDATE_TIMEOUT_MILLIS, () -> {
  147 + // 2. 扣除余额
  148 + int updateCounts;
  149 + switch (bizType) {
  150 + case PAYMENT: {
  151 + updateCounts = walletMapper.updateWhenConsumption(payWallet.getId(), price);
  152 + break;
  153 + }
  154 + case RECHARGE_REFUND: {
  155 + updateCounts = walletMapper.updateWhenRechargeRefund(payWallet.getId(), price);
  156 + break;
  157 + }
  158 + default: {
  159 + // TODO 其它类型待实现
  160 + throw new UnsupportedOperationException("待实现");
  161 + }
140 162 }
141   - case RECHARGE_REFUND: {
142   - updateCounts = walletMapper.updateWhenRechargeRefund(payWallet.getId(), price);
143   - break;
  163 + if (updateCounts == 0) {
  164 + throw exception(WALLET_BALANCE_NOT_ENOUGH);
144 165 }
145   - default: {
146   - // TODO 其它类型待实现
147   - throw new UnsupportedOperationException("待实现");
148   - }
149   - }
150   - if (updateCounts == 0) {
151   - throw exception(WALLET_BALANCE_NOT_ENOUGH);
152   - }
153   - // 2.2 生成钱包流水
154   - Integer afterBalance = payWallet.getBalance() - price;
155   - WalletTransactionCreateReqBO bo = new WalletTransactionCreateReqBO().setWalletId(payWallet.getId())
156   - .setPrice(-price).setBalance(afterBalance).setBizId(String.valueOf(bizId))
157   - .setBizType(bizType.getType()).setTitle(bizType.getDescription());
158   - return walletTransactionService.createWalletTransaction(bo);
  166 +
  167 + // 3. 生成钱包流水
  168 + Integer afterBalance = payWallet.getBalance() - price;
  169 + WalletTransactionCreateReqBO bo = new WalletTransactionCreateReqBO().setWalletId(payWallet.getId())
  170 + .setPrice(-price).setBalance(afterBalance).setBizId(String.valueOf(bizId))
  171 + .setBizType(bizType.getType()).setTitle(bizType.getDescription());
  172 + return walletTransactionService.createWalletTransaction(bo);
  173 + });
159 174 }
160 175  
161 176 @Override
162 177 @Transactional(rollbackFor = Exception.class)
  178 + @SneakyThrows
163 179 public PayWalletTransactionDO addWalletBalance(Long walletId, String bizId,
164 180 PayWalletBizTypeEnum bizType, Integer price) {
165   - // 1.1 获取钱包
  181 + // 1. 获取钱包
166 182 PayWalletDO payWallet = getWallet(walletId);
167 183 if (payWallet == null) {
168   - log.error("[addWalletBalance]，用户钱包({})不存在.", walletId);
  184 + log.error("[addWalletBalance][用户钱包({})不存在]", walletId);
169 185 throw exception(WALLET_NOT_FOUND);
170 186 }
171   - // 1.2 更新钱包金额
172   - switch (bizType) {
173   - case PAYMENT_REFUND: { // 退款更新
174   - walletMapper.updateWhenConsumptionRefund(payWallet.getId(), price);
175   - break;
176   - }
177   - case RECHARGE: { // 充值更新
178   - walletMapper.updateWhenRecharge(payWallet.getId(), price);
179   - break;
180   - }
181   - case UPDATE_BALANCE: // 更新余额
182   - walletMapper.updateWhenRecharge(payWallet.getId(), price);
183   - break;
184   - default: {
185   - // TODO 其它类型待实现
186   - throw new UnsupportedOperationException("待实现");
  187 +
  188 + // 2. 加锁，更新钱包余额（目的：避免钱包流水的并发更新时，余额变化不连贯）
  189 + return lockRedisDAO.lock(walletId, UPDATE_TIMEOUT_MILLIS, () -> {
  190 + // 2. 更新钱包金额
  191 + switch (bizType) {
  192 + case PAYMENT_REFUND: { // 退款更新
  193 + walletMapper.updateWhenConsumptionRefund(payWallet.getId(), price);
  194 + break;
  195 + }
  196 + case RECHARGE: { // 充值更新
  197 + walletMapper.updateWhenRecharge(payWallet.getId(), price);
  198 + break;
  199 + }
  200 + case UPDATE_BALANCE: // 更新余额
  201 + walletMapper.updateWhenRecharge(payWallet.getId(), price);
  202 + break;
  203 + default: {
  204 + // TODO 其它类型待实现
  205 + throw new UnsupportedOperationException("待实现");
  206 + }
187 207 }
188   - }
189 208  
190   - // 2. 生成钱包流水
191   - WalletTransactionCreateReqBO transactionCreateReqBO = new WalletTransactionCreateReqBO()
192   - .setWalletId(payWallet.getId()).setPrice(price).setBalance(payWallet.getBalance() + price)
193   - .setBizId(bizId).setBizType(bizType.getType()).setTitle(bizType.getDescription());
194   - return walletTransactionService.createWalletTransaction(transactionCreateReqBO);
  209 + // 3. 生成钱包流水
  210 + WalletTransactionCreateReqBO transactionCreateReqBO = new WalletTransactionCreateReqBO()
  211 + .setWalletId(payWallet.getId()).setPrice(price).setBalance(payWallet.getBalance() + price)
  212 + .setBizId(bizId).setBizType(bizType.getType()).setTitle(bizType.getDescription());
  213 + return walletTransactionService.createWalletTransaction(transactionCreateReqBO);
  214 + });
195 215 }
196 216  
197 217 @Override
... ...
yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/wallet/PayWalletTransactionServiceImpl.java
  View file @caf49aa
... ... @@ -87,8 +87,6 @@ public class PayWalletTransactionServiceImpl implements PayWalletTransactionServ
87 87 @Override
88 88 public AppPayWalletTransactionSummaryRespVO getWalletTransactionSummary(Long userId, Integer userType, LocalDateTime[] createTime) {
89 89 PayWalletDO wallet = payWalletService.getOrCreateWallet(userId, userType);
90   - AppPayWalletTransactionSummaryRespVO summary = new AppPayWalletTransactionSummaryRespVO()
91   - .setTotalExpense(1).setTotalIncome(100);
92 90 return new AppPayWalletTransactionSummaryRespVO()
93 91 .setTotalExpense(payWalletTransactionMapper.selectPriceSum(wallet.getId(), TYPE_EXPENSE, createTime))
94 92 .setTotalIncome(payWalletTransactionMapper.selectPriceSum(wallet.getId(), TYPE_INCOME, createTime));
... ...