From c57c5f9843dcd99d908aa3b6bddb0c3793ebf3e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 20 Apr 2021 11:52:07 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index 93362f4..3d19de0 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -552,16 +552,24 @@
&&StringUtils.isNotBlank(cashConsumption.getParamValue())){
BigDecimal scoreSetting0 = new BigDecimal(cashConsumption.getParamValue());
- cashScore[0]= cashPayAmount.divide(scoreSetting0).intValue();
+ if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
+ cashScore[0] = cashPayAmount.divide(scoreSetting0).intValue();
+ }
if(StringUtils.isNotBlank(cashConsumption.getParamValue1())){
BigDecimal scoreSetting1 = new BigDecimal(cashConsumption.getParamValue1());
- cashScore[1]= cashPayAmount.divide(scoreSetting1).intValue();
+ if(scoreSetting1.compareTo(BigDecimal.ZERO)>0){
+ cashScore[1]= cashPayAmount.divide(scoreSetting1).intValue();
+ }
+
}
if(StringUtils.isNotBlank(cashConsumption.getParamValue2())){
BigDecimal scoreSetting2 = new BigDecimal(cashConsumption.getParamValue2());
- cashScore[2]= cashPayAmount.divide(scoreSetting2).intValue();
+ if(scoreSetting2.compareTo(BigDecimal.ZERO)>0){
+ cashScore[2]= cashPayAmount.divide(scoreSetting2).intValue();
+ }
+
}
}
@@ -577,16 +585,22 @@
&&StringUtils.isNotBlank(principalBalanceConsumption.getParamValue())){
BigDecimal scoreSetting0 = new BigDecimal(principalBalanceConsumption.getParamValue());
- cardScore[0]= cardPayAmount.divide(scoreSetting0).intValue();
+ if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
+ cardScore[0] = cardPayAmount.divide(scoreSetting0).intValue();
+ }
if(StringUtils.isNotBlank(principalBalanceConsumption.getParamValue1())){
BigDecimal scoreSetting1 = new BigDecimal(principalBalanceConsumption.getParamValue1());
- cardScore[1]= cardPayAmount.divide(scoreSetting1).intValue();
+ if(scoreSetting1.compareTo(BigDecimal.ZERO)>0) {
+ cardScore[1] = cardPayAmount.divide(scoreSetting1).intValue();
+ }
}
if(StringUtils.isNotBlank(principalBalanceConsumption.getParamValue2())){
BigDecimal scoreSetting2 = new BigDecimal(principalBalanceConsumption.getParamValue2());
- cardScore[2]= cardPayAmount.divide(scoreSetting2).intValue();
+ if(scoreSetting2.compareTo(BigDecimal.ZERO)>0) {
+ cardScore[2] = cardPayAmount.divide(scoreSetting2).intValue();
+ }
}
}
@@ -601,16 +615,22 @@
&&StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue())){
BigDecimal scoreSetting0 = new BigDecimal(bonusBalanceConsumption.getParamValue());
- giftScore[0]= giftPayAmount.divide(scoreSetting0).intValue();
+ if(scoreSetting0.compareTo(BigDecimal.ZERO)>0) {
+ giftScore[0] = giftPayAmount.divide(scoreSetting0).intValue();
+ }
if(StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue1())){
BigDecimal scoreSetting1 = new BigDecimal(bonusBalanceConsumption.getParamValue1());
- giftScore[1]= giftPayAmount.divide(scoreSetting1).intValue();
+ if(scoreSetting1.compareTo(BigDecimal.ZERO)>0) {
+ giftScore[1] = giftPayAmount.divide(scoreSetting1).intValue();
+ }
}
if(StringUtils.isNotBlank(bonusBalanceConsumption.getParamValue2())){
BigDecimal scoreSetting2 = new BigDecimal(bonusBalanceConsumption.getParamValue2());
- giftScore[2]= giftPayAmount.divide(scoreSetting2).intValue();
+ if(scoreSetting2.compareTo(BigDecimal.ZERO)>0) {
+ giftScore[2] = giftPayAmount.divide(scoreSetting2).intValue();
+ }
}
}
--
Gitblit v1.9.1