From 840d78d6ff875d36e6a602772ea9b49b0732ae63 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 19 Apr 2021 16:57:08 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml | 4 ++++
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml | 4 ++++
zq-erp/src/test/java/com/matrix/DataMoveTest.java | 7 ++++++-
zq-erp/src/main/java/com/matrix/system/dataMove/DateMoveServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++++-
zq-erp/src/main/java/com/matrix/system/hive/dao/AchieveNewDao.java | 2 ++
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java | 2 ++
6 files changed, 55 insertions(+), 2 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 5fa3dce..08800f8 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
@@ -491,6 +491,11 @@
shoppingGood.setIsDel(1);
shoppingGood.setZjm(StringUtils.toHanyuPinyin(shoppingGood.getName()) + "," + StringUtils.toHeadWordHanyuPinyin(shoppingGood.getName()));
+ if (shoppingGood.getCarUseCount() != null) {
+ shoppingGood.setIsCourse("Y");
+ shoppingGood.setIsInfinite("N");
+ }
+
shoppingGood.setWeiDescription("数据迁移-tc");
List<ShoppingGoodsAssemble> assembleList = mapsToListBean(assembles, ShoppingGoodsAssemble.class);
@@ -1074,7 +1079,7 @@
"\t\ta.balance,\n" +
"\t\ta.remark,\n" +
" b.name projName,\n" +
- " sum(a.SURPLUS_COUNT) SURPLUS_COUNT\n" +
+ " a.SURPLUS_COUNT\n" +
"\t\tfrom sys_proj_use a\n" +
"\t\tleft join shopping_goods b on a.TAOCAN_ID= b.ID\n" +
"where TAOCAN_ID IS NOT NULL\n" +
@@ -1507,4 +1512,35 @@
}
}
+
+ @Transactional(rollbackFor = Exception.class)
+ public void tyOrderAndAchieveMove() {
+ jdbcTemplate.update("update sys_order set order_type=1, is_has_refund=2 where 1=1");
+
+ List<SysOrderFlow> flows = sysOrderFlowDao.selectOrderFlowByType();
+ if (CollUtil.isNotEmpty(flows)) {
+ for (SysOrderFlow flow : flows) {
+ SysOrder sysOrder = sysOrderDao.selectById(flow.getOrderId());
+ sysOrder.setIsHasRefund(1);
+ sysOrderDao.update(sysOrder);
+ }
+ }
+
+ List<AchieveNew> achieveNews = achieveNewDao.selectAchieveForOrder();
+ if (CollUtil.isNotEmpty(achieveNews)) {
+ for (AchieveNew achieveNew : achieveNews) {
+ if ("现金业绩".equalsIgnoreCase(achieveNew.getAchieveType())) {
+ achieveNew.setPayMethod("现金");
+ } else {
+ achieveNew.setPayMethod("划扣");
+ }
+ achieveNew.setAchieveType("顾问业绩");
+ achieveNew.setGoodsCash(Double.parseDouble(achieveNew.getT1()));
+ achieveNewDao.updateByModel(achieveNew);
+ }
+
+ }
+
+ }
+
}
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 ee17812..3865fb2 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
@@ -77,4 +77,6 @@
int deleteByOrderId(@Param("orderId") Long orderId);
List<AchieveNew> selectAchieveByServiceOrderId(@Param("serviceOrderId") Long serviceOrderId);
+
+ List<AchieveNew> selectAchieveForOrder();
}
\ No newline at end of file
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
index 7c816e3..8c9f6af 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java
@@ -23,4 +23,6 @@
Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime);
Integer deleteByOrderId(@Param("orderId") Long orderId);
+
+ List<SysOrderFlow> selectOrderFlowByType();
}
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 903b2d7..0e379c1 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml
@@ -1070,4 +1070,8 @@
<select id="selectAchieveByServiceOrderId" resultMap="AchieveNewMap">
select * from achieve_new where service_order_id=#{serviceOrderId}
</select>
+
+ <select id="selectAchieveForOrder" resultMap="AchieveNewMap">
+ select * from achieve_new where order_type='订单'
+ </select>
</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
index 5c56a95..70ba582 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -187,4 +187,8 @@
</where>
</select>
+ <select id="selectOrderFlowByType" resultMap="SysOrderFlowMap">
+ select * from sys_order_flow where flow_type='退款'
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/zq-erp/src/test/java/com/matrix/DataMoveTest.java b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
index 93f0bb9..5f73b50 100644
--- a/zq-erp/src/test/java/com/matrix/DataMoveTest.java
+++ b/zq-erp/src/test/java/com/matrix/DataMoveTest.java
@@ -142,8 +142,13 @@
dataMove.serviceOrderNew(dataMove.serviceOrderOld());
}
-
+ @Test
public void moneyCardUseMoveTest() {
dataMove.moneyCardUseNew(dataMove.moneyCardUseOld());
}
+
+
+ public void tyOrderAndAchieveDataTest() {
+
+ }
}
--
Gitblit v1.9.1