From 3fd6e55be5b9f5013c437529f035ea4383dd98ca Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Mar 2021 14:29:48 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 65 insertions(+), 4 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 04fbd40..c6ccb3d 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
@@ -15,6 +15,7 @@
import com.matrix.system.hive.service.SysVipInfoService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -778,15 +779,20 @@
Map<String, Integer> goodCZK = getRedisIds("shopping_goods_czk");
Map<String, Integer> goodZHK = getRedisIds("shopping_goods_zhk");
Map<String, Integer> shopIds = getRedisIds("shopId");
- Map<String, Integer> sysUsers = getRedisIds("sys_users");
+// Map<String, Integer> sysUsers = getRedisIds("sys_users");
Map<String, Integer> vipInfos = getRedisIds("vip_info");
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
for (SysOrder order : orders) {
List<Map<String, Object>> itemsMap = jdbcTemplate.queryForList("select * from sys_order_item where ORDER_ID=" + order.getId());
Integer shopId = shopIds.get(order.getShopId().toString());
order.setShopId(shopId.longValue());
- Integer statffId = sysUsers.get(order.getStaffId().toString());
+ if ("已付款".equals(order.getStatu()) || "欠款".equals(order.getStatu())) {
+ order.setPayTime(order.getOrderTime());
+ }
+
+ Integer statffId = shopStaff.get(order.getStaffId().toString());
if (statffId != null) {
order.setStaffId(statffId.longValue());
} else {
@@ -907,14 +913,14 @@
} else {
achieve.setAchieveType("美疗师业绩");
}
- Integer beaultId = sysUsers.get(achieve.getBeaultId().toString());
+ Integer beaultId = shopStaff.get(achieve.getBeaultId().toString());
if (beaultId != null) {
achieve.setBeaultId(beaultId.longValue());
} else {
achieve.setBeaultId(-achieve.getBeaultId());
}
- Integer saleId = sysUsers.get(achieve.getSaleId().toString());
+ Integer saleId = shopStaff.get(achieve.getSaleId().toString());
if (saleId != null) {
achieve.setSaleId(saleId.longValue());
} else {
@@ -1303,5 +1309,60 @@
}
}
+ @DS("slave")
+ public List<SysUsers> shopStaffInfoOld() throws UnsupportedEncodingException, NoSuchAlgorithmException {
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_shopstaff_info");
+ Map<String, Integer> sysUsersMap = getRedisIds("sys_users");
+ Map<String, Integer> shopMap = getRedisIds("shopId");
+ Map<Long, Long> staffMap = new HashMap<>();
+
+ List<SysUsers> list = new ArrayList<>();
+ // EmptyResultDataAccessException
+ for (Map<String, Object> map : maps) {
+ try {
+ Map<String, Object> staffUser = jdbcTemplate.queryForMap("select * from users where staff_id=" + map.get("id"));
+ Integer id = sysUsersMap.get(staffUser.get("id").toString());
+ staffMap.put(Long.parseLong(map.get("id").toString()), id.longValue());
+ } catch (EmptyResultDataAccessException e) {
+ SysUsers sysUsers = new SysUsers();
+ sysUsers.setSuAccount((String) map.get("staff_no"));
+ sysUsers.setSuId((Long) map.get("id"));
+ sysUsers.setSuName((String) map.get("staff_name"));
+ sysUsers.setSuSex((String) map.get("sex"));
+ sysUsers.setSuUserType("employee");
+ sysUsers.setSuAccountStatus(AppConstance.ACCOUNT_STATUS_INACTIVATED);
+ sysUsers.setSuValid("N");
+ sysUsers.setCompanyId(companyId);
+ Long aaa = (Long) map.get("shop_id");
+ if (aaa != null) {
+ Integer shopId = shopMap.get(aaa.toString());
+ if (shopId != null) {
+ sysUsers.setShopId(Long.parseLong(shopId.toString()));
+ }
+ }
+ sysUsers.setSuRegisterTime(new Date());
+ sysUsers.setCreateBy(AppConstance.SYSTEM_USER);
+ sysUsers.setUpdateBy(AppConstance.SYSTEM_USER);
+ sysUsers.setSuPassword(PasswordUtil.getEncrypUserPwd(sysUsers));
+ list.add(sysUsers);
+ }
+ }
+ redisClient.saveMapValue("shop_staff", staffMap);
+ return list;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void shopStaffInfoNew(List<SysUsers> list) {
+ Map<String, Integer> shopStaff = getRedisIds("shop_staff");
+ for (SysUsers sysUsers : list) {
+ Long oldId = sysUsers.getSuId();
+ sysUsers.setSuId(null);
+ sysUsersDao.insert(sysUsers);
+ shopStaff.put(oldId.toString(), sysUsers.getSuId().intValue());
+ }
+
+ redisClient.saveMapValue("shop_staff", shopStaff);
+ }
+
}
--
Gitblit v1.9.1