From 5a22e43dc55a2d927313c0ada65038a3df2eea9b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 13 九月 2024 09:24:46 +0800
Subject: [PATCH] 供应商打印
---
src/main/java/com/mzl/flower/service/point/CustomerPointService.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 04800ee..1f9dfa0 100644
--- a/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
+++ b/src/main/java/com/mzl/flower/service/point/CustomerPointService.java
@@ -79,19 +79,25 @@
point.setTotalPoint(0);
point.setUsedPoint(0);
point.setExpiredPoint(0);
+ point.setDeductionPoint(0);
point.create(SecurityUtils.getUserId());
}
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())){
- 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());
+ 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;
+ if(balancePoint.intValue() >= detail.getPoint().intValue()){
+ point.setDeductionPoint(point.getDeductionPoint() + detail.getPoint());
+ }else{
+ //积分不足，直接清0
+ point.setDeductionPoint(point.getDeductionPoint() + balancePoint);
+ detail.setPoint(balancePoint);
+ detail.setRemarks(detail.getRemarks()+",当前积分不足"+detailPoint+"，实际扣除积分"+balancePoint);
+ }
}
}
if(isAdd){
--
Gitblit v1.9.3