hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-06-20 15:31:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

【代码优化】商城: 满减送活动

Browse Source
This commit is contained in:
puhui999 2024-09-02 11:35:33 +08:00
parent 5ea3e5db0d
commit 81e3866665
3 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/reward/vo/RewardActivityBaseVO.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.promotion.controller.admin.reward.vo; package cn.iocoder.yudao.module.promotion.controller.admin.reward.vo;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.BooleanUtil;
import cn.iocoder.yudao.framework.common.validation.InEnum; import cn.iocoder.yudao.framework.common.validation.InEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum; import cn.iocoder.yudao.module.promotion.enums.common.PromotionConditionTypeEnum;
import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum; import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
@ -77,24 +76,16 @@ public class RewardActivityBaseVO {
@NotNull(message = "规则是否包邮不能为空") @NotNull(message = "规则是否包邮不能为空")
private Boolean freeDelivery; private Boolean freeDelivery;
@Schema(description = "是否赠送积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "规则是否赠送积分不能为空")
private Boolean givePoint;
@Schema(description = "赠送的积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100") @Schema(description = "赠送的积分", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
private Integer point; private Integer point;
@Schema(description = "是否赠送优惠券", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
@NotNull(message = "规则是否赠送优惠券不能为空")
private Boolean giveCoupon;
@Schema(description = "赠送的优惠劵编号的数组", example = "1,2,3") @Schema(description = "赠送的优惠劵编号的数组", example = "1,2,3")
private Map<Long, Integer> giveCouponsMap; private Map<Long, Integer> giveCouponsMap;
@AssertTrue(message = "赠送的积分不能小于 1") @AssertTrue(message = "赠送的积分不能小于 1")
@JsonIgnore @JsonIgnore
public boolean isPointValid() { public boolean isPointValid() {
return BooleanUtil.isFalse(givePoint) || (point != null && point >= 1); return point == null || point >= 1;
} }
} }

10
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
View File

@ -100,20 +100,10 @@ public class RewardActivityDO extends BaseDO {
* 是否包邮 * 是否包邮
*/ */
private Boolean freeDelivery; private Boolean freeDelivery;
// TODO @puhui999：是不是大于零，就认为赠送积分哈；简洁一点；
/**
* 是否赠送积分
*/
private Boolean givePoint;
/** /**
* 赠送的积分 * 赠送的积分
*/ */
private Integer point; private Integer point;
// TODO @puhui999：非空，就认为赠送优惠劵
/**
* 是否赠送优惠券
*/
private Boolean giveCoupon;
/** /**
* 赠送的优惠劵 * 赠送的优惠劵
* *

1
yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/reward/RewardActivityServiceImpl.java
View File

@ -159,7 +159,6 @@ public class RewardActivityServiceImpl implements RewardActivityService {
@Override @Override
public List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds) { public List<RewardActivityMatchRespDTO> getMatchRewardActivityList(Collection<Long> spuIds) {
// TODO 芋艿：待实现；先指定，然后再全局的；
List<RewardActivityDO> list = rewardActivityMapper.selectListBySpuIdsAndStatus(spuIds, CommonStatusEnum.ENABLE.getStatus()); List<RewardActivityDO> list = rewardActivityMapper.selectListBySpuIdsAndStatus(spuIds, CommonStatusEnum.ENABLE.getStatus());
return BeanUtils.toBean(list, RewardActivityMatchRespDTO.class); return BeanUtils.toBean(list, RewardActivityMatchRespDTO.class);
} }