From 4718ce292def430924aaa90a6316e69fb62fd6ca Mon Sep 17 00:00:00 2001 From: lifenlong Date: Tue, 13 Jul 2021 16:17:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A0=8D=E4=BB=B7=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KanJiaActivityBuyerController.java | 58 --------- .../KanJiaActivityLogBuyerController.java | 46 ------- .../KanJiaGoodsActivityBuyerController.java | 42 ------- .../KanjiaGoodsActivityBuyerController.java | 111 +++++++++++++++++ ...anJiaActivity.java => KanjiaActivity.java} | 4 +- ...ityGoods.java => KanjiaActivityGoods.java} | 2 +- ...ctivityLog.java => KanjiaActivityLog.java} | 18 +-- ...ctivityDTO.java => KanjiaActivityDTO.java} | 6 +- ...dsDTO.java => KanjiaActivityGoodsDTO.java} | 4 +- ...a => KanjiaActivityGoodsOperationDTO.java} | 4 +- ...ityQuery.java => KanjiaActivityQuery.java} | 2 +- .../entity/vos/KanjiaActivityGoodsListVO.java | 30 +++++ ...ms.java => KanjiaActivityGoodsParams.java} | 19 ++- ...oodsVO.java => KanjiaActivityGoodsVO.java} | 13 +- .../vos/KanjiaActivitySearchParams.java | 42 +++++++ .../mapper/KanJiaActivityGoodsMapper.java | 19 ++- .../mapper/KanJiaActivityLogMapper.java | 4 +- .../mapper/KanJiaActivityMapper.java | 4 +- .../service/KanJiaActivityService.java | 47 ------- ...e.java => KanjiaActivityGoodsService.java} | 39 ++++-- ...ice.java => KanjiaActivityLogService.java} | 10 +- .../service/KanjiaActivityService.java | 58 +++++++++ ...va => KanjiaActivityGoodsServiceImpl.java} | 93 +++++++++----- ...java => KanjiaActivityLogServiceImpl.java} | 47 ++++--- ...pl.java => KanjiaActivityServiceImpl.java} | 116 +++++++++--------- .../serviceimpl/PromotionServiceImpl.java | 6 +- .../KanJiaActivityGoodsManagerController.java | 18 +-- 27 files changed, 478 insertions(+), 384 deletions(-) delete mode 100644 buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityBuyerController.java delete mode 100644 buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityLogBuyerController.java delete mode 100644 buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaGoodsActivityBuyerController.java create mode 100644 buyer-api/src/main/java/cn/lili/controller/promotion/KanjiaGoodsActivityBuyerController.java rename framework/src/main/java/cn/lili/modules/promotion/entity/dos/{KanJiaActivity.java => KanjiaActivity.java} (93%) rename framework/src/main/java/cn/lili/modules/promotion/entity/dos/{KanJiaActivityGoods.java => KanjiaActivityGoods.java} (97%) rename framework/src/main/java/cn/lili/modules/promotion/entity/dos/{KanJiaActivityLog.java => KanjiaActivityLog.java} (65%) rename framework/src/main/java/cn/lili/modules/promotion/entity/dto/{KanJiaActivityDTO.java => KanjiaActivityDTO.java} (68%) rename framework/src/main/java/cn/lili/modules/promotion/entity/dto/{KanJiaActivityGoodsDTO.java => KanjiaActivityGoodsDTO.java} (78%) rename framework/src/main/java/cn/lili/modules/promotion/entity/dto/{KanJiaActivityGoodsOperationDTO.java => KanjiaActivityGoodsOperationDTO.java} (89%) rename framework/src/main/java/cn/lili/modules/promotion/entity/dto/{KanJiaActivityQuery.java => KanjiaActivityQuery.java} (96%) create mode 100644 framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsListVO.java rename framework/src/main/java/cn/lili/modules/promotion/entity/vos/{KanJiaActivityGoodsParams.java => KanjiaActivityGoodsParams.java} (89%) rename framework/src/main/java/cn/lili/modules/promotion/entity/vos/{KanJiaGoodsVO.java => KanjiaActivityGoodsVO.java} (56%) create mode 100644 framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivitySearchParams.java delete mode 100644 framework/src/main/java/cn/lili/modules/promotion/service/KanJiaActivityService.java rename framework/src/main/java/cn/lili/modules/promotion/service/{KanJiaActivityGoodsService.java => KanjiaActivityGoodsService.java} (50%) rename framework/src/main/java/cn/lili/modules/promotion/service/{KanJiaActivityLogService.java => KanjiaActivityLogService.java} (69%) create mode 100644 framework/src/main/java/cn/lili/modules/promotion/service/KanjiaActivityService.java rename framework/src/main/java/cn/lili/modules/promotion/serviceimpl/{KanJiaActivityGoodsServiceImpl.java => KanjiaActivityGoodsServiceImpl.java} (77%) rename framework/src/main/java/cn/lili/modules/promotion/serviceimpl/{KanJiaActivityLogServiceImpl.java => KanjiaActivityLogServiceImpl.java} (53%) rename framework/src/main/java/cn/lili/modules/promotion/serviceimpl/{KanJiaActivityServiceImpl.java => KanjiaActivityServiceImpl.java} (58%) diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityBuyerController.java deleted file mode 100644 index 6261090b..00000000 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityBuyerController.java +++ /dev/null @@ -1,58 +0,0 @@ -package cn.lili.controller.promotion; - -import cn.lili.common.enums.ResultUtil; -import cn.lili.common.security.context.UserContext; -import cn.lili.common.vo.PageVO; -import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.promotion.entity.dos.KanJiaActivity; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityLog; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityQuery; -import cn.lili.modules.promotion.service.KanJiaActivityService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 买家端,砍价活动 - * - * @author qiuqiu - * @date 2021/7/12 - **/ -@RestController -@Api(tags = "买家端,砍价活动参与记录接口") -@RequestMapping("/buyer/promotion/kanJiaActivity") -public class KanJiaActivityBuyerController { - - @Autowired - private KanJiaActivityService kanJiaActivityService; - - @GetMapping - @ApiOperation(value = "分页获取为参与的砍价活动") - public ResultMessage> getPointsGoodsPage(KanJiaActivityQuery kanJiaActivityQuery, PageVO page) { - // 会员端查询到的肯定是已经开始的活动商品 - kanJiaActivityQuery.setMemberId(UserContext.getCurrentUser().getId()); - IPage kanJiaActivityIPage = kanJiaActivityService.getForPage(kanJiaActivityQuery, page); - return ResultUtil.data(kanJiaActivityIPage); - } - - @PostMapping - @ApiOperation(value = "发起砍价活动") - public ResultMessage launchKanJiaActivity(String skuId) { - KanJiaActivityLog kanJiaActivityLog = kanJiaActivityService.add(skuId); - return ResultUtil.data(kanJiaActivityLog); - } - - @PostMapping("/help") - @ApiOperation(value = "帮砍一刀") - public ResultMessage helpKanJia(String kanJiaActivityId) { - KanJiaActivityLog kanJiaActivityLog = kanJiaActivityService.helpKanJia(kanJiaActivityId); - return ResultUtil.data(kanJiaActivityLog); - } - - -} diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityLogBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityLogBuyerController.java deleted file mode 100644 index 9f1f630e..00000000 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityLogBuyerController.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.lili.controller.promotion; - -import cn.lili.common.enums.ResultUtil; -import cn.lili.common.security.context.UserContext; -import cn.lili.common.vo.PageVO; -import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.promotion.entity.dos.KanJiaActivity; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityLog; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityLogQuery; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityQuery; -import cn.lili.modules.promotion.service.KanJiaActivityLogService; -import cn.lili.modules.promotion.service.KanJiaActivityService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 买家端,砍价活动 - * - * @author qiuqiu - * @date 2021/7/12 - **/ -@RestController -@Api(tags = "买家端,砍价活动帮砍记录接口") -@RequestMapping("/buyer/promotion/kanJiaActivityLog") -public class KanJiaActivityLogBuyerController { - - @Autowired - private KanJiaActivityLogService kanJiaActivityLogService; - - @GetMapping - @ApiOperation(value = "分页获取为参与的帮砍记录") - public ResultMessage> getPointsGoodsPage(KanJiaActivityLogQuery kanJiaActivityLogQuery, PageVO page) { - // 会员端查询到的肯定是已经开始的活动商品 - kanJiaActivityLogQuery.setMemberId(UserContext.getCurrentUser().getId()); - IPage kanJiaActivityLogIPage = kanJiaActivityLogService.getForPage(kanJiaActivityLogQuery, page); - return ResultUtil.data(kanJiaActivityLogIPage); - } - - -} diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaGoodsActivityBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaGoodsActivityBuyerController.java deleted file mode 100644 index da295062..00000000 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/KanJiaGoodsActivityBuyerController.java +++ /dev/null @@ -1,42 +0,0 @@ -package cn.lili.controller.promotion; - -import cn.lili.common.enums.ResultUtil; -import cn.lili.common.vo.PageVO; -import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityGoodsDTO; -import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; -import cn.lili.modules.promotion.entity.vos.KanJiaActivityGoodsParams; -import cn.lili.modules.promotion.service.KanJiaActivityGoodsService; -import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 买家端,砍价活动商品 - * - * @author qiuqiu - * @date 2021/7/12 - **/ -@RestController -@Api(tags = "买家端,砍价商品接口") -@RequestMapping("/buyer/promotion/kanJiaGoods") -public class KanJiaGoodsActivityBuyerController { - - @Autowired - private KanJiaActivityGoodsService kanJiaActivityGoodsService; - - @GetMapping - @ApiOperation(value = "分页获取砍价商品") - public ResultMessage> getPointsGoodsPage(KanJiaActivityGoodsParams kanJiaActivityGoodsParams, PageVO page) { - // 会员端查询到的肯定是已经开始的活动商品 - kanJiaActivityGoodsParams.setPromotionStatus(PromotionStatusEnum.START.name()); - IPage kanJiaActivityGoodsDTOIPage = kanJiaActivityGoodsService.getForPage(kanJiaActivityGoodsParams, page); - return ResultUtil.data(kanJiaActivityGoodsDTOIPage); - } - - -} diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/KanjiaGoodsActivityBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/KanjiaGoodsActivityBuyerController.java new file mode 100644 index 00000000..7861251b --- /dev/null +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/KanjiaGoodsActivityBuyerController.java @@ -0,0 +1,111 @@ +package cn.lili.controller.promotion; + +import cn.hutool.core.util.StrUtil; +import cn.lili.common.enums.ResultUtil; +import cn.lili.common.security.context.UserContext; +import cn.lili.common.vo.PageVO; +import cn.lili.common.vo.ResultMessage; +import cn.lili.modules.promotion.entity.dos.KanjiaActivity; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityLog; +import cn.lili.modules.promotion.entity.dto.KanJiaActivityLogQuery; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityQuery; +import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsListVO; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsParams; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsVO; +import cn.lili.modules.promotion.entity.vos.KanjiaActivitySearchParams; +import cn.lili.modules.promotion.service.KanjiaActivityGoodsService; +import cn.lili.modules.promotion.service.KanjiaActivityLogService; +import cn.lili.modules.promotion.service.KanjiaActivityService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * 买家端,砍价活动商品 + * + * @author qiuqiu + * @date 2021/7/12 + **/ +@RestController +@Api(tags = "买家端,砍价商品接口") +@RequestMapping("/buyer/promotion/kanjiaGoods") +public class KanjiaGoodsActivityBuyerController { + + /** + * 砍价活动商品 + */ + @Autowired + private KanjiaActivityGoodsService kanJiaActivityGoodsService; + /** + * 帮砍记录 + */ + @Autowired + private KanjiaActivityLogService kanJiaActivityLogService; + /** + * 砍价活动 + */ + @Autowired + private KanjiaActivityService kanJiaActivityService; + + @GetMapping + @ApiOperation(value = "分页获取砍价商品") + public ResultMessage> kanJiaActivityGoodsPage(KanjiaActivityGoodsParams kanJiaActivityGoodsParams, PageVO page) { + // 会员端查询到的肯定是已经开始的活动商品 + kanJiaActivityGoodsParams.setPromotionStatus(PromotionStatusEnum.START.name()); + return ResultUtil.data(kanJiaActivityGoodsService.kanJiaGoodsVOPage(kanJiaActivityGoodsParams, page)); + } + + @GetMapping("/{id}") + @ApiOperation(value = "获取砍价活动商品") + @ApiImplicitParam(name = "id", value = "砍价活动商品ID", required = true, paramType = "path") + public ResultMessage getPointsGoodsPage(@PathVariable String id) { + return ResultUtil.data(kanJiaActivityGoodsService.getKanJiaGoodsVO(id)); + } + + @GetMapping("/getKanjiaActivity/logs") + @ApiOperation(value = "分页获取砍价活动-帮砍记录") + public ResultMessage> getPointsGoodsPage(KanJiaActivityLogQuery kanJiaActivityLogQuery, PageVO page) { + // 会员端查询到的肯定是已经开始的活动商品 + kanJiaActivityLogQuery.setMemberId(UserContext.getCurrentUser().getId()); + return ResultUtil.data(kanJiaActivityLogService.getForPage(kanJiaActivityLogQuery, page)); + } + + @PostMapping("/getKanjiaActivity") + @ApiOperation(value = "获取砍价活动") + public ResultMessage getKanJiaActivity(KanjiaActivitySearchParams kanJiaActivitySearchParams) { + //如果是非被邀请关系则填写会员ID + if (StrUtil.isEmpty(kanJiaActivitySearchParams.getKanjiaActivityId())) { + kanJiaActivitySearchParams.setMemberId(UserContext.getCurrentUser().getId()); + } + return ResultUtil.data(kanJiaActivityService.getKanjiaActivity(kanJiaActivitySearchParams)); + } + + @PostMapping + @ApiImplicitParam(name = "id", value = "砍价活动商品ID", required = true, paramType = "path") + @ApiOperation(value = "发起砍价活动") + public ResultMessage launchKanJiaActivity(String id) { + KanjiaActivityLog kanJiaActivityLog = kanJiaActivityService.add(id); + return ResultUtil.data(kanJiaActivityLog); + } + + @PostMapping("/help") + @ApiOperation(value = "帮砍一刀") + public ResultMessage helpKanJia(String kanJiaActivityId) { + KanjiaActivityLog kanJiaActivityLog = kanJiaActivityService.helpKanJia(kanJiaActivityId); + return ResultUtil.data(kanJiaActivityLog); + } + + @GetMapping("/kanjiaActivity/mine/") + @ApiOperation(value = "分页获取已参与的砍价活动") + public ResultMessage> getPointsGoodsPage(KanjiaActivityQuery kanJiaActivityQuery, PageVO page) { + // 会员端查询到的肯定是已经开始的活动商品 + kanJiaActivityQuery.setMemberId(UserContext.getCurrentUser().getId()); + IPage kanJiaActivityIPage = kanJiaActivityService.getForPage(kanJiaActivityQuery, page); + return ResultUtil.data(kanJiaActivityIPage); + } + +} diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanJiaActivity.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java similarity index 93% rename from framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanJiaActivity.java rename to framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java index 762f0d3f..e355af54 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanJiaActivity.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivity.java @@ -20,13 +20,13 @@ import javax.persistence.Table; @Table(name = "li_kanjia_activity") @TableName("li_kanjia_activity") @ApiModel(value = "砍价活动参与对象") -public class KanJiaActivity extends BaseEntity { +public class KanjiaActivity extends BaseEntity { private static final long serialVersionUID = -1583030890805926292L; @ApiModelProperty(value = "砍价商品id") - private String kanJiaActivityGoodsId; + private String kanjiaActivityGoodsId; @ApiModelProperty(value = "参与砍价活动会员id") private String memberId; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanJiaActivityGoods.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityGoods.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanJiaActivityGoods.java rename to framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityGoods.java index f7275851..ce8c939b 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanJiaActivityGoods.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityGoods.java @@ -26,7 +26,7 @@ import java.util.Date; @Table(name = "li_kanjia_activity_goods") @TableName("li_kanjia_activity_goods") @ApiModel(value = "砍价活动商品对象") -public class KanJiaActivityGoods extends BaseEntity { +public class KanjiaActivityGoods extends BaseEntity { private static final long serialVersionUID = 6694714877345423488L; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanJiaActivityLog.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java similarity index 65% rename from framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanJiaActivityLog.java rename to framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java index f173d230..1fca0ad1 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanJiaActivityLog.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/KanjiaActivityLog.java @@ -1,19 +1,13 @@ package cn.lili.modules.promotion.entity.dos; import cn.lili.base.BaseEntity; -import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.persistence.Entity; import javax.persistence.Table; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import java.util.Date; /** * 砍价活动商品实体类 @@ -26,25 +20,25 @@ import java.util.Date; @Table(name = "li_kanjia_activity_log") @TableName("li_kanjia_activity_log") @ApiModel(value = "砍价活动日志对象") -public class KanJiaActivityLog extends BaseEntity { +public class KanjiaActivityLog extends BaseEntity { private static final long serialVersionUID = 3977352717995562783L; @ApiModelProperty(value = "砍价活动参与记录id") - private String kanJiaActivityId; + private String kanjiaActivityId; @ApiModelProperty(value = "砍价会员id") - private String kanJiaMemberId; + private String kanjiaMemberId; @ApiModelProperty(value = "砍价会员名称") - private String kanJiaMemberName; + private String kanjiaMemberName; @ApiModelProperty(value = "砍价会员头像") - private String kanJiaMemberFace; + private String kanjiaMemberFace; @ApiModelProperty(value = "砍价金额") - private Double kanJiaPrice; + private Double kanjiaPrice; @ApiModelProperty(value = "剩余购买金额") private Double surplusPrice; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityDTO.java similarity index 68% rename from framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityDTO.java rename to framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityDTO.java index cb1659b4..79ef9ab1 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityDTO.java @@ -1,7 +1,7 @@ package cn.lili.modules.promotion.entity.dto; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityLog; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityLog; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,9 +15,9 @@ import lombok.Data; */ @Data @ApiModel(value = "砍价活动参与记录对象") -public class KanJiaActivityDTO extends KanJiaActivityLog { +public class KanjiaActivityDTO extends KanjiaActivityLog { @ApiModelProperty(value = "砍价金额") - private String kanJiaActivityGoodsId; + private String kanjiaActivityGoodsId; } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityGoodsDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityGoodsDTO.java similarity index 78% rename from framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityGoodsDTO.java rename to framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityGoodsDTO.java index 3518a88b..87e57d88 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityGoodsDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityGoodsDTO.java @@ -2,7 +2,7 @@ package cn.lili.modules.promotion.entity.dto; import cn.lili.modules.goods.entity.dos.GoodsSku; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityGoods; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityGoods; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -15,7 +15,7 @@ import java.io.Serializable; * @date 2020/8/21 **/ @Data -public class KanJiaActivityGoodsDTO extends KanJiaActivityGoods implements Serializable { +public class KanjiaActivityGoodsDTO extends KanjiaActivityGoods implements Serializable { private static final long serialVersionUID = 1969340823809319805L; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityGoodsOperationDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityGoodsOperationDTO.java similarity index 89% rename from framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityGoodsOperationDTO.java rename to framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityGoodsOperationDTO.java index 5ad8f6d6..cfb987f3 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityGoodsOperationDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityGoodsOperationDTO.java @@ -17,7 +17,7 @@ import java.util.List; * @date 2020/8/21 **/ @Data -public class KanJiaActivityGoodsOperationDTO implements Serializable { +public class KanjiaActivityGoodsOperationDTO implements Serializable { private static final long serialVersionUID = -1378599087650538592L; @@ -33,6 +33,6 @@ public class KanJiaActivityGoodsOperationDTO implements Serializable { private Date endTime; @ApiModelProperty(value = "砍价活动商品列表") - List promotionGoodsList; + List promotionGoodsList; } diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityQuery.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityQuery.java similarity index 96% rename from framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityQuery.java rename to framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityQuery.java index 4cd55506..332a7d39 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanJiaActivityQuery.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/KanjiaActivityQuery.java @@ -17,7 +17,7 @@ import java.util.Date; */ @Data @ApiModel(value = "砍价活动参与记录查询对象") -public class KanJiaActivityQuery { +public class KanjiaActivityQuery { private static final long serialVersionUID = -1583030890805926292L; diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsListVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsListVO.java new file mode 100644 index 00000000..29c5ba49 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsListVO.java @@ -0,0 +1,30 @@ +package cn.lili.modules.promotion.entity.vos; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 砍价商品视图对象 + * + * @author paulG + * @date 2021/1/13 + **/ +@Data +public class KanjiaActivityGoodsListVO { + + @ApiModelProperty(value = "货品id") + private String skuId; + + @ApiModelProperty(value = "货品名称") + private String goodsName; + + @ApiModelProperty(value = "缩略图") + private String thumbnail; + + @ApiModelProperty(value = "最低购买金额") + private Double purchasePrice; + + @ApiModelProperty(value = "活动库存") + private Integer stock; + +} diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanJiaActivityGoodsParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsParams.java similarity index 89% rename from framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanJiaActivityGoodsParams.java rename to framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsParams.java index bf61e747..f5bab12a 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanJiaActivityGoodsParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsParams.java @@ -1,19 +1,14 @@ package cn.lili.modules.promotion.entity.vos; -import org.springframework.data.domain.Sort; - -import org.springframework.data.domain.Sort.Direction; - -import org.springframework.data.mongodb.core.query.Criteria; - -import org.springframework.data.mongodb.core.query.Query; - import cn.hutool.core.text.CharSequenceUtil; -import cn.lili.modules.promotion.entity.enums.*; +import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; import java.io.Serializable; import java.util.Date; @@ -26,17 +21,17 @@ import java.util.regex.Pattern; * @date 2020/8/21 **/ @Data -public class KanJiaActivityGoodsParams implements Serializable { +public class KanjiaActivityGoodsParams implements Serializable { private static final long serialVersionUID = 1344104067705714289L; @ApiModelProperty(value = "活动商品") private String goodsName; - @ApiModelProperty(value = "活动开始时间", required = true) + @ApiModelProperty(value = "活动开始时间") private Long startTime; - @ApiModelProperty(value = "活动结束时间", required = true) + @ApiModelProperty(value = "活动结束时间") private Long endTime; @ApiModelProperty(value = "skuId") diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanJiaGoodsVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsVO.java similarity index 56% rename from framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanJiaGoodsVO.java rename to framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsVO.java index 28381e1b..0ca5ba90 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanJiaGoodsVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivityGoodsVO.java @@ -1,10 +1,8 @@ package cn.lili.modules.promotion.entity.vos; import cn.lili.modules.goods.entity.dos.GoodsSku; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityGoods; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; /** * 砍价商品视图对象 @@ -12,13 +10,16 @@ import lombok.EqualsAndHashCode; * @author paulG * @date 2021/1/13 **/ -@EqualsAndHashCode(callSuper = true) @Data -public class KanJiaGoodsVO extends KanJiaActivityGoods { - - private static final long serialVersionUID = -5163709626742905057L; +public class KanjiaActivityGoodsVO { @ApiModelProperty(value = "商品规格详细信息") private GoodsSku goodsSku; + @ApiModelProperty(value = "最低购买金额") + private Double purchasePrice; + + @ApiModelProperty(value = "活动库存") + private Integer stock; + } diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivitySearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivitySearchParams.java new file mode 100644 index 00000000..d60513ee --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/KanjiaActivitySearchParams.java @@ -0,0 +1,42 @@ +package cn.lili.modules.promotion.entity.vos; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * 砍价活动搜索参数 + * + * @author Bulbasaur + * @date: 2021/7/13 2:41 下午 + */ +@Data +public class KanjiaActivitySearchParams { + + @ApiModelProperty(value = "砍价活动ID") + private String id; + + @ApiModelProperty(value = "砍价商品SkuID") + private String kanjiaActivityGoodsId; + + @ApiModelProperty(value = "会员ID" ,hidden = true) + private String memberId; + + @ApiModelProperty(value = "状态") + private String status; + + @ApiModelProperty(value = "邀请活动ID，有值说明是被邀请人") + private String kanjiaActivityId; + + + public QueryWrapper wrapper() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(StrUtil.isNotEmpty(id), "id", id); + queryWrapper.eq(StrUtil.isNotEmpty(kanjiaActivityId), "id", kanjiaActivityId); + queryWrapper.eq(StrUtil.isNotEmpty(kanjiaActivityGoodsId), "kanJia_activity_goods_id", kanjiaActivityGoodsId); + queryWrapper.eq(StrUtil.isNotEmpty(memberId), "member_id", memberId); + queryWrapper.eq(StrUtil.isNotEmpty(status), "status", status); + return wrapper(); + } +} diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityGoodsMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityGoodsMapper.java index d856c2d1..847a4d4c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityGoodsMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityGoodsMapper.java @@ -1,7 +1,13 @@ package cn.lili.modules.promotion.mapper; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityGoods; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityGoods; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsListVO; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * @@ -10,6 +16,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author qiuqiu * @date 2021/7/1 */ -public interface KanJiaActivityGoodsMapper extends BaseMapper { +public interface KanJiaActivityGoodsMapper extends BaseMapper { + + /** + * 获取砍价商品VO分页 + * @param page 分页 + * @param queryWrapper 查询条件 + * @return 砍价商品VO分页 + */ + @Select("SELECT * FROM li_kanjia_activity_goods ${ew.customSqlSegment}") + IPage kanjiaActivityGoodsVOPage(IPage page, @Param(Constants.WRAPPER) Wrapper queryWrapper); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityLogMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityLogMapper.java index 5a58d6e8..2a297688 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityLogMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityLogMapper.java @@ -1,6 +1,6 @@ package cn.lili.modules.promotion.mapper; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityLog; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -10,6 +10,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author qiuqiu * @date 2021/7/1 */ -public interface KanJiaActivityLogMapper extends BaseMapper { +public interface KanJiaActivityLogMapper extends BaseMapper { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityMapper.java index 23bdc3dd..237aa46a 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/KanJiaActivityMapper.java @@ -1,6 +1,6 @@ package cn.lili.modules.promotion.mapper; -import cn.lili.modules.promotion.entity.dos.KanJiaActivity; +import cn.lili.modules.promotion.entity.dos.KanjiaActivity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** @@ -10,6 +10,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @author qiuqiu * @date 2021/7/1 */ -public interface KanJiaActivityMapper extends BaseMapper { +public interface KanJiaActivityMapper extends BaseMapper { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/KanJiaActivityService.java b/framework/src/main/java/cn/lili/modules/promotion/service/KanJiaActivityService.java deleted file mode 100644 index 99aafa7a..00000000 --- a/framework/src/main/java/cn/lili/modules/promotion/service/KanJiaActivityService.java +++ /dev/null @@ -1,47 +0,0 @@ -package cn.lili.modules.promotion.service; - - -import cn.lili.common.vo.PageVO; -import cn.lili.modules.promotion.entity.dos.KanJiaActivity; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityLog; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityGoodsDTO; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityQuery; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; - - -/** - * 砍价活动参与记录业务层 - * - * @author qiuqiu - * @date 2021/7/1 9:45 上午 - */ -public interface KanJiaActivityService extends IService { - - /** - * 发起人发起砍价活动 - * - * @param skuId 商品skuId - * @return - */ - KanJiaActivityLog add(String skuId); - - /** - * 帮砍 - * - * @param kanJiaActivityId 活动id - * @return 砍价详细 - */ - KanJiaActivityLog helpKanJia(String kanJiaActivityId); - - /** - * 根据条件查询我参与的砍价活动 - * - * @param kanJiaActivityQuery 砍价活动查询条件 - * @param page 分页对象 - * @return 我参与的砍价活动信息 - */ - IPage getForPage(KanJiaActivityQuery kanJiaActivityQuery, PageVO page); - - -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/KanJiaActivityGoodsService.java b/framework/src/main/java/cn/lili/modules/promotion/service/KanjiaActivityGoodsService.java similarity index 50% rename from framework/src/main/java/cn/lili/modules/promotion/service/KanJiaActivityGoodsService.java rename to framework/src/main/java/cn/lili/modules/promotion/service/KanjiaActivityGoodsService.java index d5241213..d6f489a4 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/KanJiaActivityGoodsService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/KanjiaActivityGoodsService.java @@ -2,11 +2,12 @@ package cn.lili.modules.promotion.service; import cn.lili.common.vo.PageVO; -import cn.lili.modules.promotion.entity.dos.KanJiaActivity; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityGoods; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityGoodsDTO; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityGoodsOperationDTO; -import cn.lili.modules.promotion.entity.vos.KanJiaActivityGoodsParams; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityGoods; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsDTO; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsOperationDTO; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsListVO; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsParams; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -19,7 +20,7 @@ import java.util.List; * @author qiuqiu * @date 2021/7/1 9:45 上午 */ -public interface KanJiaActivityGoodsService extends IService { +public interface KanjiaActivityGoodsService extends IService { /** @@ -28,7 +29,7 @@ public interface KanJiaActivityGoodsService extends IService getForPage(KanJiaActivityGoodsParams kanJiaActivityGoodsParams, PageVO pageVO); + IPage getForPage(KanjiaActivityGoodsParams kanJiaActivityGoodsParams, PageVO pageVO); + + /** + * 查询砍价活动商品分页信息 + * + * @param kanJiaActivityGoodsParams 砍价活动商品 + * @param pageVO 分页信息 + * @return 砍价商品 + */ + IPage kanJiaGoodsVOPage(KanjiaActivityGoodsParams kanJiaActivityGoodsParams, PageVO pageVO); /** * 查询砍价活动商品 @@ -45,7 +55,14 @@ public interface KanJiaActivityGoodsService extends IService { +public interface KanjiaActivityLogService extends IService { /** * 根据砍价参与记录id查询砍价记录 @@ -24,7 +24,7 @@ public interface KanJiaActivityLogService extends IService { * @param pageVO 分页信息 * @return 砍价日志 */ - IPage getForPage(KanJiaActivityLogQuery kanJiaActivityLogQuery, PageVO pageVO); + IPage getForPage(KanJiaActivityLogQuery kanJiaActivityLogQuery, PageVO pageVO); /** * 砍一刀 @@ -32,5 +32,5 @@ public interface KanJiaActivityLogService extends IService { * @param kanJiaActivityDTO 砍价记录 * @return */ - KanJiaActivityLog addKanJiaActivityLog(KanJiaActivityDTO kanJiaActivityDTO); + KanjiaActivityLog addKanJiaActivityLog(KanjiaActivityDTO kanJiaActivityDTO); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/KanjiaActivityService.java b/framework/src/main/java/cn/lili/modules/promotion/service/KanjiaActivityService.java new file mode 100644 index 00000000..26dd8259 --- /dev/null +++ b/framework/src/main/java/cn/lili/modules/promotion/service/KanjiaActivityService.java @@ -0,0 +1,58 @@ +package cn.lili.modules.promotion.service; + + +import cn.lili.common.vo.PageVO; +import cn.lili.modules.promotion.entity.dos.KanjiaActivity; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityLog; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityQuery; +import cn.lili.modules.promotion.entity.vos.KanjiaActivitySearchParams; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; + + +/** + * 砍价活动参与记录业务层 + * + * @author qiuqiu + * @date 2021/7/1 9:45 上午 + */ +public interface KanjiaActivityService extends IService { + + /** + * 获取砍价活动 + * + * 有值说明是已参加的砍价活动 + * 没有值说明是未参加的砍价活动 + * + * @param kanJiaActivitySearchParams 砍价活动搜索参数 + * @return 砍价活动 + */ + KanjiaActivity getKanjiaActivity(KanjiaActivitySearchParams kanJiaActivitySearchParams); + + /** + * 发起人发起砍价活动 + * + * @param id 活动ID + * @return + */ + KanjiaActivityLog add(String id); + + /** + * 帮砍 + * + * @param kanJiaActivityId 活动id + * @return 砍价详细 + */ + KanjiaActivityLog helpKanJia(String kanJiaActivityId); + + /** + * 根据条件查询我参与的砍价活动 + * + * @param kanJiaActivityQuery 砍价活动查询条件 + * @param page 分页对象 + * @return 我参与的砍价活动信息 + */ + IPage getForPage(KanjiaActivityQuery kanJiaActivityQuery, PageVO page); + + +} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanJiaActivityGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java similarity index 77% rename from framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanJiaActivityGoodsServiceImpl.java rename to framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java index 5ef4a384..2b00287d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanJiaActivityGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityGoodsServiceImpl.java @@ -11,19 +11,22 @@ import cn.lili.common.trigger.model.TimeExecuteConstant; import cn.lili.common.trigger.model.TimeTriggerMsg; import cn.lili.common.trigger.util.DelayQueueTools; import cn.lili.common.utils.DateUtil; +import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; import cn.lili.config.rocketmq.RocketmqCustomProperties; import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.entity.enums.GoodsStatusEnum; import cn.lili.modules.goods.service.GoodsSkuService; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityGoods; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityGoodsDTO; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityGoodsOperationDTO; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityGoods; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsDTO; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsOperationDTO; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; import cn.lili.modules.promotion.entity.enums.PromotionTypeEnum; -import cn.lili.modules.promotion.entity.vos.KanJiaActivityGoodsParams; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsListVO; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsParams; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsVO; import cn.lili.modules.promotion.mapper.KanJiaActivityGoodsMapper; -import cn.lili.modules.promotion.service.KanJiaActivityGoodsService; +import cn.lili.modules.promotion.service.KanjiaActivityGoodsService; import cn.lili.modules.promotion.tools.PromotionTools; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -47,7 +50,7 @@ import java.util.List; */ @Service @Transactional(rollbackFor = Exception.class) -public class KanJiaActivityGoodsServiceImpl extends ServiceImpl implements KanJiaActivityGoodsService { +public class KanjiaActivityGoodsServiceImpl extends ServiceImpl implements KanjiaActivityGoodsService { //规格商品 @Autowired @@ -67,9 +70,9 @@ public class KanJiaActivityGoodsServiceImpl extends ServiceImpl kanJiaActivityGoodsList = new ArrayList<>(); - for (KanJiaActivityGoodsDTO kanJiaActivityGoodsDTO : kanJiaActivityGoodsOperationDTO.getPromotionGoodsList()) { + public boolean add(KanjiaActivityGoodsOperationDTO kanJiaActivityGoodsOperationDTO) { + List kanjiaActivityGoodsList = new ArrayList<>(); + for (KanjiaActivityGoodsDTO kanJiaActivityGoodsDTO : kanJiaActivityGoodsOperationDTO.getPromotionGoodsList()) { //根据skuId查询商品信息 GoodsSku goodsSku = this.checkSkuExist(kanJiaActivityGoodsDTO.getSkuId()); //参数检测 @@ -87,12 +90,12 @@ public class KanJiaActivityGoodsServiceImpl extends ServiceImpl getForPage(KanJiaActivityGoodsParams kanJiaActivityGoodsParams, PageVO pageVO) { - IPage kanJiaActivityGoodsDTOIPage = new Page<>(); + public IPage getForPage(KanjiaActivityGoodsParams kanJiaActivityGoodsParams, PageVO pageVO) { + IPage kanJiaActivityGoodsDTOIPage = new Page<>(); Query query = kanJiaActivityGoodsParams.mongoQuery(); if (pageVO != null) { PromotionTools.mongoQueryPageParam(query, pageVO); kanJiaActivityGoodsDTOIPage.setSize(pageVO.getPageSize()); kanJiaActivityGoodsDTOIPage.setCurrent(pageVO.getPageNumber()); } - List kanJiaActivityGoodsDTOS = this.mongoTemplate.find(query, KanJiaActivityGoodsDTO.class); + List kanJiaActivityGoodsDTOS = this.mongoTemplate.find(query, KanjiaActivityGoodsDTO.class); kanJiaActivityGoodsDTOIPage.setRecords(kanJiaActivityGoodsDTOS); - kanJiaActivityGoodsDTOIPage.setTotal(this.mongoTemplate.count(kanJiaActivityGoodsParams.mongoQuery(), KanJiaActivityGoodsDTO.class)); + kanJiaActivityGoodsDTOIPage.setTotal(this.mongoTemplate.count(kanJiaActivityGoodsParams.mongoQuery(), KanjiaActivityGoodsDTO.class)); return kanJiaActivityGoodsDTOIPage; } + @Override + public IPage kanJiaGoodsVOPage(KanjiaActivityGoodsParams kanjiaActivityGoodsParams, PageVO pageVO) { + return this.baseMapper.kanjiaActivityGoodsVOPage(PageUtil.initPage(pageVO),kanjiaActivityGoodsParams.wrapper()); + } + /** * 检查商品Sku是否存 @@ -157,7 +165,7 @@ public class KanJiaActivityGoodsServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(KanJiaActivityGoods::getSkuId, skuId); + private KanjiaActivityGoods checkSkuDuplicate(String skuId, KanjiaActivityGoodsDTO kanJiaActivityGoodsDTO) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(KanjiaActivityGoods::getSkuId, skuId); if (kanJiaActivityGoodsDTO != null && StrUtil.isNotEmpty(kanJiaActivityGoodsDTO.getId())) { - queryWrapper.ne(KanJiaActivityGoods::getId, kanJiaActivityGoodsDTO.getId()); + queryWrapper.ne(KanjiaActivityGoods::getId, kanJiaActivityGoodsDTO.getId()); } - queryWrapper.ne(KanJiaActivityGoods::getPromotionStatus, PromotionStatusEnum.END.name()); + queryWrapper.ne(KanjiaActivityGoods::getPromotionStatus, PromotionStatusEnum.END.name()); - queryWrapper.ge(KanJiaActivityGoods::getStartTime, kanJiaActivityGoodsDTO.getStartTime()); + queryWrapper.ge(KanjiaActivityGoods::getStartTime, kanJiaActivityGoodsDTO.getStartTime()); - queryWrapper.le(KanJiaActivityGoods::getEndTime, kanJiaActivityGoodsDTO.getEndTime()); + queryWrapper.le(KanjiaActivityGoods::getEndTime, kanJiaActivityGoodsDTO.getEndTime()); return this.getOne(queryWrapper); } @Override - public KanJiaActivityGoodsDTO getKanJiaGoodsDetail(String goodsId) { - KanJiaActivityGoodsDTO kanJiaActivityGoodsDTO = this.mongoTemplate.findById(goodsId, KanJiaActivityGoodsDTO.class); + public KanjiaActivityGoodsDTO getKanJiaGoodsDetail(String goodsId) { + KanjiaActivityGoodsDTO kanJiaActivityGoodsDTO = this.mongoTemplate.findById(goodsId, KanjiaActivityGoodsDTO.class); if (kanJiaActivityGoodsDTO == null) { log.error("id为" + goodsId + "的砍价商品不存在！"); throw new ServiceException(); @@ -226,9 +234,26 @@ public class KanJiaActivityGoodsServiceImpl extends ServiceImpl ids) { List skuIds = new ArrayList<>(); for (String id : ids) { - KanJiaActivityGoodsDTO kanJiaActivityGoodsDTO = this.getKanJiaGoodsDetail(id); + KanjiaActivityGoodsDTO kanJiaActivityGoodsDTO = this.getKanJiaGoodsDetail(id); this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR, kanJiaActivityGoodsDTO.getStartTime().getTime(), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (PromotionTypeEnum.KAN_JIA.name() + kanJiaActivityGoodsDTO.getId())), @@ -282,21 +307,21 @@ public class KanJiaActivityGoodsServiceImpl extends ServiceImpl kanJiaActivityGoodsDTOS = this.mongoTemplate.find(query, KanJiaActivityGoodsDTO.class); + List kanJiaActivityGoodsDTOS = this.mongoTemplate.find(query, KanjiaActivityGoodsDTO.class); // 为了担心会查到多条数据 所以查询集合 正常情况下只会查询到一条 if (kanJiaActivityGoodsDTOS.size() > 0) { return kanJiaActivityGoodsDTOS.get(0); diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanJiaActivityLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java similarity index 53% rename from framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanJiaActivityLogServiceImpl.java rename to framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java index dea84c2a..dada60d4 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanJiaActivityLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityLogServiceImpl.java @@ -3,20 +3,19 @@ package cn.lili.modules.promotion.serviceimpl; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; -import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.BeanUtil; import cn.lili.common.utils.PageUtil; import cn.lili.common.vo.PageVO; -import cn.lili.modules.promotion.entity.dos.KanJiaActivity; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityGoods; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityLog; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityDTO; +import cn.lili.modules.promotion.entity.dos.KanjiaActivity; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityGoods; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityLog; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityDTO; import cn.lili.modules.promotion.entity.dto.KanJiaActivityLogQuery; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; import cn.lili.modules.promotion.mapper.KanJiaActivityLogMapper; -import cn.lili.modules.promotion.service.KanJiaActivityGoodsService; -import cn.lili.modules.promotion.service.KanJiaActivityLogService; -import cn.lili.modules.promotion.service.KanJiaActivityService; +import cn.lili.modules.promotion.service.KanjiaActivityGoodsService; +import cn.lili.modules.promotion.service.KanjiaActivityLogService; +import cn.lili.modules.promotion.service.KanjiaActivityService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -33,41 +32,41 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional(rollbackFor = Exception.class) -public class KanJiaActivityLogServiceImpl extends ServiceImpl implements KanJiaActivityLogService { +public class KanjiaActivityLogServiceImpl extends ServiceImpl implements KanjiaActivityLogService { @Autowired - private KanJiaActivityGoodsService kanJiaActivityGoodsService; + private KanjiaActivityGoodsService kanJiaActivityGoodsService; @Autowired - private KanJiaActivityService kanJiaActivityService; + private KanjiaActivityService kanJiaActivityService; @Override - public IPage getForPage(KanJiaActivityLogQuery kanJiaActivityLogQuery, PageVO pageVO) { - QueryWrapper queryWrapper = kanJiaActivityLogQuery.wrapper(); + public IPage getForPage(KanJiaActivityLogQuery kanJiaActivityLogQuery, PageVO pageVO) { + QueryWrapper queryWrapper = kanJiaActivityLogQuery.wrapper(); return this.page(PageUtil.initPage(pageVO), queryWrapper); } @Override - public KanJiaActivityLog addKanJiaActivityLog(KanJiaActivityDTO kanJiaActivityDTO) { + public KanjiaActivityLog addKanJiaActivityLog(KanjiaActivityDTO kanjiaActivityDTO) { //校验当前会员是否已经参与过此次砍价 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(kanJiaActivityDTO.getKanJiaMemberId() != null, "kan_jia_member_id", kanJiaActivityDTO.getKanJiaMemberId()); - queryWrapper.eq(kanJiaActivityDTO.getKanJiaActivityId() != null, "kan_jia_activity_id", kanJiaActivityDTO.getKanJiaActivityId()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(kanjiaActivityDTO.getKanjiaMemberId() != null, "kan_jia_member_id", kanjiaActivityDTO.getKanjiaMemberId()); + queryWrapper.eq(kanjiaActivityDTO.getKanjiaActivityId() != null, "kan_jia_activity_id", kanjiaActivityDTO.getKanjiaActivityId()); Integer count = this.baseMapper.selectCount(queryWrapper); if (count > 0) { throw new ServiceException(ResultCode.KANJIA_ACTIVITY_LOG_MEMBER_ERROR); } //校验当前砍价商品是否有效 - KanJiaActivityGoods kanJiaActivityGoods = kanJiaActivityGoodsService.getById(kanJiaActivityDTO.getKanJiaActivityGoodsId()); + KanjiaActivityGoods kanjiaActivityGoods = kanJiaActivityGoodsService.getById(kanjiaActivityDTO.getKanjiaActivityGoodsId()); //如果当前活动不为空且还在活动时间内 才可以参与砍价活动 - if (kanJiaActivityGoods != null && kanJiaActivityGoods.getPromotionStatus().equals(PromotionStatusEnum.START.name())) { + if (kanjiaActivityGoods != null && kanjiaActivityGoods.getPromotionStatus().equals(PromotionStatusEnum.START.name())) { //获取砍价参与者记录 - KanJiaActivity kanJiaActivity = kanJiaActivityService.getById(kanJiaActivityDTO.getKanJiaActivityId()); - if (kanJiaActivity != null) { - KanJiaActivityLog kanJiaActivityLog = new KanJiaActivityLog(); - kanJiaActivityLog.setKanJiaActivityId(kanJiaActivity.getId()); - BeanUtil.copyProperties(kanJiaActivityDTO, kanJiaActivityLog); + KanjiaActivity kanjiaActivity = kanJiaActivityService.getById(kanjiaActivityDTO.getKanjiaActivityId()); + if (kanjiaActivity != null) { + KanjiaActivityLog kanJiaActivityLog = new KanjiaActivityLog(); + kanJiaActivityLog.setKanjiaActivityId(kanjiaActivity.getId()); + BeanUtil.copyProperties(kanjiaActivityDTO, kanJiaActivityLog); boolean result = this.save(kanJiaActivityLog); if (result) { return kanJiaActivityLog; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanJiaActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java similarity index 58% rename from framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanJiaActivityServiceImpl.java rename to framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java index e7975a2f..268d4320 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanJiaActivityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/KanjiaActivityServiceImpl.java @@ -11,17 +11,18 @@ import cn.lili.modules.goods.entity.dos.GoodsSku; import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.service.MemberService; -import cn.lili.modules.promotion.entity.dos.KanJiaActivity; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityGoods; -import cn.lili.modules.promotion.entity.dos.KanJiaActivityLog; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityDTO; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityQuery; +import cn.lili.modules.promotion.entity.dos.KanjiaActivity; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityGoods; +import cn.lili.modules.promotion.entity.dos.KanjiaActivityLog; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityDTO; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityQuery; import cn.lili.modules.promotion.entity.enums.KanJiaStatusEnum; import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum; +import cn.lili.modules.promotion.entity.vos.KanjiaActivitySearchParams; import cn.lili.modules.promotion.mapper.KanJiaActivityMapper; -import cn.lili.modules.promotion.service.KanJiaActivityGoodsService; -import cn.lili.modules.promotion.service.KanJiaActivityLogService; -import cn.lili.modules.promotion.service.KanJiaActivityService; +import cn.lili.modules.promotion.service.KanjiaActivityGoodsService; +import cn.lili.modules.promotion.service.KanjiaActivityLogService; +import cn.lili.modules.promotion.service.KanjiaActivityService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -38,45 +39,44 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @Transactional(rollbackFor = Exception.class) -public class KanJiaActivityServiceImpl extends ServiceImpl implements KanJiaActivityService { - +public class KanjiaActivityServiceImpl extends ServiceImpl implements KanjiaActivityService { @Autowired - private KanJiaActivityGoodsService kanJiaActivityGoodsService; - + private KanjiaActivityGoodsService kanjiaActivityGoodsService; @Autowired - private KanJiaActivityLogService kanJiaActivityLogService; - - + private KanjiaActivityLogService kanjiaActivityLogService; @Autowired private MemberService memberService; - - //规格商品 @Autowired private GoodsSkuService goodsSkuService; @Override - public KanJiaActivityLog add(String skuId) { + public KanjiaActivity getKanjiaActivity(KanjiaActivitySearchParams kanJiaActivitySearchParams) { + return this.getOne(kanJiaActivitySearchParams.wrapper()); + } + + @Override + public KanjiaActivityLog add(String id) { //根据skuId查询当前sku是否参与活动并且是在活动进行中 - KanJiaActivityGoods kanJiaActivityGoods = kanJiaActivityGoodsService.getKanJiaGoodsBySku(skuId); + KanjiaActivityGoods kanJiaActivityGoods = kanjiaActivityGoodsService.getById(id); //只有砍价商品存在且已经开始的活动才可以发起砍价 if (kanJiaActivityGoods != null && kanJiaActivityGoods.getPromotionStatus().equals(PromotionStatusEnum.START.name())) { //获取会员信息 Member member = memberService.getById(UserContext.getCurrentUser().getId()); //校验此活动是否已经发起过 - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("kan_jia_activity_goods_id", kanJiaActivityGoods.getId()); queryWrapper.eq("member_id", member.getId()); if (this.count(queryWrapper) > 0) { throw new ServiceException(ResultCode.KANJIA_ACTIVITY_MEMBER_ERROR); } - KanJiaActivity kanJiaActivity = new KanJiaActivity(); + KanjiaActivity kanJiaActivity = new KanjiaActivity(); //获取商品信息 - GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(skuId); + GoodsSku goodsSku = goodsSkuService.getGoodsSkuByIdFromCache(kanJiaActivityGoods.getSkuId()); if (goodsSku != null && member != null) { - kanJiaActivity.setSkuId(skuId); + kanJiaActivity.setSkuId(kanJiaActivityGoods.getSkuId()); kanJiaActivity.setGoodsName(goodsSku.getGoodsName()); - kanJiaActivity.setKanJiaActivityGoodsId(kanJiaActivityGoods.getId()); + kanJiaActivity.setKanjiaActivityGoodsId(kanJiaActivityGoods.getId()); kanJiaActivity.setThumbnail(goodsSku.getThumbnail()); kanJiaActivity.setMemberId(UserContext.getCurrentUser().getId()); kanJiaActivity.setMemberName(member.getUsername()); @@ -84,22 +84,22 @@ public class KanJiaActivityServiceImpl extends ServiceImpl surplusPrice) { + if (kanjiaActivityGoods.getLowestPrice() > surplusPrice) { return surplusPrice; } Double price = 0D; while (true) { - price = CurrencyUtil.round(num + kanJiaActivityGoods.getLowestPrice(), 2); + price = CurrencyUtil.round(num + kanjiaActivityGoods.getLowestPrice(), 2); //从最大金额和最小金额之间获取随机砍价金额 if (price < surplusPrice) { break; @@ -176,8 +176,8 @@ public class KanJiaActivityServiceImpl extends ServiceImpl getForPage(KanJiaActivityQuery kanJiaActivityQuery, PageVO page) { - QueryWrapper queryWrapper = kanJiaActivityQuery.wrapper(); + public IPage getForPage(KanjiaActivityQuery kanjiaActivityQuery, PageVO page) { + QueryWrapper queryWrapper = kanjiaActivityQuery.wrapper(); return this.page(PageUtil.initPage(page), queryWrapper); } diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java index e193325f..7d452e97 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java @@ -9,7 +9,7 @@ import cn.lili.common.exception.ServiceException; import cn.lili.common.trigger.message.PromotionMessage; import cn.lili.modules.order.cart.entity.vo.FullDiscountVO; import cn.lili.modules.promotion.entity.dos.*; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityGoodsDTO; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsDTO; import cn.lili.modules.promotion.entity.enums.*; import cn.lili.modules.promotion.entity.vos.CouponVO; import cn.lili.modules.promotion.entity.vos.PintuanVO; @@ -98,7 +98,7 @@ public class PromotionServiceImpl implements PromotionService { @Autowired private MongoTemplate mongoTemplate; @Autowired - private KanJiaActivityGoodsService kanJiaActivityGoodsService; + private KanjiaActivityGoodsService kanJiaActivityGoodsService; @Override @@ -465,7 +465,7 @@ public class PromotionServiceImpl implements PromotionService { * @return 修改结果 */ private boolean updateKanJiaGoods(PromotionMessage promotionMessage, PromotionTypeEnum promotionTypeEnum) { - KanJiaActivityGoodsDTO kanJiaActivityGoodsDTO = this.mongoTemplate.findById(promotionMessage.getPromotionId(), KanJiaActivityGoodsDTO.class); + KanjiaActivityGoodsDTO kanJiaActivityGoodsDTO = this.mongoTemplate.findById(promotionMessage.getPromotionId(), KanjiaActivityGoodsDTO.class); if (kanJiaActivityGoodsDTO == null) { this.throwPromotionException(promotionTypeEnum, promotionMessage.getPromotionId(), promotionMessage.getPromotionStatus()); return false; diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java index 93970a30..78411283 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java @@ -6,10 +6,10 @@ import cn.lili.common.enums.ResultUtil; import cn.lili.common.exception.ServiceException; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityGoodsDTO; -import cn.lili.modules.promotion.entity.dto.KanJiaActivityGoodsOperationDTO; -import cn.lili.modules.promotion.entity.vos.KanJiaActivityGoodsParams; -import cn.lili.modules.promotion.service.KanJiaActivityGoodsService; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsDTO; +import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsOperationDTO; +import cn.lili.modules.promotion.entity.vos.KanjiaActivityGoodsParams; +import cn.lili.modules.promotion.service.KanjiaActivityGoodsService; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -31,11 +31,11 @@ import java.util.Arrays; public class KanJiaActivityGoodsManagerController { @Autowired - private KanJiaActivityGoodsService kanJiaActivityGoodsService; + private KanjiaActivityGoodsService kanJiaActivityGoodsService; @PostMapping @ApiOperation(value = "添加砍价活动") - public ResultMessage add(@RequestBody KanJiaActivityGoodsOperationDTO kanJiaActivityGoodsOperationDTO) { + public ResultMessage add(@RequestBody KanjiaActivityGoodsOperationDTO kanJiaActivityGoodsOperationDTO) { kanJiaActivityGoodsService.add(kanJiaActivityGoodsOperationDTO); return ResultUtil.success(); } @@ -43,7 +43,7 @@ public class KanJiaActivityGoodsManagerController { @ApiOperation(value = "获取砍价活动分页") @GetMapping - public ResultMessage> getKanJiaActivityPage(KanJiaActivityGoodsParams KanJiaActivityParams, PageVO page) { + public ResultMessage> getKanJiaActivityPage(KanjiaActivityGoodsParams KanJiaActivityParams, PageVO page) { return ResultUtil.data(kanJiaActivityGoodsService.getForPage(KanJiaActivityParams, page)); } @@ -51,14 +51,14 @@ public class KanJiaActivityGoodsManagerController { @GetMapping("/{id}") @ApiOperation(value = "获取积分商品详情") public ResultMessage getPointsGoodsDetail(@PathVariable("id") String goodsId) { - KanJiaActivityGoodsDTO kanJiaActivityGoodsDTO = kanJiaActivityGoodsService.getKanJiaGoodsDetail(goodsId); + KanjiaActivityGoodsDTO kanJiaActivityGoodsDTO = kanJiaActivityGoodsService.getKanJiaGoodsDetail(goodsId); return ResultUtil.data(kanJiaActivityGoodsDTO); } @PutMapping @ApiOperation(value = "修改砍价商品") - public ResultMessage updatePointsGoods(@RequestBody KanJiaActivityGoodsDTO kanJiaActivityGoodsDTO) { + public ResultMessage updatePointsGoods(@RequestBody KanjiaActivityGoodsDTO kanJiaActivityGoodsDTO) { kanJiaActivityGoodsService.updateKanJiaActivityGoods(kanJiaActivityGoodsDTO); return ResultUtil.success(); }