From 1bcd5a3c6447a0a00dc450b8b7780dadbb8e0e56 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 18:59:18 +0800
Subject: [PATCH] 优化
---
src/main/java/com/mzl/flower/service/point/PointGoodsService.java | 156 +++++++++++++++++++++++++++++++++------------------
1 files changed, 100 insertions(+), 56 deletions(-)
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 9e408ea..8639525 100644
--- a/src/main/java/com/mzl/flower/service/point/PointGoodsService.java
+++ b/src/main/java/com/mzl/flower/service/point/PointGoodsService.java
@@ -18,12 +18,16 @@
import com.mzl.flower.mapper.point.PointGoodsMapper;
import com.mzl.flower.mapper.point.PointGoodsRecordMapper;
import com.mzl.flower.service.BaseService;
+import com.mzl.flower.service.payment.RedisLockService;
+import com.mzl.flower.utils.DateUtils;
import com.mzl.flower.utils.UUIDGenerator;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
@Service
@@ -42,6 +46,9 @@
@Autowired
private CustomerPointDetailMapper customerPointDetailMapper;
+
+ @Autowired
+ private RedisLockService lockService;
public Long addPointGoods(PointGoodsCreateDTO dto){
PointGoods p = new PointGoods();
@@ -70,8 +77,14 @@
return p.getId();
}
- public void deletePointGoods(Long id){
- pointGoodsMapper.deleteById(id);
+ public void deletePointGoods(String idStr){
+ List<String> ids = splitParam(idStr);
+ if (ids != null && ids.size() > 0) {
+ for(String idd : ids) {
+ Long id = Long.parseLong(idd);
+ pointGoodsMapper.deleteById(id);
+ }
+ }
}
public Page<PointGoodsListDTO> selectGoodsList(Page page, PointGoodsQueryDTO dto){
@@ -93,66 +106,96 @@
return dto;
}
- public void updateStatus(Long id, String status){
- PointGoods p = pointGoodsMapper.selectById(id);
- if(p == null){
- throw new ValidationException("商品未找到");
- }
+ public void updateStatus(String idStr, String status){
+ List<String> ids = splitParam(idStr);
+ if(ids != null && ids.size() > 0) {
+ for(String idd : ids) {
+ Long id = Long.parseLong(idd);
+ PointGoods p = pointGoodsMapper.selectById(id);
+ if (p == null) {
+ continue;
+ }
- p.setStatus(status);
- p.update(SecurityUtils.getUserId());
- pointGoodsMapper.updateById(p);
+ if(Constants.POINT_GOODS_STATUS.A.name().equals(status)){
+ if(p.getStock() == null || p.getStock() <= 0){
+ throw new ValidationException("商品" + p.getName() + "库存为0不能上架");
+ }
+ }
+
+ p.setStatus(status);
+ 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("商品未找到");
+ public void exchangeGoods(ExchangeGoodsDTO dto) {
+ String key="EXCHANGE_GOODS:"+dto.getGoodsId()+":"+SecurityUtils.getUserId();
+ boolean lock = lockService.getObjectLock(key, "");
+ if(!lock){
+ 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);
+ try {
+ 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() <=0 || 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()-cp.getDeductionPoint()) < 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.getCover());
+ 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());//未使用
+ LocalDate expireDate = LocalDate.now().plusYears(1);
+ String expireDateStr = DateUtils.toString(expireDate,"yyyy-MM-dd");
+ record.setExpireTime(DateUtils.dateToLocalDateTime(expireDateStr,false));
+ record.create(SecurityUtils.getUserId());
+ pointGoodsRecordMapper.insert(record);
- //更新积分汇总
- cp.setUsedPoint(cp.getUsedPoint()+record.getTotalPoint());
- customerPointMapper.updateById(cp);
+ //更新积分汇总
+ 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);
+ //记录积分明细
+ 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.setRecordDate(LocalDate.now());
+ detail.setRemarks(record.getName());
+ detail.create(SecurityUtils.getUserId());
+ customerPointDetailMapper.insert(detail);
- //更新库存
- p.setStock(p.getStock()- dto.getNum());
- pointGoodsMapper.updateById(p);
+ //更新库存
+ p.setStock(p.getStock()- dto.getNum());
+ pointGoodsMapper.updateById(p);
+ }catch (Exception e){
+ throw new ValidationException("兑换失败");
+ }finally {
+ lockService.releaseObjectLock(key,"");
+ }
+
}
public Page<PointGoodsRecordDTO> myExchangeGoods(QueryExchangeGoodsDTO dto, Page page) {
@@ -177,6 +220,7 @@
record.setOrderId(orderId);
pointGoodsRecordMapper.updateById(record);
}
+
public void revertExchangeGoods(Long recordId) {
PointGoodsRecord record = pointGoodsRecordMapper.selectById(recordId);
if(record == null){
@@ -185,7 +229,7 @@
if(!Constants.POINT_GOODS_RECORD_STATUS.U.name().equals(record.getStatus())){
throw new ValidationException("兑换券未使用或过期");
}
- if(!SecurityUtils.getUserId().equals(record.getUserId())){
+ if(SecurityUtils.getUserId() != null && !SecurityUtils.getUserId().equals(record.getUserId())){
throw new ValidationException("兑换券不属于当前用户");
}
record.setStatus(Constants.POINT_GOODS_RECORD_STATUS.A.name());
--
Gitblit v1.9.3