From b1ac3a0b8b6b832cd4dadb2c0be88c5c869dd4ff Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Tue, 26 Sep 2023 22:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=EF=BC=9A=E5=AE=8C?=
=?UTF-8?q?=E5=96=84=E4=BC=98=E6=83=A0=E5=88=B8=E5=8C=B9=E9=85=8D=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../app/coupon/AppCouponController.java | 32 ++-----------------
.../convert/coupon/CouponConvert.java | 4 +++
.../dal/mysql/coupon/CouponMapper.java | 21 ++++++++++++
.../service/coupon/CouponService.java | 10 ++++++
.../service/coupon/CouponServiceImpl.java | 7 ++++
.../vo/AppTradeOrderSettlementRespVO.java | 2 ++
6 files changed, 46 insertions(+), 30 deletions(-)
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
index 625df7942..d366459fc 100755
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/coupon/AppCouponController.java
@@ -17,11 +17,8 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.Random;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
@@ -42,36 +39,11 @@ public class AppCouponController {
return success(1L);
}
- // TODO 芋艿：待实现
@GetMapping("/match-list")
@Operation(summary = "获得匹配指定商品的优惠劵列表")
public CommonResult<List<AppCouponMatchRespVO>> getMatchCouponList(AppCouponMatchReqVO matchReqVO) {
- List<AppCouponMatchRespVO> list = new ArrayList<>();
- Random random = new Random();
- for (int i = 0; i < 10; i++) {
- AppCouponMatchRespVO vo = new AppCouponMatchRespVO();
- vo.setId(i + 1L);
- vo.setName("优惠劵" + (i + 1));
- vo.setUsePrice(random.nextInt(100) * 100);
- vo.setValidStartTime(LocalDateTime.now().plusDays(random.nextInt(10)));
- vo.setValidEndTime(LocalDateTime.now().plusDays(random.nextInt(20) + 10));
- vo.setDiscountType(random.nextInt(2) + 1);
- if (vo.getDiscountType() == 1) {
- vo.setDiscountPercent(null);
- vo.setDiscountPrice(random.nextInt(50) * 100);
- vo.setDiscountLimitPrice(null);
- } else {
- vo.setDiscountPercent(random.nextInt(90) + 10);
- vo.setDiscountPrice(null);
- vo.setDiscountLimitPrice(random.nextInt(200) * 100);
- }
- vo.setMatch(random.nextBoolean());
- if (!vo.getMatch()) {
- vo.setDescription("不符合条件噢");
- }
- list.add(vo);
- }
- return success(list);
+ // todo: 优惠金额倒序
+ return success(CouponConvert.INSTANCE.convertList(couponService.getMatchCouponList(getLoginUserId(), matchReqVO)));
}
@GetMapping("/page")
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/coupon/CouponConvert.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/coupon/CouponConvert.java
index d2359e7c7..3fc42dbe2 100755
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/coupon/CouponConvert.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/coupon/CouponConvert.java
@@ -4,6 +4,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.promotion.api.coupon.dto.CouponRespDTO;
import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.coupon.CouponPageItemRespVO;
import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.coupon.CouponPageReqVO;
+import cn.iocoder.yudao.module.promotion.controller.app.coupon.vo.coupon.AppCouponMatchRespVO;
import cn.iocoder.yudao.module.promotion.controller.app.coupon.vo.coupon.AppCouponPageReqVO;
import cn.iocoder.yudao.module.promotion.controller.app.coupon.vo.coupon.AppCouponRespVO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponDO;
@@ -15,6 +16,7 @@ import org.mapstruct.factory.Mappers;
import java.time.LocalDateTime;
import java.util.Collection;
+import java.util.List;
/**
* 优惠劵 Convert
@@ -57,4 +59,6 @@ public interface CouponConvert {
CouponPageReqVO convert(AppCouponPageReqVO pageReqVO, Collection<Long> userIds);
PageResult<AppCouponRespVO> convertAppPage(PageResult<CouponDO> pageResult);
+
+ List<AppCouponMatchRespVO> convertList(List<CouponDO> list);
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponMapper.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponMapper.java
index 744989849..20852852f 100755
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponMapper.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/mysql/coupon/CouponMapper.java
@@ -1,11 +1,13 @@
package cn.iocoder.yudao.module.promotion.dal.mysql.coupon;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
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.coupon.vo.coupon.CouponPageReqVO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponDO;
+import cn.iocoder.yudao.module.promotion.enums.common.PromotionProductScopeEnum;
import cn.iocoder.yudao.module.promotion.service.coupon.bo.CouponTakeCountBO;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.yulichang.toolkit.MPJWrappers;
@@ -13,6 +15,8 @@ import org.apache.ibatis.annotations.Mapper;
import java.util.Collection;
import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* 优惠劵 Mapper
@@ -73,4 +77,21 @@ public interface CouponMapper extends BaseMapperX<CouponDO> {
.in(CouponDO::getTemplateId, templateIds)
.groupBy(CouponDO::getTemplateId)), CouponTakeCountBO.class);
}
+
+ default List<CouponDO> selectListByUserIdAndStatusAndUsePriceLeAndProductScope(
+ Long userId, Integer status, Integer usePrice, List<Long> spuIds, List<Long> categoryIds) {
+
+ Function<List<Long>, String> productScopeValuesFindInSetFunc = ids -> ids.stream()
+ .map(id -> StrUtil.format("FIND_IN_SET({}, product_scope_values) ", id))
+ .collect(Collectors.joining(" OR "));
+ return selectList(new LambdaQueryWrapperX<CouponDO>()
+ .eq(CouponDO::getUserId, userId)
+ .eq(CouponDO::getStatus, status)
+ .le(CouponDO::getUsePrice, usePrice)
+ .and(w -> w.eq(CouponDO::getProductScope, PromotionProductScopeEnum.ALL.getScope())
+ .or(ww -> ww.eq(CouponDO::getProductScope, PromotionProductScopeEnum.SPU.getScope())
+ .apply(productScopeValuesFindInSetFunc.apply(spuIds)))
+ .or(ww -> ww.eq(CouponDO::getProductScope, PromotionProductScopeEnum.CATEGORY.getScope())
+ .apply(productScopeValuesFindInSetFunc.apply(categoryIds)))));
+ }
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
index b3569a34b..1ee2096ef 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponService.java
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.promotion.service.coupon;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.coupon.CouponPageReqVO;
+import cn.iocoder.yudao.module.promotion.controller.app.coupon.vo.coupon.AppCouponMatchReqVO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponDO;
import cn.iocoder.yudao.module.promotion.enums.coupon.CouponTakeTypeEnum;
import cn.iocoder.yudao.module.promotion.service.coupon.bo.CouponTakeCountBO;
@@ -147,4 +148,13 @@ public interface CouponService {
* @return 领取优惠券的数量
*/
List<CouponTakeCountBO> getTakeCountListByTemplateIds(Collection<Long> templateIds, Long userId);
+
+ /**
+ * 获取用户匹配的优惠券列表
+ *
+ * @param userId 用户编号
+ * @param matchReqVO 匹配参数
+ * @return 优惠券列表
+ */
+ List<CouponDO> getMatchCouponList(Long userId, AppCouponMatchReqVO matchReqVO);
}
diff --git a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
index fcf515ec5..acb1028c4 100644
--- a/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
+++ b/yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponServiceImpl.java
@@ -12,6 +12,7 @@ import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
import cn.iocoder.yudao.module.member.api.user.MemberUserApi;
import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
import cn.iocoder.yudao.module.promotion.controller.admin.coupon.vo.coupon.CouponPageReqVO;
+import cn.iocoder.yudao.module.promotion.controller.app.coupon.vo.coupon.AppCouponMatchReqVO;
import cn.iocoder.yudao.module.promotion.convert.coupon.CouponConvert;
import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponDO;
import cn.iocoder.yudao.module.promotion.dal.dataobject.coupon.CouponTemplateDO;
@@ -186,6 +187,12 @@ public class CouponServiceImpl implements CouponService {
return couponMapper.selectCountByUserIdAndTemplateIdIn(userId, templateIds);
}
+ @Override
+ public List<CouponDO> getMatchCouponList(Long userId, AppCouponMatchReqVO matchReqVO) {
+ return couponMapper.selectListByUserIdAndStatusAndUsePriceLeAndProductScope(userId, CouponStatusEnum.UNUSED.getStatus(),
+ matchReqVO.getPrice(), matchReqVO.getSpuIds(), matchReqVO.getCategoryIds());
+ }
+
/**
* 校验优惠券是否可以领取
*
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
index 4b5d98a37..494b9bfa5 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/vo/AppTradeOrderSettlementRespVO.java
@@ -37,6 +37,8 @@ public class AppTradeOrderSettlementRespVO {
// ========== SPU 信息 ==========
+ @Schema(description = "品类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
+ private Long categoryId;
@Schema(description = "SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2048")
private Long spuId;
@Schema(description = "SPU 名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "Apple iPhone 12")