From 96eda9af2046e59fe3bc991f945682774b34e05c Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 12 Apr 2021 15:38:40 +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 |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 50 insertions(+), 5 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..93f0bb9 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -49,7 +49,7 @@
     /**
      * 会员等级迁移
      */
-    @Test
+//    @Test
     public void vipLevelMove() {
         List<SysVipLevel> sysVipLevels = dataMove.vipLevelOld();
         dataMove.vipLevelNew(sysVipLevels);
@@ -92,13 +92,58 @@
      * 套餐
      * 综合卡
      */
-    @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 projUseMoveTest() {
+        dataMove.projUseNew(dataMove.projUseMoveOld());
     }
 
     @Test
-    public void shoppingGoodsProjTest() {
-        dataMove.shoppingGoodsNew(dataMove.shoppingGoodsProjectOld());
+    public void serviceOrderMoveTest() {
+        dataMove.serviceOrderNew(dataMove.serviceOrderOld());
+    }
+
+
+    public void moneyCardUseMoveTest() {
+        dataMove.moneyCardUseNew(dataMove.moneyCardUseOld());
     }
 }

--
Gitblit v1.9.1