From 2aae6068bbf1aff1ffb2813098553ac632d5002b Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 10 九月 2024 16:24:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/java/com/mzl/flower/service/point/CustomerPointService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
index 3d225f9..05363d3 100644
--- a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
+++ b/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);
                 }

--
Gitblit v1.9.3