mirror of
https://gitee.com/huangge1199_admin/vue-pro.git
synced 2024-11-23 07:41:53 +08:00
promotion:增加满减送活动的后端 20%
This commit is contained in:
parent
873b530652
commit
0e5b7734ac
@ -27,4 +27,7 @@ public interface ErrorCodeConstants {
|
|||||||
ErrorCode COUPON_NOT_EXISTS = new ErrorCode(1003005000, "优惠劵不存在");
|
ErrorCode COUPON_NOT_EXISTS = new ErrorCode(1003005000, "优惠劵不存在");
|
||||||
ErrorCode COUPON_DELETE_FAIL_USED = new ErrorCode(1003005001, "回收优惠劵失败,优惠劵已被使用");
|
ErrorCode COUPON_DELETE_FAIL_USED = new ErrorCode(1003005001, "回收优惠劵失败,优惠劵已被使用");
|
||||||
|
|
||||||
|
// ========== 满减送活动 1003006000 ==========
|
||||||
|
ErrorCode REWARD_ACTIVITY_NOT_EXISTS = new ErrorCode(1003006000, "满减送活动不存在");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,74 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.admin.reward;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityRespVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.convert.reward.RewardActivityConvert;
|
||||||
|
import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.service.reward.RewardActivityService;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import javax.validation.Valid;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||||
|
|
||||||
|
@Api(tags = "管理后台 - 满减送活动")
|
||||||
|
@RestController
|
||||||
|
@RequestMapping("/promotion/reward-activity")
|
||||||
|
@Validated
|
||||||
|
public class RewardActivityController {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private RewardActivityService rewardActivityService;
|
||||||
|
|
||||||
|
@PostMapping("/create")
|
||||||
|
@ApiOperation("创建满减送活动")
|
||||||
|
@PreAuthorize("@ss.hasPermission('promotion:reward-activity:create')")
|
||||||
|
public CommonResult<Long> createRewardActivity(@Valid @RequestBody RewardActivityCreateReqVO createReqVO) {
|
||||||
|
return success(rewardActivityService.createRewardActivity(createReqVO));
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping("/update")
|
||||||
|
@ApiOperation("更新满减送活动")
|
||||||
|
@PreAuthorize("@ss.hasPermission('promotion:reward-activity:update')")
|
||||||
|
public CommonResult<Boolean> updateRewardActivity(@Valid @RequestBody RewardActivityUpdateReqVO updateReqVO) {
|
||||||
|
rewardActivityService.updateRewardActivity(updateReqVO);
|
||||||
|
return success(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping("/delete")
|
||||||
|
@ApiOperation("删除满减送活动")
|
||||||
|
@ApiImplicitParam(name = "id", value = "编号", required = true, dataTypeClass = Integer.class)
|
||||||
|
@PreAuthorize("@ss.hasPermission('promotion:reward-activity:delete')")
|
||||||
|
public CommonResult<Boolean> deleteRewardActivity(@RequestParam("id") Integer id) {
|
||||||
|
rewardActivityService.deleteRewardActivity(id);
|
||||||
|
return success(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/get")
|
||||||
|
@ApiOperation("获得满减送活动")
|
||||||
|
@ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Integer.class)
|
||||||
|
@PreAuthorize("@ss.hasPermission('promotion:reward-activity:query')")
|
||||||
|
public CommonResult<RewardActivityRespVO> getRewardActivity(@RequestParam("id") Integer id) {
|
||||||
|
RewardActivityDO rewardActivity = rewardActivityService.getRewardActivity(id);
|
||||||
|
return success(RewardActivityConvert.INSTANCE.convert(rewardActivity));
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping("/page")
|
||||||
|
@ApiOperation("获得满减送活动分页")
|
||||||
|
@PreAuthorize("@ss.hasPermission('promotion:reward-activity:query')")
|
||||||
|
public CommonResult<PageResult<RewardActivityRespVO>> getRewardActivityPage(@Valid RewardActivityPageReqVO pageVO) {
|
||||||
|
PageResult<RewardActivityDO> pageResult = rewardActivityService.getRewardActivityPage(pageVO);
|
||||||
|
return success(RewardActivityConvert.INSTANCE.convertPage(pageResult));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,78 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.admin.reward.vo;
|
||||||
|
|
||||||
|
import io.swagger.annotations.ApiModel;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
import lombok.Data;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
|
import javax.validation.constraints.NotNull;
|
||||||
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 满减送活动 Base VO,提供给添加、修改、详细的子 VO 使用
|
||||||
|
* 如果子 VO 存在差异的字段,请不要添加到这里,影响 Swagger 文档生成
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
public class RewardActivityBaseVO {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "活动标题", required = true, example = "满啦满啦")
|
||||||
|
@NotNull(message = "活动标题不能为空")
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "开始时间", required = true)
|
||||||
|
@NotNull(message = "开始时间不能为空")
|
||||||
|
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||||
|
private Date startTime;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "结束时间", required = true)
|
||||||
|
@NotNull(message = "结束时间不能为空")
|
||||||
|
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
|
||||||
|
private Date endTime;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "备注", example = "biubiubiu")
|
||||||
|
private String remark;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "条件类型", required = true, example = "1")
|
||||||
|
@NotNull(message = "条件类型不能为空")
|
||||||
|
private Integer conditionType;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "商品范围", required = true, example = "1")
|
||||||
|
@NotNull(message = "商品范围不能为空")
|
||||||
|
private Integer productScope;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "商品 SPU 编号的数组", example = "1,2,3")
|
||||||
|
private List<Long> productSpuIds;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 优惠规则的数组
|
||||||
|
*/
|
||||||
|
private List<Rule> rules;
|
||||||
|
|
||||||
|
@ApiModel("优惠规则")
|
||||||
|
@Data
|
||||||
|
public static class Rule {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "优惠门槛", required = true, example = "100", notes = "1. 满 N 元,单位:分; 2. 满 N 件")
|
||||||
|
private Integer limit;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "优惠价格", required = true, example = "100", notes = "单位:分")
|
||||||
|
private Integer discountPrice;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "是否包邮", required = true, example = "true")
|
||||||
|
private Boolean freeDelivery;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "赠送的积分", required = true, example = "100")
|
||||||
|
private Integer point;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "赠送的优惠劵编号的数组", example = "1,2,3")
|
||||||
|
private List<Long> couponIds;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "赠送的优惠卷数量的数组", example = "1,2,3")
|
||||||
|
private List<Integer> couponCounts;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,12 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.admin.reward.vo;
|
||||||
|
|
||||||
|
import lombok.*;
|
||||||
|
import io.swagger.annotations.*;
|
||||||
|
|
||||||
|
@ApiModel("管理后台 - 满减送活动创建 Request VO")
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
public class RewardActivityCreateReqVO extends RewardActivityBaseVO {
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,19 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.admin.reward.vo;
|
||||||
|
|
||||||
|
import lombok.*;
|
||||||
|
import io.swagger.annotations.*;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||||
|
|
||||||
|
@ApiModel("管理后台 - 满减送活动分页 Request VO")
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
public class RewardActivityPageReqVO extends PageParam {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "活动标题", example = "满啦满啦")
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "活动状态", example = "1")
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,22 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.admin.reward.vo;
|
||||||
|
|
||||||
|
import lombok.*;
|
||||||
|
import java.util.*;
|
||||||
|
import io.swagger.annotations.*;
|
||||||
|
|
||||||
|
@ApiModel("管理后台 - 满减送活动 Response VO")
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
public class RewardActivityRespVO extends RewardActivityBaseVO {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "活动编号", required = true, example = "1024")
|
||||||
|
private Integer id;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "活动状态", required = true, example = "1")
|
||||||
|
private Integer status;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "创建时间", required = true)
|
||||||
|
private Date createTime;
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,17 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.controller.admin.reward.vo;
|
||||||
|
|
||||||
|
import lombok.*;
|
||||||
|
import io.swagger.annotations.*;
|
||||||
|
import javax.validation.constraints.*;
|
||||||
|
|
||||||
|
@ApiModel("管理后台 - 满减送活动更新 Request VO")
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@ToString(callSuper = true)
|
||||||
|
public class RewardActivityUpdateReqVO extends RewardActivityBaseVO {
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "活动编号", required = true, example = "1024")
|
||||||
|
@NotNull(message = "活动编号不能为空")
|
||||||
|
private Integer id;
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,29 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.convert.reward;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityRespVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
|
||||||
|
import org.mapstruct.Mapper;
|
||||||
|
import org.mapstruct.factory.Mappers;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 满减送活动 Convert
|
||||||
|
*
|
||||||
|
* @author 芋道源码
|
||||||
|
*/
|
||||||
|
@Mapper
|
||||||
|
public interface RewardActivityConvert {
|
||||||
|
|
||||||
|
RewardActivityConvert INSTANCE = Mappers.getMapper(RewardActivityConvert.class);
|
||||||
|
|
||||||
|
RewardActivityDO convert(RewardActivityCreateReqVO bean);
|
||||||
|
|
||||||
|
RewardActivityDO convert(RewardActivityUpdateReqVO bean);
|
||||||
|
|
||||||
|
RewardActivityRespVO convert(RewardActivityDO bean);
|
||||||
|
|
||||||
|
PageResult<RewardActivityRespVO> convertPage(PageResult<RewardActivityDO> page);
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,25 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.dal.mysql.reward;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||||
|
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
|
||||||
|
import org.apache.ibatis.annotations.Mapper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 满减送活动 Mapper
|
||||||
|
*
|
||||||
|
* @author 芋道源码
|
||||||
|
*/
|
||||||
|
@Mapper
|
||||||
|
public interface RewardActivityMapper extends BaseMapperX<RewardActivityDO> {
|
||||||
|
|
||||||
|
default PageResult<RewardActivityDO> selectPage(RewardActivityPageReqVO reqVO) {
|
||||||
|
return selectPage(reqVO, new LambdaQueryWrapperX<RewardActivityDO>()
|
||||||
|
.likeIfPresent(RewardActivityDO::getName, reqVO.getName())
|
||||||
|
.eqIfPresent(RewardActivityDO::getStatus, reqVO.getStatus())
|
||||||
|
.orderByDesc(RewardActivityDO::getId));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -13,9 +13,9 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
|
|||||||
import cn.iocoder.yudao.module.promotion.enums.common.*;
|
import cn.iocoder.yudao.module.promotion.enums.common.*;
|
||||||
import cn.iocoder.yudao.module.promotion.service.coupon.CouponService;
|
import cn.iocoder.yudao.module.promotion.service.coupon.CouponService;
|
||||||
import cn.iocoder.yudao.module.promotion.service.discount.DiscountService;
|
import cn.iocoder.yudao.module.promotion.service.discount.DiscountService;
|
||||||
import cn.iocoder.yudao.module.promotion.service.reward.RewardService;
|
|
||||||
import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
|
import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
|
||||||
import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
|
import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.service.reward.RewardActivityService;
|
||||||
import com.google.common.base.Suppliers;
|
import com.google.common.base.Suppliers;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
@ -56,7 +56,7 @@ public class PriceServiceImpl implements PriceService {
|
|||||||
@Resource
|
@Resource
|
||||||
private DiscountService discountService;
|
private DiscountService discountService;
|
||||||
@Resource
|
@Resource
|
||||||
private RewardService rewardService;
|
private RewardActivityService rewardActivityService;
|
||||||
@Resource
|
@Resource
|
||||||
private CouponService couponService;
|
private CouponService couponService;
|
||||||
|
|
||||||
@ -188,7 +188,7 @@ public class PriceServiceImpl implements PriceService {
|
|||||||
private void calculatePriceForOrderLevel(Long userId, PriceCalculateRespDTO priceCalculate) {
|
private void calculatePriceForOrderLevel(Long userId, PriceCalculateRespDTO priceCalculate) {
|
||||||
// 获取 SKU 级别的所有优惠信息
|
// 获取 SKU 级别的所有优惠信息
|
||||||
Set<Long> spuIds = convertSet(priceCalculate.getOrder().getItems(), PriceCalculateRespDTO.OrderItem::getSpuId);
|
Set<Long> spuIds = convertSet(priceCalculate.getOrder().getItems(), PriceCalculateRespDTO.OrderItem::getSpuId);
|
||||||
Map<RewardActivityDO, Set<Long>> rewardActivities = rewardService.getMatchRewardActivities(spuIds);
|
Map<RewardActivityDO, Set<Long>> rewardActivities = rewardActivityService.getMatchRewardActivities(spuIds);
|
||||||
|
|
||||||
// 处理满减送活动
|
// 处理满减送活动
|
||||||
if (CollUtil.isNotEmpty(rewardActivities)) {
|
if (CollUtil.isNotEmpty(rewardActivities)) {
|
||||||
|
@ -0,0 +1,76 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.service.reward;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
|
||||||
|
|
||||||
|
import javax.validation.Valid;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 满减送活动 Service 接口
|
||||||
|
*
|
||||||
|
* @author 芋道源码
|
||||||
|
*/
|
||||||
|
public interface RewardActivityService {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 创建满减送活动
|
||||||
|
*
|
||||||
|
* @param createReqVO 创建信息
|
||||||
|
* @return 编号
|
||||||
|
*/
|
||||||
|
Long createRewardActivity(@Valid RewardActivityCreateReqVO createReqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 更新满减送活动
|
||||||
|
*
|
||||||
|
* @param updateReqVO 更新信息
|
||||||
|
*/
|
||||||
|
void updateRewardActivity(@Valid RewardActivityUpdateReqVO updateReqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 删除满减送活动
|
||||||
|
*
|
||||||
|
* @param id 编号
|
||||||
|
*/
|
||||||
|
void deleteRewardActivity(Integer id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获得满减送活动
|
||||||
|
*
|
||||||
|
* @param id 编号
|
||||||
|
* @return 满减送活动
|
||||||
|
*/
|
||||||
|
RewardActivityDO getRewardActivity(Integer id);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获得满减送活动列表
|
||||||
|
*
|
||||||
|
* @param ids 编号
|
||||||
|
* @return 满减送活动列表
|
||||||
|
*/
|
||||||
|
List<RewardActivityDO> getRewardActivityList(Collection<Integer> ids);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获得满减送活动分页
|
||||||
|
*
|
||||||
|
* @param pageReqVO 分页查询
|
||||||
|
* @return 满减送活动分页
|
||||||
|
*/
|
||||||
|
PageResult<RewardActivityDO> getRewardActivityPage(RewardActivityPageReqVO pageReqVO);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 基于指定的 SPU 编号数组,获得它们匹配的满减送活动
|
||||||
|
*
|
||||||
|
* @param spuIds SPU 编号数组
|
||||||
|
* @return 满减送活动,与对应的 SPU 编号的映射。即,value 就是 SPU 编号的集合
|
||||||
|
*/
|
||||||
|
Map<RewardActivityDO, Set<Long>> getMatchRewardActivities(Set<Long> spuIds);
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,87 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.service.reward;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityCreateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityPageReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.RewardActivityUpdateReqVO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.convert.reward.RewardActivityConvert;
|
||||||
|
import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.dal.mysql.reward.RewardActivityMapper;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
import org.springframework.validation.annotation.Validated;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
||||||
|
import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.REWARD_ACTIVITY_NOT_EXISTS;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 满减送活动 Service 实现类
|
||||||
|
*
|
||||||
|
* @author 芋道源码
|
||||||
|
*/
|
||||||
|
@Service
|
||||||
|
@Validated
|
||||||
|
public class RewardActivityServiceImpl implements RewardActivityService {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private RewardActivityMapper rewardActivityMapper;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long createRewardActivity(RewardActivityCreateReqVO createReqVO) {
|
||||||
|
// 插入
|
||||||
|
RewardActivityDO rewardActivity = RewardActivityConvert.INSTANCE.convert(createReqVO);
|
||||||
|
rewardActivityMapper.insert(rewardActivity);
|
||||||
|
// 返回
|
||||||
|
return rewardActivity.getId();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateRewardActivity(RewardActivityUpdateReqVO updateReqVO) {
|
||||||
|
// 校验存在
|
||||||
|
this.validateRewardActivityExists(updateReqVO.getId());
|
||||||
|
// 更新
|
||||||
|
RewardActivityDO updateObj = RewardActivityConvert.INSTANCE.convert(updateReqVO);
|
||||||
|
rewardActivityMapper.updateById(updateObj);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteRewardActivity(Integer id) {
|
||||||
|
// 校验存在
|
||||||
|
this.validateRewardActivityExists(id);
|
||||||
|
// 删除
|
||||||
|
rewardActivityMapper.deleteById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void validateRewardActivityExists(Integer id) {
|
||||||
|
if (rewardActivityMapper.selectById(id) == null) {
|
||||||
|
throw exception(REWARD_ACTIVITY_NOT_EXISTS);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public RewardActivityDO getRewardActivity(Integer id) {
|
||||||
|
return rewardActivityMapper.selectById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<RewardActivityDO> getRewardActivityList(Collection<Integer> ids) {
|
||||||
|
return rewardActivityMapper.selectBatchIds(ids);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageResult<RewardActivityDO> getRewardActivityPage(RewardActivityPageReqVO pageReqVO) {
|
||||||
|
return rewardActivityMapper.selectPage(pageReqVO);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<RewardActivityDO, Set<Long>> getMatchRewardActivities(Set<Long> spuIds) {
|
||||||
|
// TODO 芋艿:待实现
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -1,23 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.promotion.service.reward;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
|
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 满减送 Service 接口
|
|
||||||
*
|
|
||||||
* @author 芋道源码
|
|
||||||
*/
|
|
||||||
public interface RewardService {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 基于指定的 SPU 编号数组,获得它们匹配的满减送活动
|
|
||||||
*
|
|
||||||
* @param spuIds SPU 编号数组
|
|
||||||
* @return 满减送活动,与对应的 SPU 编号的映射。即,value 就是 SPU 编号的集合
|
|
||||||
*/
|
|
||||||
Map<RewardActivityDO, Set<Long>> getMatchRewardActivities(Set<Long> spuIds);
|
|
||||||
|
|
||||||
}
|
|
@ -1,26 +0,0 @@
|
|||||||
package cn.iocoder.yudao.module.promotion.service.reward;
|
|
||||||
|
|
||||||
import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 满减送 Service 实现类
|
|
||||||
*
|
|
||||||
* @author 芋道源码
|
|
||||||
*/
|
|
||||||
@Service
|
|
||||||
@Validated
|
|
||||||
public class RewardServiceImpl implements RewardService {
|
|
||||||
|
|
||||||
// TODO 芋艿:待实现
|
|
||||||
@Override
|
|
||||||
public Map<RewardActivityDO, Set<Long>> getMatchRewardActivities(Set<Long> spuIds) {
|
|
||||||
return Collections.emptyMap();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -2,6 +2,8 @@ package cn.iocoder.yudao.module.promotion.service.price;
|
|||||||
|
|
||||||
import cn.hutool.core.map.MapUtil;
|
import cn.hutool.core.map.MapUtil;
|
||||||
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
|
import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
|
||||||
|
import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
|
||||||
|
import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
|
||||||
import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateReqDTO;
|
import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateReqDTO;
|
||||||
import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateRespDTO;
|
import cn.iocoder.yudao.module.promotion.api.price.dto.PriceCalculateRespDTO;
|
||||||
import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponDO;
|
import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponDO;
|
||||||
@ -10,9 +12,7 @@ import cn.iocoder.yudao.module.promotion.dal.dataobject.reward.RewardActivityDO;
|
|||||||
import cn.iocoder.yudao.module.promotion.enums.common.*;
|
import cn.iocoder.yudao.module.promotion.enums.common.*;
|
||||||
import cn.iocoder.yudao.module.promotion.service.coupon.CouponService;
|
import cn.iocoder.yudao.module.promotion.service.coupon.CouponService;
|
||||||
import cn.iocoder.yudao.module.promotion.service.discount.DiscountService;
|
import cn.iocoder.yudao.module.promotion.service.discount.DiscountService;
|
||||||
import cn.iocoder.yudao.module.promotion.service.reward.RewardService;
|
import cn.iocoder.yudao.module.promotion.service.reward.RewardActivityService;
|
||||||
import cn.iocoder.yudao.module.product.api.sku.ProductSkuApi;
|
|
||||||
import cn.iocoder.yudao.module.product.api.sku.dto.ProductSkuRespDTO;
|
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.mockito.InjectMocks;
|
import org.mockito.InjectMocks;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
@ -43,7 +43,7 @@ public class PriceServiceTest extends BaseMockitoUnitTest {
|
|||||||
@Mock
|
@Mock
|
||||||
private DiscountService discountService;
|
private DiscountService discountService;
|
||||||
@Mock
|
@Mock
|
||||||
private RewardService rewardService;
|
private RewardActivityService rewardActivityService;
|
||||||
@Mock
|
@Mock
|
||||||
private CouponService couponService;
|
private CouponService couponService;
|
||||||
@Mock
|
@Mock
|
||||||
@ -205,7 +205,7 @@ public class PriceServiceTest extends BaseMockitoUnitTest {
|
|||||||
Map<RewardActivityDO, Set<Long>> matchRewardActivities = new LinkedHashMap<>();
|
Map<RewardActivityDO, Set<Long>> matchRewardActivities = new LinkedHashMap<>();
|
||||||
matchRewardActivities.put(rewardActivity01, asSet(1L, 2L));
|
matchRewardActivities.put(rewardActivity01, asSet(1L, 2L));
|
||||||
matchRewardActivities.put(rewardActivity02, asSet(3L));
|
matchRewardActivities.put(rewardActivity02, asSet(3L));
|
||||||
when(rewardService.getMatchRewardActivities(eq(asSet(1L, 2L, 3L)))).thenReturn(matchRewardActivities);
|
when(rewardActivityService.getMatchRewardActivities(eq(asSet(1L, 2L, 3L)))).thenReturn(matchRewardActivities);
|
||||||
|
|
||||||
// 调用
|
// 调用
|
||||||
PriceCalculateRespDTO priceCalculate = priceService.calculatePrice(calculateReqDTO);
|
PriceCalculateRespDTO priceCalculate = priceService.calculatePrice(calculateReqDTO);
|
||||||
@ -302,7 +302,7 @@ public class PriceServiceTest extends BaseMockitoUnitTest {
|
|||||||
.setRules(singletonList(new RewardActivityDO.Rule().setLimit(351).setDiscountPrice(70))));
|
.setRules(singletonList(new RewardActivityDO.Rule().setLimit(351).setDiscountPrice(70))));
|
||||||
Map<RewardActivityDO, Set<Long>> matchRewardActivities = new LinkedHashMap<>();
|
Map<RewardActivityDO, Set<Long>> matchRewardActivities = new LinkedHashMap<>();
|
||||||
matchRewardActivities.put(rewardActivity01, asSet(1L, 2L));
|
matchRewardActivities.put(rewardActivity01, asSet(1L, 2L));
|
||||||
when(rewardService.getMatchRewardActivities(eq(asSet(1L, 2L)))).thenReturn(matchRewardActivities);
|
when(rewardActivityService.getMatchRewardActivities(eq(asSet(1L, 2L)))).thenReturn(matchRewardActivities);
|
||||||
|
|
||||||
// 调用
|
// 调用
|
||||||
PriceCalculateRespDTO priceCalculate = priceService.calculatePrice(calculateReqDTO);
|
PriceCalculateRespDTO priceCalculate = priceService.calculatePrice(calculateReqDTO);
|
||||||
|
@ -0,0 +1,153 @@
|
|||||||
|
package cn.iocoder.yudao.module.promotion.service.rewardactivity;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.module.promotion.service.reward.RewardActivityServiceImpl;
|
||||||
|
import org.junit.jupiter.api.Disabled;
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
|
||||||
|
|
||||||
|
import cn.iocoder.yudao.module.promotion.controller.admin.reward.vo.*;
|
||||||
|
import cn.iocoder.yudao.module.promotion.dal.dataobject.rewardactivity.RewardActivityDO;
|
||||||
|
import cn.iocoder.yudao.module.promotion.dal.mysql.reward.RewardActivityMapper;
|
||||||
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||||
|
|
||||||
|
import org.springframework.context.annotation.Import;
|
||||||
|
import java.util.*;
|
||||||
|
|
||||||
|
import static cn.iocoder.yudao.module.promotion.enums.ErrorCodeConstants.*;
|
||||||
|
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
|
||||||
|
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
|
||||||
|
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@link RewardActivityServiceImpl} 的单元测试类
|
||||||
|
*
|
||||||
|
* @author 芋道源码
|
||||||
|
*/
|
||||||
|
@Import(RewardActivityServiceImpl.class)
|
||||||
|
public class RewardActivityServiceImplTest extends BaseDbUnitTest {
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private RewardActivityServiceImpl rewardActivityService;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private RewardActivityMapper rewardActivityMapper;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCreateRewardActivity_success() {
|
||||||
|
// 准备参数
|
||||||
|
RewardActivityCreateReqVO reqVO = randomPojo(RewardActivityCreateReqVO.class);
|
||||||
|
|
||||||
|
// 调用
|
||||||
|
Integer rewardActivityId = rewardActivityService.createRewardActivity(reqVO);
|
||||||
|
// 断言
|
||||||
|
assertNotNull(rewardActivityId);
|
||||||
|
// 校验记录的属性是否正确
|
||||||
|
RewardActivityDO rewardActivity = rewardActivityMapper.selectById(rewardActivityId);
|
||||||
|
assertPojoEquals(reqVO, rewardActivity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateRewardActivity_success() {
|
||||||
|
// mock 数据
|
||||||
|
RewardActivityDO dbRewardActivity = randomPojo(RewardActivityDO.class);
|
||||||
|
rewardActivityMapper.insert(dbRewardActivity);// @Sql: 先插入出一条存在的数据
|
||||||
|
// 准备参数
|
||||||
|
RewardActivityUpdateReqVO reqVO = randomPojo(RewardActivityUpdateReqVO.class, o -> {
|
||||||
|
o.setId(dbRewardActivity.getId()); // 设置更新的 ID
|
||||||
|
});
|
||||||
|
|
||||||
|
// 调用
|
||||||
|
rewardActivityService.updateRewardActivity(reqVO);
|
||||||
|
// 校验是否更新正确
|
||||||
|
RewardActivityDO rewardActivity = rewardActivityMapper.selectById(reqVO.getId()); // 获取最新的
|
||||||
|
assertPojoEquals(reqVO, rewardActivity);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateRewardActivity_notExists() {
|
||||||
|
// 准备参数
|
||||||
|
RewardActivityUpdateReqVO reqVO = randomPojo(RewardActivityUpdateReqVO.class);
|
||||||
|
|
||||||
|
// 调用, 并断言异常
|
||||||
|
assertServiceException(() -> rewardActivityService.updateRewardActivity(reqVO), REWARD_ACTIVITY_NOT_EXISTS);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDeleteRewardActivity_success() {
|
||||||
|
// mock 数据
|
||||||
|
RewardActivityDO dbRewardActivity = randomPojo(RewardActivityDO.class);
|
||||||
|
rewardActivityMapper.insert(dbRewardActivity);// @Sql: 先插入出一条存在的数据
|
||||||
|
// 准备参数
|
||||||
|
Integer id = dbRewardActivity.getId();
|
||||||
|
|
||||||
|
// 调用
|
||||||
|
rewardActivityService.deleteRewardActivity(id);
|
||||||
|
// 校验数据不存在了
|
||||||
|
assertNull(rewardActivityMapper.selectById(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDeleteRewardActivity_notExists() {
|
||||||
|
// 准备参数
|
||||||
|
Integer id = randomIntegerId();
|
||||||
|
|
||||||
|
// 调用, 并断言异常
|
||||||
|
assertServiceException(() -> rewardActivityService.deleteRewardActivity(id), REWARD_ACTIVITY_NOT_EXISTS);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Disabled // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解
|
||||||
|
public void testGetRewardActivityPage() {
|
||||||
|
// mock 数据
|
||||||
|
RewardActivityDO dbRewardActivity = randomPojo(RewardActivityDO.class, o -> { // 等会查询到
|
||||||
|
o.setName(null);
|
||||||
|
o.setStatus(null);
|
||||||
|
});
|
||||||
|
rewardActivityMapper.insert(dbRewardActivity);
|
||||||
|
// 测试 name 不匹配
|
||||||
|
rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setName(null)));
|
||||||
|
// 测试 status 不匹配
|
||||||
|
rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setStatus(null)));
|
||||||
|
// 准备参数
|
||||||
|
RewardActivityPageReqVO reqVO = new RewardActivityPageReqVO();
|
||||||
|
reqVO.setName(null);
|
||||||
|
reqVO.setStatus(null);
|
||||||
|
|
||||||
|
// 调用
|
||||||
|
PageResult<RewardActivityDO> pageResult = rewardActivityService.getRewardActivityPage(reqVO);
|
||||||
|
// 断言
|
||||||
|
assertEquals(1, pageResult.getTotal());
|
||||||
|
assertEquals(1, pageResult.getList().size());
|
||||||
|
assertPojoEquals(dbRewardActivity, pageResult.getList().get(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
@Disabled // TODO 请修改 null 为需要的值,然后删除 @Disabled 注解
|
||||||
|
public void testGetRewardActivityList() {
|
||||||
|
// mock 数据
|
||||||
|
RewardActivityDO dbRewardActivity = randomPojo(RewardActivityDO.class, o -> { // 等会查询到
|
||||||
|
o.setName(null);
|
||||||
|
o.setStatus(null);
|
||||||
|
});
|
||||||
|
rewardActivityMapper.insert(dbRewardActivity);
|
||||||
|
// 测试 name 不匹配
|
||||||
|
rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setName(null)));
|
||||||
|
// 测试 status 不匹配
|
||||||
|
rewardActivityMapper.insert(cloneIgnoreId(dbRewardActivity, o -> o.setStatus(null)));
|
||||||
|
// 准备参数
|
||||||
|
RewardActivityExportReqVO reqVO = new RewardActivityExportReqVO();
|
||||||
|
reqVO.setName(null);
|
||||||
|
reqVO.setStatus(null);
|
||||||
|
|
||||||
|
// 调用
|
||||||
|
List<RewardActivityDO> list = rewardActivityService.getRewardActivityList(reqVO);
|
||||||
|
// 断言
|
||||||
|
assertEquals(1, list.size());
|
||||||
|
assertPojoEquals(dbRewardActivity, list.get(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user