From e5d8b92923059affb23b2b40a5d96baa3a9e889d Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 10 Jul 2021 14:25:51 +0800
Subject: [PATCH] fix
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 37 ++++++++++++++++++++++---------------
1 files changed, 22 insertions(+), 15 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..cd588ef 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();
@@ -1530,7 +1536,8 @@
moneyCardUse.setIsVipCar("N");
ShoppingGoods shoppingGoods = shoppingGoodsDao.selectById(moneyCardUse.getGoodsId());
- moneyCardUse.setCardName(shoppingGoods.getName());
+ if (shoppingGoods != null)
+ { moneyCardUse.setCardName(shoppingGoods.getName());}
Integer vipId = null;
if (moneyCardUse.getVipId() != null) {
--
Gitblit v1.9.1