From ccdc5690f7f4705611a2f57a7cf45da352b6e7e4 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 17:51:58 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
index 08800f8..7c87430 100644
--- a/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java
@@ -1515,7 +1515,7 @@
@Transactional(rollbackFor = Exception.class)
public void tyOrderAndAchieveMove() {
- jdbcTemplate.update("update sys_order set order_type=1, is_has_refund=2 where 1=1");
+ jdbcTemplate.update("update sys_order set orderType=1, is_has_refund=2 where 1=1");
List<SysOrderFlow> flows = sysOrderFlowDao.selectOrderFlowByType();
if (CollUtil.isNotEmpty(flows)) {
@@ -1534,6 +1534,12 @@
} else {
achieveNew.setPayMethod("划扣");
}
+
+// if (achieveNew.getConsume() == null) {
+// achieveNew.setPayMethod("现金");
+// } else {
+// achieveNew.setPayMethod("划扣");
+// }
achieveNew.setAchieveType("顾问业绩");
achieveNew.setGoodsCash(Double.parseDouble(achieveNew.getT1()));
achieveNewDao.updateByModel(achieveNew);
--
Gitblit v1.9.1