Эх сурвалжийг харах

Merge branch 'feat-20230628-packagerecharge' into temp-pre

李学松 2 жил өмнө
parent
commit
d20c8f0e1a

+ 8 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -1763,8 +1763,10 @@ public class WmScorePackageController {
 				log.warn("未配置积分充值信息");
 				throw new RuntimeException("积分余额:0。积分不足");
 			}
-			if (wmScorePackage.getScore() > deptRecharge.getScore()) {
-				log.warn("已分配积分不足,发包积分={},剩余积分={}", wmScorePackage.getScore(), deptRecharge.getScore());
+			int limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
+			if (wmScorePackage.getScore() > limitScore) {
+				log.warn("已分配积分不足,发包积分={},剩余积分={},透支额度={}",
+						wmScorePackage.getScore(), deptRecharge.getScore(), limitScore);
 				throw new RuntimeException(String.format("积分余额:%s。积分不足", deptRecharge.getScore()));
 			}
 
@@ -2666,8 +2668,10 @@ public class WmScorePackageController {
 			int changeScore = oldPackageScore - wmScorePackage.getScore();
 			int currentScore = deptRecharge.getScore() + changeScore;
 
-			if (changeScore > deptRecharge.getScore()) {
-				log.warn("已分配积分不足,发包积分={},剩余积分={}", wmScorePackage.getScore(), deptRecharge.getScore());
+			int limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
+			if (changeScore < 0 && Math.abs(changeScore) > limitScore) {
+				log.warn("已分配积分不足,修改积分={},剩余积分={},透支额度={}",
+						changeScore, deptRecharge.getScore(), deptRecharge.getOverdrawScore());
 				throw new RuntimeException(String.format("积分余额:%s。积分不足", deptRecharge.getScore()));
 			}
 

+ 8 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmScorePackageServiceImpl.java

@@ -657,8 +657,10 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 				log.warn("未配置积分充值信息");
 				throw new RuntimeException("积分余额:0。积分不足");
 			}
-			if (wmScorePackage.getScore() > deptRecharge.getScore()) {
-				log.warn("已分配积分不足,发包积分={},剩余积分={}", wmScorePackage.getScore(), deptRecharge.getScore());
+			int limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
+			if (wmScorePackage.getScore() > limitScore) {
+				log.warn("已分配积分不足,发包积分={},剩余积分={},透支额度={}",
+						wmScorePackage.getScore(), deptRecharge.getScore(), limitScore);
 				throw new RuntimeException(String.format("积分余额:%s。积分不足", deptRecharge.getScore()));
 			}
 
@@ -1657,8 +1659,10 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 			int changeScore = oldPackageScore - wmScorePackage.getScore();
 			int currentScore = deptRecharge.getScore() + changeScore;
 
-			if (changeScore > deptRecharge.getScore()) {
-				log.warn("已分配积分不足,发包积分={},剩余积分={}", wmScorePackage.getScore(), deptRecharge.getScore());
+			int limitScore = deptRecharge.getScore() + deptRecharge.getOverdrawScore();
+			if (changeScore < 0 && Math.abs(changeScore) > limitScore) {
+				log.warn("已分配积分不足,修改积分={},剩余积分={},透支额度={}",
+						changeScore, deptRecharge.getScore(), deptRecharge.getOverdrawScore());
 				throw new RuntimeException(String.format("积分余额:%s。积分不足", deptRecharge.getScore()));
 			}