From 8ddba831f049bce3d938fe2482cf9131a660b61e Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 5 Jan 2023 14:39:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E4=BF=83=E9=94=80=E6=B4=BB=E5=8A=A8=E6=90=9C=E7=B4=A2=E5=95=86?= =?UTF-8?q?=E5=93=81=E7=B4=A2=E5=BC=95=E3=80=82=E5=A2=9E=E5=8A=A0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BC=98=E6=83=A0=E5=88=B8=E9=A2=86=E5=8F=96=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=82=E5=A2=9E=E5=8A=A0=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=90=8E=E5=90=8C=E6=97=B6=E4=BD=9C=E5=BA=9F?= =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BC=9A=E5=91=98=E9=A2=86=E5=8F=96=E7=9A=84?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseElasticsearchService.java | 2 +- .../dto/search/MemberCouponSearchParams.java | 13 +++++++++++ .../promotion/mapper/MemberCouponMapper.java | 9 ++++++++ .../service/MemberCouponService.java | 11 ++++++++++ .../serviceimpl/CouponServiceImpl.java | 7 ++++++ .../serviceimpl/MemberCouponServiceImpl.java | 22 +++++++++++++++++++ .../search/entity/dto/EsGoodsSearchDTO.java | 13 +++++++++-- .../serviceimpl/EsGoodsSearchServiceImpl.java | 4 ++++ .../promotion/CouponManagerController.java | 10 +++++++++ .../promotion/CouponStoreController.java | 17 ++++++++++++++ 10 files changed, 105 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java b/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java index 9929ff20b..f5c9fb4f6 100644 --- a/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java +++ b/framework/src/main/java/cn/lili/elasticsearch/BaseElasticsearchService.java @@ -325,7 +325,7 @@ public abstract class BaseElasticsearchService { " }\n" + " },\n" + " \"promotionMapJson\": {\n" + - " \"type\": \"text\"\n" + + " \"type\": \"keyword\"\n" + " },\n" + " \"thumbnail\": {\n" + " \"type\": \"text\",\n" + diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/MemberCouponSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/MemberCouponSearchParams.java index 02f1b8f06..fc20ccee3 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/MemberCouponSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/MemberCouponSearchParams.java @@ -27,8 +27,18 @@ public class MemberCouponSearchParams extends BasePromotionsSearchParams impleme private static final String PRICE_COLUMN = "price"; + @ApiModelProperty(value = "优惠券id") + private String couponId; + + @ApiModelProperty(value = "优惠券名称") + private String couponName; + @ApiModelProperty(value = "会员id") private String memberId; + + @ApiModelProperty(value = "会员名称") + private String memberName; + /** * POINT("打折"), PRICE("减免现金"); * @@ -62,6 +72,9 @@ public class MemberCouponSearchParams extends BasePromotionsSearchParams impleme @Override public QueryWrapper queryWrapper() { QueryWrapper queryWrapper = super.queryWrapper(); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(couponId), "coupon_id", couponId); + queryWrapper.like(CharSequenceUtil.isNotEmpty(couponName), "coupon_name", couponName); + queryWrapper.like(CharSequenceUtil.isNotEmpty(memberName), "member_name", memberName); if (CharSequenceUtil.isNotEmpty(couponType)) { queryWrapper.eq("coupon_type", CouponTypeEnum.valueOf(couponType).name()); } diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java index 6336ae097..fab245375 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java @@ -1,7 +1,13 @@ package cn.lili.modules.promotion.mapper; import cn.lili.modules.promotion.entity.dos.MemberCoupon; +import cn.lili.modules.promotion.entity.vos.MemberCouponVO; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; /** * 会员优惠券数据处理层 @@ -11,4 +17,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface MemberCouponMapper extends BaseMapper { + @Select("SELECT mc.*,c.coupon_name FROM li_member_coupon mc LEFT JOIN li_coupon c ON mc.coupon_id = c.id ${ew.customSqlSegment}") + Page getMemberCoupons(Page page, @Param(Constants.WRAPPER) Wrapper queryWrapper); + } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java b/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java index 7ca8245e9..4bd4fa879 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java @@ -3,7 +3,9 @@ package cn.lili.modules.promotion.service; import cn.lili.common.vo.PageVO; import cn.lili.modules.promotion.entity.dos.MemberCoupon; import cn.lili.modules.promotion.entity.dto.search.MemberCouponSearchParams; +import cn.lili.modules.promotion.entity.vos.MemberCouponVO; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -154,4 +156,13 @@ public interface MemberCouponService extends IService { */ void voidCoupon(String couponId); + /** + * 获取会员优惠券列表 + * + * @param page 分页参数 + * @param param 查询参数 + * @return 会员优惠券列表 + */ + Page getMemberCouponsPage(Page page, MemberCouponSearchParams param); + } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java index 6fd34f3a6..ead9d8b8d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java @@ -166,6 +166,13 @@ public class CouponServiceImpl extends AbstractPromotionsServiceImpl getMemberCouponsPage(Page page, MemberCouponSearchParams param) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getMemberId()), "mc.member_id", param.getMemberId()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getStoreId()), "c.store_id", param.getStoreId()); + queryWrapper.like(CharSequenceUtil.isNotEmpty(param.getMemberName()), "mc.member_name", param.getMemberName()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getCouponId()), "mc.coupon_id", param.getCouponId()); + queryWrapper.like(CharSequenceUtil.isNotEmpty(param.getCouponName()), "c.coupon_name", param.getCouponName()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getGetType()), "mc.get_type", param.getGetType()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getScopeType()), "mc.scope_type", param.getPromotionStatus()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getCouponType()), "mc.coupon_type", param.getCouponType()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(param.getMemberCouponStatus()), "mc.member_coupon_status", param.getMemberCouponStatus()); + if (param.getStartTime() != null) { + queryWrapper.ge("start_time", new Date(param.getStartTime())); + } + if (param.getEndTime() != null) { + queryWrapper.le("end_time", new Date(param.getEndTime())); + } + return this.baseMapper.getMemberCoupons(page, queryWrapper); + } + /** * 清除无效的会员优惠券 * diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java index 305fd5f66..b0cf8c4b5 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java @@ -1,7 +1,7 @@ package cn.lili.modules.search.entity.dto; +import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.utils.RegularUtil; -import cn.lili.common.utils.StringUtils; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -49,9 +49,18 @@ public class EsGoodsSearchDTO { @ApiModelProperty("当前商品skuId,根据当前浏览的商品信息来给用户推荐可能喜欢的商品") private String currentGoodsId; + /** + * @see cn.lili.common.enums.PromotionTypeEnum + */ + @ApiModelProperty("促销活动类型") + private String promotionType; + + @ApiModelProperty(value = "促销活动id") + private String promotionsId; + //过滤搜索关键字 public String getKeyword() { - if (StringUtils.isNotEmpty(keyword)) { + if (CharSequenceUtil.isNotEmpty(keyword)) { RegularUtil.replace(this.keyword); } return keyword; diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java index 7fa6d30b4..80ed1f54c 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java @@ -469,6 +469,10 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { if (CharSequenceUtil.isNotEmpty(searchDTO.getProp())) { this.propSearch(filterBuilder, searchDTO); } + // 促销活动判定 + if (CharSequenceUtil.isNotEmpty(searchDTO.getPromotionsId()) && CharSequenceUtil.isNotEmpty(searchDTO.getPromotionType())) { + filterBuilder.must(QueryBuilders.wildcardQuery("promotionMapJson", "*" + searchDTO.getPromotionType() + "-" + searchDTO.getPromotionsId() + "*")); + } //价格区间判定 if (CharSequenceUtil.isNotEmpty(searchDTO.getPrice())) { String[] prices = searchDTO.getPrice().split("_"); diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java index 8a130ef96..5c2b7485d 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java @@ -10,7 +10,9 @@ import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.Coupon; import cn.lili.modules.promotion.entity.dos.MemberCoupon; import cn.lili.modules.promotion.entity.dto.search.CouponSearchParams; +import cn.lili.modules.promotion.entity.dto.search.MemberCouponSearchParams; import cn.lili.modules.promotion.entity.vos.CouponVO; +import cn.lili.modules.promotion.entity.vos.MemberCouponVO; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.MemberCouponService; import cn.lili.modules.promotion.tools.PromotionTools; @@ -111,6 +113,14 @@ public class CouponManagerController { } + @ApiOperation(value = "获取优惠券领取详情") + @GetMapping(value = "/received") + public ResultMessage> getReceiveByPage(MemberCouponSearchParams searchParams, + PageVO page) { + IPage result = memberCouponService.getMemberCouponsPage(PageUtil.initPage(page), searchParams); + return ResultUtil.data(result); + } + private void setStoreInfo(CouponVO couponVO) { AuthUser currentUser = UserContext.getCurrentUser(); if (currentUser == null) { diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java index 7af2c8e26..af8f1bf25 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java @@ -10,8 +10,12 @@ import cn.lili.common.vo.PageVO; import cn.lili.common.vo.ResultMessage; import cn.lili.modules.promotion.entity.dos.Coupon; import cn.lili.modules.promotion.entity.dto.search.CouponSearchParams; +import cn.lili.modules.promotion.entity.dto.search.MemberCouponSearchParams; import cn.lili.modules.promotion.entity.vos.CouponVO; +import cn.lili.modules.promotion.entity.vos.MemberCouponVO; import cn.lili.modules.promotion.service.CouponService; +import cn.lili.modules.promotion.service.MemberCouponService; +import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; @@ -38,6 +42,10 @@ public class CouponStoreController { @Autowired private CouponService couponService; + + @Autowired + private MemberCouponService memberCouponService; + @GetMapping @ApiOperation(value = "获取优惠券列表") public ResultMessage> getCouponList(CouponSearchParams queryParam, PageVO page) { @@ -91,6 +99,15 @@ public class CouponStoreController { return couponService.removePromotions(filterIds) ? ResultUtil.success() : ResultUtil.error(ResultCode.COUPON_DELETE_ERROR); } + @ApiOperation(value = "获取优惠券领取详情") + @GetMapping(value = "/received") + public ResultMessage> getReceiveByPage(MemberCouponSearchParams searchParams, + PageVO page) { + searchParams.setStoreId(Objects.requireNonNull(UserContext.getCurrentUser()).getStoreId()); + IPage result = memberCouponService.getMemberCouponsPage(PageUtil.initPage(page), searchParams); + return ResultUtil.data(result); + } + @ApiOperation(value = "修改优惠券状态") @PutMapping("/status") public ResultMessage updateCouponStatus(String couponIds, Long startTime, Long endTime) {