Merge remote-tracking branch 'origin/master-v2' into master-v2

陶杰

2024-09-10 2aae6068bbf1aff1ffb2813098553ac632d5002b

 src/main/java/com/mzl/flower/service/point/PointGoodsService.java

@@ -18,6 +18,7 @@
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.UUIDGenerator;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,6 +44,9 @@
    @Autowired
    private CustomerPointDetailMapper customerPointDetailMapper;


    @Autowired
    private RedisLockService lockService;

    public Long addPointGoods(PointGoodsCreateDTO dto){
        PointGoods p = new PointGoods();
@@ -117,7 +121,13 @@
        }
    }

    public synchronized void exchangeGoods(ExchangeGoodsDTO dto) {
    public void exchangeGoods(ExchangeGoodsDTO dto) {
        String key="EXCHANGE_GOODS:"+dto.getGoodsId()+":"+SecurityUtils.getUserId();
        boolean lock = lockService.getObjectLock(key, "");
        if(!lock){
            throw new ValidationException("系统操作频繁，请稍后重试");
        }
        try {
        PointGoods p = pointGoodsMapper.selectById(dto.getGoodsId());
        if(p == null){
            throw new ValidationException("商品未找到");
@@ -130,7 +140,7 @@
        }
        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()){
            if(cp == null || (cp.getTotalPoint()-cp.getUsedPoint()-cp.getExpiredPoint()-cp.getDeductionPoint()) < p.getPoint() * dto.getNum()){
            throw new ValidationException("积分不足");
        }
        //记录兑换记录
@@ -141,7 +151,7 @@
        record.setNum(dto.getNum());
        record.setPoint(p.getPoint());
        record.setName(p.getName());
        record.setPictures(p.getPictures());
            record.setPictures(p.getCover());
        record.setDescription(p.getDescription());
        record.setTotalPoint(p.getPoint() * dto.getNum());
        record.setCover(p.getCover());
@@ -168,6 +178,12 @@
        //更新库存
        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) {