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

陶杰

2024-09-10 2aae6068bbf1aff1ffb2813098553ac632d5002b

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

@@ -93,7 +93,7 @@
                    point.setDeductionPoint(point.getDeductionPoint() + detail.getPoint());
                }else{
                    //积分不足，直接清0
                    point.setDeductionPoint(point.getUsedPoint() + balancePoint);
                    point.setDeductionPoint(point.getDeductionPoint() + balancePoint);
                    detail.setPoint(balancePoint);
                    detail.setRemarks(detail.getRemarks()+",积分不足，扣除积分"+balancePoint);
                }