From 61dcfaaeafca730ab51a890e030f3b8e6d6ec915 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 26 Mar 2021 14:39:15 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 36 insertions(+), 9 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 5b755e5..84e51b6 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
@@ -944,6 +944,7 @@
flow.setVipId(sysOrder.getVipId());
flow.setShopId(sysOrder.getShopId());
flow.setCompanyId(sysOrder.getCompanyId());
+ flow.setPayMethod(type);
return flow;
}
@@ -968,17 +969,21 @@
sysOrderDao.insert(sysOrder);
orderIds.put(oldOrderId, sysOrder.getId());
- for (SysOrderItem item : sysOrder.getItems()) {
- Long oldItemId = item.getId();
- item.setOrderId(sysOrder.getId());
- item.setId(null);
- sysOrderItemDao.insert(item);
- itemIds.put(oldItemId, item.getId());
+ if (CollUtil.isNotEmpty(sysOrder.getItems())) {
+ for (SysOrderItem item : sysOrder.getItems()) {
+ Long oldItemId = item.getId();
+ item.setOrderId(sysOrder.getId());
+ item.setId(null);
+ sysOrderItemDao.insert(item);
+ itemIds.put(oldItemId, item.getId());
+ }
}
- for (SysOrderFlow flow : sysOrder.getFlows()) {
- flow.setOrderId(oldOrderId);
- sysOrderFlowDao.insert(flow);
+ if (CollUtil.isNotEmpty(sysOrder.getFlows())) {
+ for (SysOrderFlow flow : sysOrder.getFlows()) {
+ flow.setOrderId(oldOrderId);
+ sysOrderFlowDao.insert(flow);
+ }
}
if (CollUtil.isNotEmpty(sysOrder.getAchieveNews())) {
@@ -1069,4 +1074,26 @@
return projUses;
}
+ @Autowired
+ private SysProjUseDao sysProjUseDao;
+
+ @Transactional(rollbackFor = Exception.class)
+ public void projUseNew(List<SysProjUse> list) {
+ if (CollUtil.isNotEmpty(list)) {
+ Map<Long, Long> map = new HashMap<>();
+ for (SysProjUse sysProjUse : list) {
+ if(sysProjUse.getType() == "套餐卡") {
+ sysProjUse.setType("套餐");
+ } else if (StrUtil.isEmpty(sysProjUse.getType())){
+ sysProjUse.setType("项目");
+ }
+
+ Long oldId = sysProjUse.getId();
+ sysProjUse.setId(null);
+ sysProjUseDao.insert(sysProjUse);
+ map.put(oldId, sysProjUse.getId());
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1