From a7f47c8953b2055e7971df01b1aad3b40b128b17 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 04 Mar 2021 08:45:35 +0800
Subject: [PATCH] 修改业绩
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 26 ++++++--------------------
1 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index be82e79..049f1b8 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -154,7 +154,7 @@
@Override
- public void addAchieveByServiceOrder(SysProjServices projServices) {
+ public void addAchieveByServiceOrder(SysProjServices projServices) {
List<AchieveNew> achieveNewList = new ArrayList<>();
List<SysBeauticianState> beauticianStateList = sysBeauticianStateDao.selectBySerIds(projServices.getId());
int size = beauticianStateList.size();
@@ -172,16 +172,12 @@
achieveNew.setVipId(projServices.getVipId());
// 是否为赠送业绩
if (Dictionary.TAOCAN_SOURCE_ZS.equals(projUse.getSource())) {
- achieveNew.setFreeConsume(projUse.getPrice());
+ achieveNew.setFreeConsume(projUse.getPrice()*beauticianState.getCount());
} else {
- achieveNew.setHisConsume(projUse.getPrice());
+ achieveNew.setHisConsume(projUse.getPrice()*beauticianState.getCount());
}
achieveNew.setT2(projUse.getSource());
- if (projServices.getCreateTime() != null) {
- achieveNew.setDatatime(projServices.getCreateTime());
- } else {
- achieveNew.setDatatime(new Date());
- }
+ achieveNew.setDatatime(new Date());
achieveNew.setOrderType(Dictionary.ORDER_TYPE_SERVICE);
achieveNew.setServiceOrderId(projServices.getId());
achieveNew.setOrderItemId(beauticianState.getId());
@@ -247,10 +243,8 @@
achieveNew.setVipId(pageOrder.getVipId());
achieveNew.setSaleId(pageOrder.getStaffId());
- if (pageOrder.getOrderTime() != null) {
- achieveNew.setDatatime(pageOrder.getOrderTime());
- } else if (pageOrder.getOrderTime() != null) {
- achieveNew.setDatatime(pageOrder.getOrderTime());
+ if (pageOrder.getPayTime() != null) {
+ achieveNew.setDatatime(pageOrder.getPayTime());
} else {
achieveNew.setDatatime(new Date());
}
@@ -262,14 +256,6 @@
achieveNew.setShoppingGoodsId(orderItem.getGoodsId());
// 是否赠送
achieveNew.setT2(orderItem.getIsFree());
- // 根据商品类型设置业绩类型
-
- if (Dictionary.ACHIEVE_TYPE_CASH.equals(achieveNew.getT3())){
- achieveNew.setCardCash(Double.parseDouble(achieveNew.getT1()));
- } else {
- // 设置划扣金额
- achieveNew.setConsume(Double.parseDouble(achieveNew.getT1()));
- }
}
@Override
--
Gitblit v1.9.1