From 1d917e41e6a31a535932fbfde6324fe4bdf6ed8b Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 04 Jun 2021 14:55:15 +0800
Subject: [PATCH] 业绩规则3
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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 647ead9..93553f8 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();
+ }
}
}
@@ -1185,13 +1205,20 @@
} else {
puse.setPrice(goodsAssemble.getPrice() * zk);
}
- puse.setBalance(MoneyUtil.mul(puse.getPrice(), Double.valueOf(puse.getSurplusCount())));
+
// 赠送和打折后金额为0的都视为赠送项目
if (sysOrderItem.getIsFree().equals(Dictionary.FLAG_NO) && sysOrderItem.getZkPrice() > 0) {
puse.setSource(Dictionary.TAOCAN_SOURCE_GM);
} else {
+ //赠送产品按原价计算消耗
puse.setSource(Dictionary.TAOCAN_SOURCE_ZS);
+ if (taocanId == null) {
+ puse.setPrice(goodsAssemble.getShoppingGoods().getPrice() );
+ } else {
+ puse.setPrice(goodsAssemble.getPrice());
+ }
}
+ puse.setBalance(MoneyUtil.mul(puse.getPrice(), Double.valueOf(puse.getSurplusCount())));
puse.setFailTime(failTime);
sysProjUseDao.insert(puse);
return puse;
@@ -1271,18 +1298,22 @@
puse.setVipId(order.getVipId());
puse.setStatus(Dictionary.TAOCAN_STATUS_YX);
puse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
- puse.setBalance(sysOrderItem.getZkPrice());
- puse.setPrice(sysOrderItem.getZkPrice());
+
+
puse.setProjName(sysOrderItem.getShoppingGoods().getName());
// 赠送和打折后金额为0的都视为赠送项目
if (sysOrderItem.getIsFree().equals(Dictionary.FLAG_NO) && sysOrderItem.getZkPrice() > 0) {
puse.setSource(Dictionary.TAOCAN_SOURCE_GM);
+ puse.setPrice(sysOrderItem.getZkPrice());
} else {
puse.setSource(Dictionary.TAOCAN_SOURCE_ZS);
+ //赠送产品按原价计算消耗
+ puse.setPrice(sysOrderItem.getShoppingGoods().getSealPice());
}
// 设置失效时间
Date invalidTime = shoppingGoodsService.calInvalidTime(sysOrderItem.getShoppingGoods(), 1, null);
puse.setFailTime(invalidTime);
+ puse.setBalance(sysOrderItem.getShoppingGoods().getSealPice()*puse.getSurplusCount());
sysProjUseDao.insert(puse);
}
@@ -1352,6 +1383,7 @@
orderItem.setPrice(czVo.getBjmoney());
orderItem.setStatus(Dictionary.ORDER_STATU_YFK);
orderItem.setAchieveList(czVo.getAchaeveList());
+ orderItem.setShoppingGoods(shoppingGoods);
orderItemDao.insert(orderItem);
List<SysOrderItem> items = new ArrayList<>();
items.add(orderItem);
@@ -1372,9 +1404,12 @@
moneyCardUseFlowDao.insert(moneyCardUseFlow);
order.setFlows(czVo.getFlows());
+
addOrderFlow(order);
+
// 添加员工业绩
achieveNewService.addAchaeveByOrder(order);
+
return order;
}
--
Gitblit v1.9.1