From b030378e316508eb5071aebe9d8494ad094f490f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 29 八月 2024 16:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/表设计-二期.xlsx | 0
src/main/resources/mapper/point/CustomerPointDetailMapper.xml | 2
src/main/java/com/mzl/flower/constant/Constants.java | 16 ++
src/main/java/com/mzl/flower/service/point/PointGoodsService.java | 112 ++++++++++++++++++
src/main/java/com/mzl/flower/service/BaseService.java | 10 +
/dev/null | 36 ------
src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java | 49 ++++++++
src/main/java/com/mzl/flower/web/customer/PointGoodsCustomerController.java | 26 +++
src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java | 14 +-
src/main/resources/mapper/point/PointGoodMapper.xml | 37 ++---
src/main/java/com/mzl/flower/dto/request/point/QueryExchangeGoodsDTO.java | 14 ++
src/main/java/com/mzl/flower/mapper/point/PointGoodsRecordMapper.java | 11 +
src/main/java/com/mzl/flower/dto/request/point/ExchangeGoodsDTO.java | 15 ++
13 files changed, 269 insertions(+), 73 deletions(-)
diff --git a/src/main/java/com/mzl/flower/constant/Constants.java b/src/main/java/com/mzl/flower/constant/Constants.java
index 130e745..a068578 100644
--- a/src/main/java/com/mzl/flower/constant/Constants.java
+++ b/src/main/java/com/mzl/flower/constant/Constants.java
@@ -493,4 +493,20 @@
return desc;
}
}
+
+ public enum POINT_GOODS_RECORD_STATUS {
+ A("未使用"),
+ U("已使用"),
+ E("已过期");
+
+ POINT_GOODS_RECORD_STATUS(String desc) {
+ this.desc = desc;
+ }
+
+ private String desc;
+
+ public String getDesc() {
+ return desc;
+ }
+ }
}
diff --git a/src/main/java/com/mzl/flower/dto/request/point/ExchangeGoodsDTO.java b/src/main/java/com/mzl/flower/dto/request/point/ExchangeGoodsDTO.java
new file mode 100644
index 0000000..3cc3872
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/request/point/ExchangeGoodsDTO.java
@@ -0,0 +1,15 @@
+package com.mzl.flower.dto.request.point;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ExchangeGoodsDTO {
+
+ @NotNull(message = "商品id不能为空")
+ private Long goodsId;
+
+ @NotNull(message = "兑换数量不能为空")
+ private Integer num;
+}
diff --git a/src/main/java/com/mzl/flower/dto/request/point/QueryExchangeGoodsDTO.java b/src/main/java/com/mzl/flower/dto/request/point/QueryExchangeGoodsDTO.java
new file mode 100644
index 0000000..24cf8b5
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/request/point/QueryExchangeGoodsDTO.java
@@ -0,0 +1,14 @@
+package com.mzl.flower.dto.request.point;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QueryExchangeGoodsDTO {
+
+ @ApiModelProperty(value = "兑换券状态(POINT_GOODS_RECORD_STATUS)")
+ private String status;
+
+ @ApiModelProperty(value = "用户ID",hidden = true)
+ private String userId;
+}
diff --git a/src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java b/src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java
new file mode 100644
index 0000000..172db6f
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/response/point/PointGoodsRecordDTO.java
@@ -0,0 +1,49 @@
+package com.mzl.flower.dto.response.point;
+
+import com.mzl.flower.base.AbstractTransDTO;
+import com.mzl.flower.base.annotation.DictTrans;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class PointGoodsRecordDTO extends AbstractTransDTO {
+
+ @ApiModelProperty(value = "用户ID")
+ private String userId;
+
+ @ApiModelProperty(value = "商户ID")
+ private Long customerId;
+
+ @ApiModelProperty(value = "兑换码")
+ private String redeemCode;
+
+ @ApiModelProperty(value = "积分商品ID")
+ private Long goodsId;
+
+ @ApiModelProperty(value = "商品名称")
+ private String name;
+
+ @ApiModelProperty(value = "商品描述")
+ private String description;
+
+ @ApiModelProperty(value = "商品封面图")
+ private String cover;
+
+ @ApiModelProperty(value = "商品图片")
+ private String pictures;
+
+ @ApiModelProperty(value = "兑换积分数")
+ private Integer point;
+
+ @ApiModelProperty(value = "兑换数量")
+ private Integer num;
+
+ @ApiModelProperty(value = "兑换总积分")
+ private Integer totalPoint;
+
+ @ApiModelProperty(value = "兑换券状态POINT_GOODS_RECORD_STATUS")
+ @DictTrans(target = "statusStr",codeType = "POINT_GOODS_RECORD_STATUS")
+ private String status;
+
+ private String statusStr;
+}
diff --git a/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java b/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java
index 4421001..c694181 100644
--- a/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java
+++ b/src/main/java/com/mzl/flower/entity/point/PointGoodsRecord.java
@@ -15,9 +15,6 @@
@ApiModelProperty(value = "商户ID")
private Long customerId;
- @ApiModelProperty(value = "兑换单号")
- private String recordNo;
-
@ApiModelProperty(value = "兑换码")
private String redeemCode;
@@ -37,14 +34,17 @@
private String pictures;
@ApiModelProperty(value = "兑换积分数")
- private String point;
+ private Integer point;
@ApiModelProperty(value = "兑换数量")
- private String num;
+ private Integer num;
@ApiModelProperty(value = "兑换总积分")
- private String totalPoint;
+ private Integer totalPoint;
- @ApiModelProperty(value = "兑换状态")
+ @ApiModelProperty(value = "兑换券状态POINT_GOODS_RECORD_STATUS")
private String status;
+
+ @ApiModelProperty(value = "绑定订单ID")
+ private String orderId;
}
diff --git a/src/main/java/com/mzl/flower/mapper/point/PointGoodMapper.java b/src/main/java/com/mzl/flower/mapper/point/PointGoodMapper.java
deleted file mode 100644
index c01d43e..0000000
--- a/src/main/java/com/mzl/flower/mapper/point/PointGoodMapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.mzl.flower.mapper.point;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.mzl.flower.dto.request.content.QueryAnnouncementDTO;
-import com.mzl.flower.dto.request.point.PointGoodQueryDTO;
-import com.mzl.flower.dto.response.content.AnnouncementDTO;
-import com.mzl.flower.dto.response.point.PointGoodVO;
-import com.mzl.flower.entity.menber.Member;
-import com.mzl.flower.entity.point.PointGood;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-/**
- * @author fanghaowei
- * @version version2.0
- * @className MemberMapper
- * @date 2024/8/26
- * @description PointGoodMapper
- */
-@SuppressWarnings("ALL")
-@Repository
-public interface PointGoodMapper extends BaseMapper<PointGood> {
-
-// @Select("select * from t_member where name = #{name} and deleted = '0' limit 1")
-// Member getMemberByName(@Param("name") String name);
-
- List<PointGoodVO> queryPage(@Param("dto") PointGoodQueryDTO dto, Page page);
-
-
-
-}
diff --git a/src/main/java/com/mzl/flower/mapper/point/PointGoodsRecordMapper.java b/src/main/java/com/mzl/flower/mapper/point/PointGoodsRecordMapper.java
index f0449c3..af6a6db 100644
--- a/src/main/java/com/mzl/flower/mapper/point/PointGoodsRecordMapper.java
+++ b/src/main/java/com/mzl/flower/mapper/point/PointGoodsRecordMapper.java
@@ -1,9 +1,16 @@
package com.mzl.flower.mapper.point;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.mzl.flower.entity.point.CustomerPointDetail;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mzl.flower.dto.request.point.QueryExchangeGoodsDTO;
+import com.mzl.flower.dto.response.point.PointGoodsRecordDTO;
+import com.mzl.flower.entity.point.PointGoodsRecord;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+import java.util.List;
+
@Repository
-public interface PointGoodsRecordMapper extends BaseMapper<CustomerPointDetail> {
+public interface PointGoodsRecordMapper extends BaseMapper<PointGoodsRecord> {
+ List<PointGoodsRecordDTO> selectMyExchangeGoods(@Param("dto") QueryExchangeGoodsDTO dto, Page page);
}
diff --git a/src/main/java/com/mzl/flower/service/BaseService.java b/src/main/java/com/mzl/flower/service/BaseService.java
index acd2725..f6cca5b 100644
--- a/src/main/java/com/mzl/flower/service/BaseService.java
+++ b/src/main/java/com/mzl/flower/service/BaseService.java
@@ -459,6 +459,16 @@
return p;
}
+ protected Customer getCustomerByUserId(String userId){
+ Customer p = customerMapper.selectOne(new QueryWrapper<Customer>()
+ .eq("user_id", userId));
+ if(p == null){
+ throw new ValidationException("客户不存在");
+ }
+
+ return p;
+ }
+
protected Customer getCustomer(Long id){
Customer p = customerMapper.selectById(id);
diff --git a/src/main/java/com/mzl/flower/service/point/PointGoodsService.java b/src/main/java/com/mzl/flower/service/point/PointGoodsService.java
index 12fb25c..9e408ea 100644
--- a/src/main/java/com/mzl/flower/service/point/PointGoodsService.java
+++ b/src/main/java/com/mzl/flower/service/point/PointGoodsService.java
@@ -1,17 +1,24 @@
package com.mzl.flower.service.point;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
-import com.mzl.flower.dto.request.point.PointGoodsCreateDTO;
-import com.mzl.flower.dto.request.point.PointGoodsQueryDTO;
-import com.mzl.flower.dto.request.point.PointGoodsUpdateDTO;
+import com.mzl.flower.dto.request.point.*;
import com.mzl.flower.dto.response.point.PointGoodsDTO;
import com.mzl.flower.dto.response.point.PointGoodsListDTO;
+import com.mzl.flower.dto.response.point.PointGoodsRecordDTO;
+import com.mzl.flower.entity.point.CustomerPoint;
+import com.mzl.flower.entity.point.CustomerPointDetail;
import com.mzl.flower.entity.point.PointGoods;
+import com.mzl.flower.entity.point.PointGoodsRecord;
+import com.mzl.flower.mapper.point.CustomerPointDetailMapper;
+import com.mzl.flower.mapper.point.CustomerPointMapper;
import com.mzl.flower.mapper.point.PointGoodsMapper;
+import com.mzl.flower.mapper.point.PointGoodsRecordMapper;
import com.mzl.flower.service.BaseService;
+import com.mzl.flower.utils.UUIDGenerator;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,6 +32,16 @@
@Autowired
private PointGoodsMapper pointGoodsMapper;
+
+ @Autowired
+ private PointGoodsRecordMapper pointGoodsRecordMapper;
+
+ @Autowired
+ private CustomerPointMapper customerPointMapper;
+
+ @Autowired
+ private CustomerPointDetailMapper customerPointDetailMapper;
+
public Long addPointGoods(PointGoodsCreateDTO dto){
PointGoods p = new PointGoods();
@@ -86,4 +103,93 @@
p.update(SecurityUtils.getUserId());
pointGoodsMapper.updateById(p);
}
+
+ public synchronized void exchangeGoods(ExchangeGoodsDTO dto) {
+ PointGoods p = pointGoodsMapper.selectById(dto.getGoodsId());
+ if(p == null){
+ throw new ValidationException("商品未找到");
+ }
+ if(!Constants.POINT_GOODS_STATUS.A.name().equals(p.getStatus())){
+ throw new ValidationException("商品未上架");
+ }
+ if(p.getStock()< dto.getNum()){
+ throw new ValidationException("商品库存不足");
+ }
+ CustomerPoint cp = customerPointMapper.selectOne(new LambdaQueryWrapper<CustomerPoint>()
+ .eq(CustomerPoint::getUserId, SecurityUtils.getUserId()));
+ if(cp == null || (cp.getTotalPoint()-cp.getUsedPoint()-cp.getExpiredPoint()) < p.getPoint() * dto.getNum()){
+ throw new ValidationException("积分不足");
+ }
+ //记录兑换记录
+ PointGoodsRecord record = new PointGoodsRecord();
+ record.setUserId(SecurityUtils.getUserId());
+ record.setCustomerId(getCustomerByUserId(SecurityUtils.getUserId()).getId());
+ record.setGoodsId(dto.getGoodsId());
+ record.setNum(dto.getNum());
+ record.setPoint(p.getPoint());
+ record.setName(p.getName());
+ record.setPictures(p.getPictures());
+ record.setDescription(p.getDescription());
+ record.setTotalPoint(p.getPoint() * dto.getNum());
+ record.setCover(p.getCover());
+ record.setRedeemCode(UUIDGenerator.getUUID());
+ record.setStatus(Constants.POINT_GOODS_RECORD_STATUS.A.name());//未使用
+ pointGoodsRecordMapper.insert(record);
+
+ //更新积分汇总
+ cp.setUsedPoint(cp.getUsedPoint()+record.getTotalPoint());
+ customerPointMapper.updateById(cp);
+
+ //记录积分明细
+ CustomerPointDetail detail = new CustomerPointDetail();
+ detail.setUserId(SecurityUtils.getUserId());
+ detail.setCustomerId(record.getCustomerId());
+ detail.setPoint(record.getTotalPoint());
+ detail.setChangeType(Constants.POINT_CHANGE_TYPE.reduce.name());
+ detail.setType(Constants.POINT_TYPE.exchange.name());
+ detail.create(SecurityUtils.getUserId());
+ customerPointDetailMapper.insert(detail);
+
+ //更新库存
+ p.setStock(p.getStock()- dto.getNum());
+ pointGoodsMapper.updateById(p);
+ }
+
+ public Page<PointGoodsRecordDTO> myExchangeGoods(QueryExchangeGoodsDTO dto, Page page) {
+ dto.setUserId(SecurityUtils.getUserId());
+ List<PointGoodsRecordDTO> list = pointGoodsRecordMapper.selectMyExchangeGoods(dto,page);
+ page.setRecords(list);
+ return page;
+ }
+
+ public void useExchangeGoods(Long recordId,String orderId) {
+ PointGoodsRecord record = pointGoodsRecordMapper.selectById(recordId);
+ if(record == null){
+ throw new ValidationException("兑换券不存在");
+ }
+ if(!Constants.POINT_GOODS_RECORD_STATUS.A.name().equals(record.getStatus())){
+ throw new ValidationException("兑换券已使用或过期");
+ }
+ if(!SecurityUtils.getUserId().equals(record.getUserId())){
+ throw new ValidationException("兑换券不属于当前用户");
+ }
+ record.setStatus(Constants.POINT_GOODS_RECORD_STATUS.U.name());
+ record.setOrderId(orderId);
+ pointGoodsRecordMapper.updateById(record);
+ }
+ public void revertExchangeGoods(Long recordId) {
+ PointGoodsRecord record = pointGoodsRecordMapper.selectById(recordId);
+ if(record == null){
+ throw new ValidationException("兑换券不存在");
+ }
+ if(!Constants.POINT_GOODS_RECORD_STATUS.U.name().equals(record.getStatus())){
+ throw new ValidationException("兑换券未使用或过期");
+ }
+ if(!SecurityUtils.getUserId().equals(record.getUserId())){
+ throw new ValidationException("兑换券不属于当前用户");
+ }
+ record.setStatus(Constants.POINT_GOODS_RECORD_STATUS.A.name());
+ record.setOrderId(null);
+ pointGoodsRecordMapper.updateById(record);
+ }
}
diff --git a/src/main/java/com/mzl/flower/web/customer/PointGoodsCustomerController.java b/src/main/java/com/mzl/flower/web/customer/PointGoodsCustomerController.java
index 532a098..2782aa7 100644
--- a/src/main/java/com/mzl/flower/web/customer/PointGoodsCustomerController.java
+++ b/src/main/java/com/mzl/flower/web/customer/PointGoodsCustomerController.java
@@ -4,12 +4,14 @@
import com.mzl.flower.base.BaseController;
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
+import com.mzl.flower.config.security.SecurityUtils;
import com.mzl.flower.constant.Constants;
-import com.mzl.flower.dto.request.point.PointGoodsCreateDTO;
-import com.mzl.flower.dto.request.point.PointGoodsQueryDTO;
-import com.mzl.flower.dto.request.point.PointGoodsUpdateDTO;
+import com.mzl.flower.dto.request.point.*;
+import com.mzl.flower.dto.response.point.CustomerPointDetailDTO;
import com.mzl.flower.dto.response.point.PointGoodsDTO;
import com.mzl.flower.dto.response.point.PointGoodsListDTO;
+import com.mzl.flower.dto.response.point.PointGoodsRecordDTO;
+import com.mzl.flower.entity.point.PointGoodsRecord;
import com.mzl.flower.service.point.PointGoodsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -47,4 +49,22 @@
return returnData(R.SUCCESS.getCode(), pointGoodsService.getGoodsInfo(id));
}
+
+ @PostMapping("/exchange")
+ @ApiOperation(value = "积分商品兑换", notes = "积分商品兑换")
+ public ResponseEntity<ReturnDataDTO> exchangeGoods(@Validated @RequestBody ExchangeGoodsDTO dto) {
+ pointGoodsService.exchangeGoods(dto);
+ return returnData(R.SUCCESS.getCode(),null);
+ }
+
+
+ @GetMapping("/exchange/list")
+ @ApiOperation(value = "积分商品兑换券列表", notes = "积分商品兑换券列表")
+ public ResponseEntity<ReturnDataDTO<Page<PointGoodsRecordDTO>>> myExchangeGoods(QueryExchangeGoodsDTO dto, Page page) {
+ return returnData(R.SUCCESS.getCode(), pointGoodsService.myExchangeGoods(dto,page));
+ }
+
+
+
+
}
diff --git a/src/main/resources/mapper/point/CustomerPointDetailMapper.xml b/src/main/resources/mapper/point/CustomerPointDetailMapper.xml
index 2aae564..f61dd52 100644
--- a/src/main/resources/mapper/point/CustomerPointDetailMapper.xml
+++ b/src/main/resources/mapper/point/CustomerPointDetailMapper.xml
@@ -15,6 +15,6 @@
<if test="dto.type != null and dto.type != ''">
and t.type = #{dto.type}
</if>
- order by t.update_time desc
+ order by t.c desc
</select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/point/PointGoodMapper.xml b/src/main/resources/mapper/point/PointGoodMapper.xml
index ca326e4..866bb09 100644
--- a/src/main/resources/mapper/point/PointGoodMapper.xml
+++ b/src/main/resources/mapper/point/PointGoodMapper.xml
@@ -1,26 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.mzl.flower.mapper.point.PointGoodMapper">
- <select id="queryPage" resultType="com.mzl.flower.dto.response.point.PointGoodVO">
- select * from t_point_goods t where t.deleted= 0
- <if test="dto.name != null and dto.name != ''">
- and t.name like concat('%', #{dto.name}, '%')
- </if>
- <if test="dto.status != null and dto.status != ''">
- and t.status = #{dto.status}
- </if>
- order by t.update_time desc
- </select>
- <select id="queryList" resultType="com.mzl.flower.dto.response.point.PointGoodVO"
- parameterType="com.mzl.flower.dto.request.point.PointGoodQueryDTO">
- select * from t_point_goods t where t.deleted= 0
- <if test="dto.name != null and dto.name != ''">
- and t.name like concat('%', #{dto.name}, '%')
- </if>
- <if test="dto.status != null and dto.status != ''">
- and t.status = #{dto.status}
- </if>
+<mapper namespace="com.mzl.flower.mapper.point.PointGoodsRecordMapper">
- order by t.update_time desc
+ <select id="selectMyExchangeGoods" resultType="com.mzl.flower.dto.response.point.PointGoodsRecordDTO">
+ SELECT
+ *
+ FROM
+ t_point_goods_record p
+ WHERE
+ p.deleted = 0
+ <if test="dto.userId != null and dto.userId != ''">
+ AND p.user_id = #{dto.userId}
+ </if>
+ <if test="dto.status != null and dto.status != ''">
+ AND p.`status` = #{dto.status}
+ </if>
+ ORDER BY
+ p.create_time DESC
</select>
</mapper>
\ No newline at end of file
diff --git "a/src/main/\350\241\250\350\256\276\350\256\241-\344\272\214\346\234\237.xlsx" "b/src/main/\350\241\250\350\256\276\350\256\241-\344\272\214\346\234\237.xlsx"
index 50c991e..6d5b14e 100644
--- "a/src/main/\350\241\250\350\256\276\350\256\241-\344\272\214\346\234\237.xlsx"
+++ "b/src/main/\350\241\250\350\256\276\350\256\241-\344\272\214\346\234\237.xlsx"
Binary files differ
--
Gitblit v1.9.3