From 3954537f11c1c6fbfc62a6233102c530e3202ba1 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 10 Jul 2021 14:25:55 +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 |   79 +++++++++++++++++++++++++++++++++++----
 1 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/zq-erp/src/test/java/com/matrix/DataMoveTest.java b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
index affb34b..ff133c1 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);
@@ -49,7 +49,7 @@
     /**
      * 会员等级迁移
      */
-    @Test
+//    @Test
     public void vipLevelMove() {
         List<SysVipLevel> sysVipLevels = dataMove.vipLevelOld();
         dataMove.vipLevelNew(sysVipLevels);
@@ -58,7 +58,7 @@
     /**
      * 会员信息迁移
      */
-//    @Test
+    //@Test
     public void vipInfoMoveTest() {
         dataMove.vipInfoNew(dataMove.vipInfoOld());
     }
@@ -91,14 +91,77 @@
      * 充值卡
      * 套餐
      * 综合卡
+     *
+     *  ALTER TABLE `hive_test_meidu`.`shopping_goods` MODIFY COLUMN `is_once` int(10) NULL DEFAULT NULL AFTER `is_present`;
      */
-    @Test
+//    @Test
     public void shoppingGoodsMoveTest() {
-        dataMove.shoppingGoodsNew(dataMove.shoppingGoodsOld("家居产品"));
+        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 shoppingGoodsProjTest() {
-        dataMove.shoppingGoodsNew(dataMove.shoppingGoodsProjectOld());
+    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());
+    }
+
+    public void updateServiceOrderStaff() {
+        dataMove.updateServiceOrderStaff();
     }
 }

--
Gitblit v1.9.1