From a4a1350a04f94e7ee553d6091069b3fd5c26a6b2 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 29 Mar 2021 14:10:56 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/config/application.yml | 3
zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml | 6
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 4
zq-erp/src/test/java/com/matrix/DataMoveTest.java | 6 +
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java | 10 ++
zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java | 9 +
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 212 ++++++++++++++++++++++++++++++++++++++++++
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java | 2
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 5
9 files changed, 247 insertions(+), 10 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 84e51b6..04fbd40 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
@@ -13,6 +13,7 @@
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.SysVipInfoService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -54,6 +55,8 @@
private ShoppingGoodsDao shoppingGoodsDao;
@Autowired
private ShoppingGoodsAssembleDao shoppingGoodsAssembleDao;
+ @Autowired
+ private MoneyCardUseDao moneyCardUseDao;
@Autowired
private RedisClient redisClient;
@@ -981,16 +984,28 @@
if (CollUtil.isNotEmpty(sysOrder.getFlows())) {
for (SysOrderFlow flow : sysOrder.getFlows()) {
- flow.setOrderId(oldOrderId);
+ if ("储值卡".equals(flow.getPayMethod())) {
+ MoneyCardUse moneyCardUse = new MoneyCardUse();
+ moneyCardUse.setIsVipCar("Y");
+ moneyCardUse.setVipId(flow.getVipId());
+ List<MoneyCardUse> moneyCardUses = moneyCardUseDao.selectVipCardUse(moneyCardUse);
+ if (CollUtil.isNotEmpty(moneyCardUses)) {
+ flow.setCardId(moneyCardUses.get(0).getId());
+ }
+ }
+ flow.setOrderId(sysOrder.getId());
+ flow.setCreateBy("数据迁移");
sysOrderFlowDao.insert(flow);
}
}
if (CollUtil.isNotEmpty(sysOrder.getAchieveNews())) {
for (AchieveNew achieveNew : sysOrder.getAchieveNews()) {
- achieveNew.setOrderId(oldOrderId);
+ achieveNew.setOrderId(sysOrder.getId());
Long item = itemIds.get(achieveNew.getOrderItemId());
+ achieveNew.setT9("数据迁移");
achieveNew.setOrderItemId(item);
+ achieveNew.setId(null);
}
achieveNewDao.batchInsert(sysOrder.getAchieveNews());
@@ -1093,7 +1108,200 @@
sysProjUseDao.insert(sysProjUse);
map.put(oldId, sysProjUse.getId());
}
+
+ redisClient.saveMapValue("proj_use", map);
}
}
+ @DS("slave")
+ public List<SysProjServices> serviceOrderOld() {
+ List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from sys_proj_services");
+ List<SysProjServices> list = mapsToListBean(maps, SysProjServices.class);
+
+
+ Map<String, Integer> vipInfos = getRedisIds("vip_info");
+ Map<String, Integer> bedInfos = getRedisIds("bed_info");
+ Map<String, Integer> sysUsers = getRedisIds("sys_users");
+ Map<String, Integer> projUses = getRedisIds("proj_use");
+ Map<String, Integer> goodProj = getRedisIds("shopping_goods_proj");
+ Map<String, Integer> shopIds = getRedisIds("shopId");
+ for (SysProjServices sysProjServices : list) {
+ List<Map<String, Object>> beauticiansMap = jdbcTemplate.queryForList("select * from sys_beautician_state where SERVICES_ID=" + sysProjServices.getId());
+// Map<String, Object> bedStatesMap = jdbcTemplate.queryForMap("select * from sys_bed_state where SERVICE_ID=" + sysProjServices.getId());
+// List<Map<String, Object>> achieveMaps = jdbcTemplate.queryForList("select * from achieve_new where service_order_id=" + sysProjServices.getId());
+
+
+ SysBedState query = new SysBedState();
+ query.setServiceId(sysProjServices.getId());
+ List<SysBedState> queryBeds = sysBedStateDao.selectByModel(query);
+ SysBedState bedStates = null;
+ if (CollUtil.isNotEmpty(queryBeds)) {
+ bedStates = queryBeds.get(0);
+ }
+ List<SysBeauticianState> beauticians = mapsToListBean(beauticiansMap, SysBeauticianState.class);
+ List<AchieveNew> achieveNews = achieveNewDao.selectAchieveByServiceOrderId(sysProjServices.getId());
+// SysBedState bedStates = mapToBane(bedStatesMap, SysBedState.class);
+
+ Integer shopId = shopIds.get(sysProjServices.getShopId().toString());
+ if (shopId != null) {
+ sysProjServices.setShopId(shopId.longValue());
+ } else {
+ sysProjServices.setShopId(-sysProjServices.getShopId());
+ }
+
+ if (sysProjServices.getBedId() != null) {
+ Integer bedId = bedInfos.get(sysProjServices.getBedId().toString());
+ if (bedId != null) {
+ sysProjServices.setBedId(bedId.longValue());
+ bedStates.setBedId(bedId.longValue());
+ } else {
+ sysProjServices.setBedId(-sysProjServices.getBedId());
+ bedStates.setBedId(-sysProjServices.getBedId());
+ }
+ sysProjServices.setBedState(bedStates);
+ }
+
+ if (sysProjServices.getBeauticianId() != null) {
+ Integer beautyId = sysUsers.get(sysProjServices.getBeauticianId().toString());
+ if (beautyId != null) {
+ sysProjServices.setBeauticianId(beautyId.longValue());
+ } else {
+ sysProjServices.setBeauticianId(-sysProjServices.getBeauticianId());
+ }
+ }
+
+ if (sysProjServices.getDevisionId() != null) {
+ Integer devisionId = sysUsers.get(sysProjServices.getDevisionId().toString());
+ if (devisionId != null) {
+ sysProjServices.setDevisionId(devisionId.longValue());
+ } else {
+ sysProjServices.setDevisionId(-sysProjServices.getDevisionId());
+ }
+ }
+
+ if (sysProjServices.getCreateStaffId() != null) {
+ Integer staffId = sysUsers.get(sysProjServices.getCreateStaffId().toString());
+ if (staffId != null) {
+ sysProjServices.setCreateStaffId(staffId.longValue());
+ } else {
+ sysProjServices.setCreateStaffId(-sysProjServices.getCreateStaffId());
+ }
+ }
+ Integer vipId = null;
+ if (sysProjServices.getVipId() != null) {
+ vipId = vipInfos.get(sysProjServices.getVipId().toString());
+ if (vipId != null) {
+ sysProjServices.setVipId(vipId.longValue());
+ } else {
+ sysProjServices.setVipId(-sysProjServices.getVipId());
+ }
+ }
+
+ if (CollUtil.isNotEmpty(beauticians)) {
+ List<SysBeauticianState> newBeautician = new ArrayList<>();
+ for (SysBeauticianState beautician : beauticians) {
+ List<Map<String, Object>> beaProjMaps = jdbcTemplate.queryForList("select distinct proj_id from service_bea_proj where ser_proj_id is not null and bea_state_id=" + beautician.getId());
+ for (Map<String, Object> beaProjMap : beaProjMaps) {
+ SysBeauticianState beauticianState = new SysBeauticianState();
+ BeanUtils.copyProperties(beautician, beauticianState);
+ String puseIdStr = beaProjMap.get("proj_id").toString();
+ Integer puseId = projUses.get(puseIdStr);
+ beauticianState.setPuseId(puseId != null ? puseId.longValue() : -Long.parseLong(puseIdStr));
+
+ SysProjUse sysProjUse = sysProjUseDao.selectById(Long.parseLong(puseIdStr));
+// Map<String, Object> projUseMap = jdbcTemplate.queryForMap("select * from sys_proj_use where id=" + puseIdStr);
+ if (sysProjUse != null) {
+ Integer goodsProjId = goodProj.get(sysProjUse.getProjId().toString());
+ beauticianState.setProjId(goodsProjId != null ? goodsProjId.longValue() : -Long.parseLong(sysProjUse.getProjId().toString()));
+ }
+
+ beauticianState.setCount(1);
+ beauticianState.setExtract("数据迁移");
+ newBeautician.add(beauticianState);
+ }
+ }
+ sysProjServices.setServiceItems(newBeautician);
+ }
+
+ if (CollUtil.isNotEmpty(achieveNews)) {
+ for (AchieveNew achieveNew : achieveNews) {
+ achieveNew.setShopId(shopId != null ? shopId.longValue() : -achieveNew.getShopId());
+ achieveNew.setVipId(vipId != null ? vipId.longValue() : -achieveNew.getVipId());
+
+ Integer saleIdInt = sysUsers.get(achieveNew.getSaleId() == null ? "" : achieveNew.getSaleId().toString());
+ achieveNew.setSaleId(saleIdInt == null ? -achieveNew.getSaleId() : saleIdInt);
+
+ Integer beaultyIdInt = sysUsers.get(achieveNew.getBeaultId() == null ? "" : achieveNew.getBeaultId().toString());
+ achieveNew.setBeaultId(beaultyIdInt == null ? -achieveNew.getBeaultId() : beaultyIdInt);
+
+ if (achieveNew.getShoppingGoodsId() != null) {
+ Integer goodsId = goodProj.get(achieveNew.getShoppingGoodsId().toString());
+ achieveNew.setShoppingGoodsId(goodsId == null ? -achieveNew.getShoppingGoodsId() : goodsId.longValue());
+ }
+
+ achieveNew.setT9("数据迁移");
+ }
+ }
+ sysProjServices.setAchieveNews(achieveNews);
+
+ }
+
+
+ return list;
+ }
+
+ @Autowired
+ private SysProjServicesDao sysProjServicesDao;
+ @Autowired
+ private SysBeauticianStateDao sysBeauticianStateDao;
+ @Autowired
+ private SysBedStateDao sysBedStateDao;
+
+ @Transactional(rollbackFor = Exception.class)
+ public void serviceOrderNew(List<SysProjServices> list) {
+ if (CollUtil.isNotEmpty(list)) {
+ Map<Long, Long> maps = new HashMap<>();
+ Map<Long, Long> beautyMaps = new HashMap<>();
+ for (SysProjServices sysProjServices : list) {
+ Long oldId = sysProjServices.getId();
+ sysProjServices.setId(null);
+ sysProjServices.setComment("数据迁移");
+ sysProjServices.setCompanyId(companyId);
+ sysProjServicesDao.insert(sysProjServices);
+ Long newId = sysProjServices.getId();
+ List<SysBeauticianState> serviceItems = sysProjServices.getServiceItems();
+ if (CollUtil.isNotEmpty(serviceItems)) {
+ for (SysBeauticianState serviceItem : serviceItems) {
+ serviceItem.setServicesId(newId);
+ Long beautyOldId = serviceItem.getId();
+ serviceItem.setId(null);
+ serviceItem.setExtract("数据迁移");
+ sysBeauticianStateDao.insert(serviceItem);
+ beautyMaps.put(beautyOldId, serviceItem.getId());
+ }
+ }
+ SysBedState bedState = sysProjServices.getBedState();
+ if (bedState != null) {
+ bedState.setId(null);
+ bedState.setServiceId(newId);
+ sysBedStateDao.insert(bedState);
+ }
+
+ List<AchieveNew> achieveNews = sysProjServices.getAchieveNews();
+ if (CollUtil.isNotEmpty(achieveNews)) {
+ for (AchieveNew achieveNew : achieveNews) {
+ achieveNew.setId(null);
+ achieveNew.setOrderItemId(beautyMaps.get(achieveNew.getOrderItemId()));
+ achieveNew.setServiceOrderId(newId);
+ }
+ achieveNewDao.batchInsert(achieveNews);
+ }
+ maps.put(oldId, newId);
+ }
+
+ redisClient.saveMapValue("service_order", maps);
+ }
+ }
+
+
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java
index acd3b19..243f318 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrderItem.java
@@ -15,6 +15,16 @@
private static final long serialVersionUID = 1L;
+ private String createBy;
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
/**
* 订单明细
*/
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
index 1350bdb..341d013 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/bean/SysProjServices.java
@@ -18,6 +18,15 @@
private static final long serialVersionUID = 1L;
+ private List<AchieveNew> achieveNews;
+
+ public List<AchieveNew> getAchieveNews() {
+ return achieveNews;
+ }
+
+ public void setAchieveNews(List<AchieveNew> achieveNews) {
+ this.achieveNews = achieveNews;
+ }
/**
* 序号
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
index d5f206e..ee17812 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java
@@ -75,4 +75,6 @@
List<RankingVo> selectStaffSaleAchieveRanking(@Param("record") AchieveNew achieveNew);
int deleteByOrderId(@Param("orderId") Long orderId);
+
+ List<AchieveNew> selectAchieveByServiceOrderId(@Param("serviceOrderId") Long serviceOrderId);
}
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/config/application.yml b/zq-erp/src/main/resources/config/application.yml
index 46087ae..29d4741 100644
--- a/zq-erp/src/main/resources/config/application.yml
+++ b/zq-erp/src/main/resources/config/application.yml
@@ -35,6 +35,9 @@
initial-size: 5
autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+ thymeleaf:
+ prefix: classpath:/templates/views/
+ cache: false
useRabbit: false
rabbitmq:
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
index c99b814..903b2d7 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -1066,4 +1066,8 @@
group by a.shop_id
order by amount desc, a.shop_id
</select>
+
+ <select id="selectAchieveByServiceOrderId" resultMap="AchieveNewMap">
+ select * from achieve_new where service_order_id=#{serviceOrderId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml
index e78e21d..656a1a4 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml
@@ -214,9 +214,9 @@
<if test="record.serviceId != null and record.serviceId !='' ">
and a.SERVICE_ID = #{record.serviceId}
</if>
- <if test="record.bedInfo != null and record.bedInfo.shopId !=null ">
- and b.SHOP_ID = #{record.bedInfo.shopId}
- </if>
+<!-- <if test="record.bedInfo != null and record.bedInfo.shopId !=null ">-->
+<!-- and b.SHOP_ID = #{record.bedInfo.shopId}-->
+<!-- </if> -->
</if>
</sql>
</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 3ba6f8c..c849888 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -526,11 +526,8 @@
<!-- 根据id查询 -->
<select id="selectById" resultMap="SysProjUseMap">
- select a.*,
- b.TIME_LENGTH,
- b.img
+ select a.*
from sys_proj_use a
- left join shopping_goods b on a.proj_id=b.id
where
a.id=#{id}
</select>
diff --git a/zq-erp/src/test/java/com/matrix/DataMoveTest.java b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
index d69022e..50a86ff 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -117,7 +117,7 @@
dataMove.shoppingGoodsZhkNew(dataMove.shoppingGoodsZhkOld());
}
-// @Test
+ @Test
public void orderMoveTest() {
dataMove.orderNew(dataMove.orderOld());
}
@@ -132,4 +132,8 @@
dataMove.projUseNew(dataMove.projUseMoveOld());
}
+ @Test
+ public void serviceOrderMoveTest() {
+ dataMove.serviceOrderNew(dataMove.serviceOrderOld());
+ }
}
--
Gitblit v1.9.1