From 113a78c242743578dceca029a793f54c6c059987 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Fri, 09 Jul 2021 23:40:27 +0800
Subject: [PATCH] “fix”
---
zq-erp/src/test/java/com/matrix/DataMoveTest.java | 8 ++++----
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 34 ++++++++++++++++++++--------------
2 files changed, 24 insertions(+), 18 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 da4f319..32ef850 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
@@ -64,7 +64,7 @@
private RedisClient redisClient;
private Long companyId = 35L;
- private Long shopId = 38L;
+ private Long shopId = 60L;
public List<Map<String, Object>> dataMove() {
return jdbcTemplate.queryForList("select * from sys_vip_info limit 10");
@@ -678,11 +678,13 @@
} else {
shoppingGoods.setIsOnce("1");
}
-
- if ("否".equals(shoppingGoods.getIsPresent())) {
- shoppingGoods.setIsPresent("0");
- } else {
- shoppingGoods.setIsPresent("1");
+
+ if (StrUtil.isNotBlank(shoppingGoods.getIsPresent())) {
+ if ("否".equals(shoppingGoods.getIsPresent())) {
+ shoppingGoods.setIsPresent("0");
+ } else {
+ shoppingGoods.setIsPresent("1");
+ }
}
Long oldId = shoppingGoods.getId();
@@ -705,10 +707,12 @@
assembleGood.getShoppingGoods().setIsOnce("1");
}
- if ("否".equals(assembleGood.getShoppingGoods().getIsPresent())) {
- assembleGood.getShoppingGoods().setIsPresent("0");
- } else {
- assembleGood.getShoppingGoods().setIsPresent("1");
+ if (StrUtil.isNotBlank(assembleGood.getShoppingGoods().getIsPresent())) {
+ if ("否".equals(assembleGood.getShoppingGoods().getIsPresent())) {
+ assembleGood.getShoppingGoods().setIsPresent("0");
+ } else {
+ assembleGood.getShoppingGoods().setIsPresent("1");
+ }
}
assembleGood.getShoppingGoods().setId(null);
@@ -790,10 +794,12 @@
shoppingGoods.setIsOnce("1");
}
- if ("否".equals(shoppingGoods.getIsPresent())) {
- shoppingGoods.setIsPresent("0");
- } else {
- shoppingGoods.setIsPresent("1");
+ if (StrUtil.isNotBlank(shoppingGoods.getIsPresent())) {
+ if ("否".equals(shoppingGoods.getIsPresent())) {
+ shoppingGoods.setIsPresent("0");
+ } else {
+ shoppingGoods.setIsPresent("1");
+ }
}
Long oldId = shoppingGoods.getId();
diff --git a/zq-erp/src/test/java/com/matrix/DataMoveTest.java b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
index 57698c0..15700b0 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -58,7 +58,7 @@
/**
* 会员信息迁移
*/
- @Test
+ //@Test
public void vipInfoMoveTest() {
dataMove.vipInfoNew(dataMove.vipInfoOld());
}
@@ -124,17 +124,17 @@
dataMove.shopStaffInfoNew(dataMove.shopStaffInfoOld());
}
-// @Test
+ // @Test
public void orderMoveTest() {
dataMove.orderNew(dataMove.orderOld());
}
-// @Test
+ @Test
public void bedInfoMoveTest() {
dataMove.bedInfoNew(dataMove.bedInfoOld());
}
-// @Test
+ @Test
public void projUseMoveTest() {
dataMove.projUseNew(dataMove.projUseMoveOld());
}
--
Gitblit v1.9.1