From b977bf61c82b7dc39079974d7316b7a80cf520fa Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 02 九月 2024 09:36:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/service/point/CustomerPointService.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 bb55190..04800ee 100644
--- a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
+++ b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
@@ -84,16 +84,15 @@
if(POINT_CHANGE_TYPE.add.name().equals(detail.getChangeType())){
point.setTotalPoint(point.getTotalPoint() + detail.getPoint());
- point.setUsedPoint(point.getUsedPoint() + detail.getUsePoint());
- point.setExpiredPoint(point.getExpiredPoint() + detail.getExpiredPoint());
}else if(POINT_CHANGE_TYPE.reduce.name().equals(detail.getChangeType())){
-// if(point.getTotalPoint()!= null && point.getTotalPoint()!=0 && point.getTotalPoint()>= detail.getPoint()){
-// point.setTotalPoint(point.getTotalPoint() - detail.getPoint());
-// }else{
-// //积分不足，直接清0
-// point.setTotalPoint(0);
-// }
- point.setTotalPoint(point.getTotalPoint() - detail.getPoint());
+ if(point.getTotalPoint()!= null && point.getTotalPoint()!=0 && point.getTotalPoint()>= detail.getPoint()){
+ point.setTotalPoint(point.getTotalPoint() - detail.getPoint());
+ }else{
+ //积分不足，直接清0
+ point.setTotalPoint(0);
+ detail.setPoint(point.getTotalPoint());
+ detail.setRemarks(detail.getRemarks()+",积分不足，扣除剩余积分"+point.getTotalPoint());
+ }
}
if(isAdd){
customerPointMapper.insert(point);
@@ -114,10 +113,10 @@
detail.setChangeType(POINT_CHANGE_TYPE.reduce.name());
detail.setType(POINT_TYPE.deduction.name());
detail.create(SecurityUtils.getUserId());
- customerPointDetailMapper.insert(detail);
-
//更新汇总表
updateCustomerPoint(detail);
+
+ customerPointDetailMapper.insert(detail);
}
public void consumptionPoint(BigDecimal orderAmount, String orderNo,String userId) {
--
Gitblit v1.9.3