From f24e61e9b0d8efc55f974bbec25fb0fb73b04ece Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 10 Jul 2021 14:18:57 +0800
Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move

---
 zq-erp/src/test/java/com/matrix/DataMoveTest.java |   90 ++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 84 insertions(+), 6 deletions(-)

diff --git a/zq-erp/src/test/java/com/matrix/DataMoveTest.java b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
index 3951fea..0fb5aa2 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -12,6 +12,7 @@
 
 import java.io.UnsupportedEncodingException;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,7 +29,7 @@
     /**
      * 商铺信息迁移
      */
-    @Test
+//    @Test
     public void slaveTest() {
         List<SysShopInfo> shopInfos = dataMove.oldShopInfo();
         dataMove.toNewShopInfo(shopInfos);
@@ -39,7 +40,7 @@
      * @throws UnsupportedEncodingException
      * @throws NoSuchAlgorithmException
      */
-    @Test
+//    @Test
     public void sysUsersMoveTest() throws UnsupportedEncodingException, NoSuchAlgorithmException {
         List<SysUsers> sysUsers = dataMove.oldSysUsers();
         dataMove.newSysUsers(sysUsers);
@@ -48,7 +49,7 @@
     /**
      * 会员等级迁移
      */
-    @Test
+//    @Test
     public void vipLevelMove() {
         List<SysVipLevel> sysVipLevels = dataMove.vipLevelOld();
         dataMove.vipLevelNew(sysVipLevels);
@@ -57,7 +58,7 @@
     /**
      * 会员信息迁移
      */
-//    @Test
+    //@Test
     public void vipInfoMoveTest() {
         dataMove.vipInfoNew(dataMove.vipInfoOld());
     }
@@ -78,8 +79,85 @@
         dataMove.goodsCategoryParentIdUpdate();
     }
 
-    @Test
-    public void shoppingGoodsMoveTest() {
+//    @Test
+    public void goodsTypeMoveTest() {
+        dataMove.goodsTypeNew(dataMove.goodsTypeOld());
+        dataMove.updateGoodsTypeParentId();
+    }
 
+    /**
+     * 项目
+     * 家居产品
+     * 充值卡
+     * 套餐
+     * 综合卡
+     *
+     *  ALTER TABLE `hive_test_meidu`.`shopping_goods` MODIFY COLUMN `is_once` int(10) NULL DEFAULT NULL AFTER `is_present`;
+     */
+//    @Test
+    public void shoppingGoodsMoveTest() {
+        dataMove.shoppingGoodsNew(dataMove.shoppingGoodsOld("家居产品"), "家居产品");
+    }
+
+//    @Test
+    public void shoppingGoodsProjTest() {
+        dataMove.shoppingGoodsNew(dataMove.shoppingGoodsProjectOld(), "项目");
+    }
+
+//    @Test
+    public void shoppingGoodsTcTest() {
+        dataMove.shoppingGoodsNew(dataMove.shoppingGoodsTcList(), "套餐");
+    }
+
+//    @Test
+    public void shoppingGoodsCzkTest() {
+        dataMove.shoppingGoodsNew(dataMove.shoppingGoodsCzkOld(), "充值卡");
+    }
+
+//    @Test
+    public void shoppingGoodsZhkTest() {
+        dataMove.shoppingGoodsZhkNew(dataMove.shoppingGoodsZhkOld());
+    }
+
+//    @Test
+    public void shopStaffMoveTest() throws UnsupportedEncodingException, NoSuchAlgorithmException {
+        dataMove.shopStaffInfoNew(dataMove.shopStaffInfoOld());
+    }
+
+ //   @Test
+    public void orderMoveTest() {
+        dataMove.orderNew(dataMove.orderOld());
+    }
+
+   @Test
+    public void bedInfoMoveTest() {
+        dataMove.bedInfoNew(dataMove.bedInfoOld());
+    }
+
+    @Test
+    public void projUseMoveTest() {
+        dataMove.projUseNew(dataMove.projUseMoveOld());
+    }
+
+    @Test
+    public void serviceOrderMoveTest() {
+        dataMove.serviceOrderNew(dataMove.serviceOrderOld());
+    }
+
+    @Test
+    public void moneyCardUseMoveTest() {
+        dataMove.moneyCardUseNew(dataMove.moneyCardUseOld());
+    }
+
+    @Test
+    public void tyOrderAndAchieveDataTest() {
+        dataMove.tyOrderAndAchieveMove();
+    }
+
+    @Test
+    public void roleUpdateTest() {
+//        dataMove.roleNew(dataMove.roleOld());
+
+        dataMove.roleNew2(dataMove.roleOld2());
     }
 }

--
Gitblit v1.9.1