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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

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

@@ -140,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("积分不足");
            }
            //记录兑换记录
@@ -151,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());