From 1a20adbee4043a7b4a9e51565e7ac0f99d06c36d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 24 Apr 2021 20:21:24 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 10 ++++++++--
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml | 4 ++--
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java | 30 ++++++++++++++++++++++++++++++
zq-erp/src/test/java/com/matrix/DataMoveTest.java | 6 +++---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 8 +++++++-
5 files changed, 50 insertions(+), 8 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 7c87430..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());
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
index dc348b8..a00389c 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java
@@ -114,6 +114,36 @@
*/
private String statu;
+ private Date createTime;
+
+ private Date updateTime;
+
+ private String createBy;
+
+ public Date getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
/**
* 扩展属性
*/
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 7bdfec4..bcab5c6 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -64,7 +64,10 @@
pay_time,
company_id,
orderType,
- is_has_refund
+ is_has_refund,
+ create_time,
+ update_time,
+ create_by
)
VALUES (
#{id},
@@ -88,7 +91,10 @@
#{payTime},
#{companyId},
#{orderType},
- #{isHasRefund}
+ #{isHasRefund},
+ #{createTime},
+ #{updateTime},
+ #{createBy}
)
</insert>
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
index 70ba582..7b57e40 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -44,9 +44,9 @@
VALUES (
#{id},
#{createBy},
- now(),
+ #{createTime},
#{updateBy},
- now(),
+ #{updateTime},
#{flowNo},
#{orderId},
#{flowContent},
diff --git a/zq-erp/src/test/java/com/matrix/DataMoveTest.java b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
index 4ccb5ff..70cf3f8 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -29,7 +29,7 @@
/**
* 商铺信息迁移
*/
- @Test
+// @Test
public void slaveTest() {
List<SysShopInfo> shopInfos = dataMove.oldShopInfo();
dataMove.toNewShopInfo(shopInfos);
@@ -40,7 +40,7 @@
* @throws UnsupportedEncodingException
* @throws NoSuchAlgorithmException
*/
- @Test
+// @Test
public void sysUsersMoveTest() throws UnsupportedEncodingException, NoSuchAlgorithmException {
List<SysUsers> sysUsers = dataMove.oldSysUsers();
dataMove.newSysUsers(sysUsers);
@@ -122,7 +122,7 @@
dataMove.shopStaffInfoNew(dataMove.shopStaffInfoOld());
}
-// @Test
+ @Test
public void orderMoveTest() {
dataMove.orderNew(dataMove.orderOld());
}
--
Gitblit v1.9.1