From 688340d1932b5275b5b43ade09818b86c613ba70 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 10 Jul 2021 14:24:50 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 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 9856f9c..3de7c6c 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();
@@ -1686,4 +1692,21 @@
}
}
+ public void updateServiceOrderStaff() {
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
+
+ List<SysBeauticianState> sysBeauticianStates = sysBeauticianStateDao.selectByModel(null);
+ for (SysBeauticianState state : sysBeauticianStates) {
+ Long staffId = state.getStaffId();
+
+ Integer integer = shopStaff.get(staffId.toString());
+
+ if (integer == null) {
+ state.setStaffId(-staffId);
+ } else {
+ state.setStaffId(integer.longValue());
+ }
+ sysBeauticianStateDao.update(state);
+ }
+ }
}
--
Gitblit v1.9.1