From 10215da99ee763cf72897c747f82efd4f9a513ad Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 20:32:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/point/CustomerPointService.java | 5 +++--
1 files changed, 3 insertions(+), 2 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..1f9dfa0 100644
--- a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
+++ b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
@@ -86,6 +86,7 @@
if(POINT_CHANGE_TYPE.add.name().equals(detail.getChangeType())){
point.setTotalPoint(point.getTotalPoint() + detail.getPoint());
}else if(POINT_CHANGE_TYPE.reduce.name().equals(detail.getChangeType())){
+ Integer detailPoint = detail.getPoint();
if(POINT_TYPE.deduction.name().equals(detail.getType())){ //积分扣减
Integer balancePoint = point.getTotalPoint() - point.getUsedPoint()-point.getExpiredPoint()-point.getDeductionPoint();//可用积分
balancePoint = balancePoint.intValue()>0?balancePoint.intValue():0;
@@ -93,9 +94,9 @@
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);
+ detail.setRemarks(detail.getRemarks()+",当前积分不足"+detailPoint+"，实际扣除积分"+balancePoint);
}
}
}
--
Gitblit v1.9.3