From c46272806303d309aadac6517417b4177eebca1f Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Sun, 26 Jun 2022 09:49:05 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 f23d9a1..c3bd40b 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
@@ -316,7 +316,9 @@
num = 1D / achieveNewList.size();
}
- achieveNewDao.updateAchieveNumOfPeople(achieveNewList, num);
+ if (CollUtil.isNotEmpty(achieveNewList)) {
+ achieveNewDao.updateAchieveNumOfPeople(achieveNewList, num);
+ }
}
}
@@ -357,7 +359,7 @@
private void buildAchieve(SysOrder pageOrder, SysOrderItem orderItem, AchieveNew achieveNew) {
BusParameterSettings shopManageJjcpasConsume =null;
- if (Dictionary.ORDER_STATU_TK.equals(pageOrder.getStatu())) {
+ if (SysOrder.ORDER_TYPE_REFUND == pageOrder.getOrderType()) {
achieveNew.setId(null);
achieveNew.setProjPercentage(0 - achieveNew.getProjPercentage());
achieveNew.setGoodsCash(0 - achieveNew.getGoodsCash());
--
Gitblit v1.9.1