From c0c0a5f242c43b5e5e3ab833ec4d8dd13d660cd7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Apr 2021 17:52:42 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 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..d82fffb 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
@@ -107,7 +107,7 @@
if (CollUtil.isNotEmpty(shopInfos)) {
Map<Long, Long> oldAndNewId = new HashMap<>();
for (SysShopInfo shopInfo : shopInfos) {
- if (shopInfo.getShopName().equals("总部")) {
+ if (shopInfo.getShopName().equals("总店")) {
shopInfo.setShopType(1);
shopInfo.setIsOpenNet(2);
} else {
@@ -126,6 +126,9 @@
sysShopInfoDao.insert(shopInfo);
oldAndNewId.put(oldId, shopInfo.getId());
} else {
+ if (shopInfo.getShopName().equals("总店")) {
+ shopInfo.setShopName("美度(总部)");
+ }
SysShopInfo sysShopInfo = sysShopInfoDao.selectByShopName(shopInfo.getShopName());
oldAndNewId.put(oldId, sysShopInfo.getId());
}
@@ -981,6 +984,9 @@
for (SysOrder sysOrder : list) {
Long oldOrderId = sysOrder.getId();
sysOrder.setId(null);
+ sysOrder.setCreateBy("数据迁移");
+ sysOrder.setCreateTime(sysOrder.getOrderTime());
+ sysOrder.setUpdateTime(sysOrder.getOrderTime());
sysOrderDao.insert(sysOrder);
orderIds.put(oldOrderId, sysOrder.getId());
@@ -1515,7 +1521,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 +1540,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