From 004f3f352e6430aeba68ac44ab86e2eeb3a6c9e3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期一, 02 九月 2024 20:18:52 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/service/point/CustomerPointService.java | 23 ++++++++++++-----------
1 files changed, 12 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..a75a7a9 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,17 @@
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());
+ Integer balancePoint = point.getTotalPoint() - point.getUsedPoint()-point.getExpiredPoint();//可用积分
+ balancePoint = balancePoint.intValue()>0?balancePoint.intValue():0;
+ if(balancePoint.intValue() >= detail.getPoint().intValue()){
+ point.setUsedPoint(point.getUsedPoint() + detail.getPoint());
+ }else{
+ //积分不足，直接清0
+ point.setUsedPoint(point.getUsedPoint() + balancePoint);
+ detail.setPoint(balancePoint);
+ detail.setRemarks(detail.getRemarks()+",积分不足，扣除积分"+balancePoint);
+ }
}
if(isAdd){
customerPointMapper.insert(point);
@@ -114,10 +115,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