From 923ffa97c9cba7012e93a1b76ae74c064a9473c0 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Fri, 05 Feb 2021 14:06:11 +0800
Subject: [PATCH] 取消订单，删除交易流水
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml | 3 +++
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java | 2 +-
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java | 2 ++
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java | 4 ++++
4 files changed, 10 insertions(+), 1 deletions(-)
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 14da40d..7c816e3 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
@@ -21,4 +21,6 @@
Integer selectTotal(@Param("record")OrderFlowListDto orderFlowListDto);
Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime);
+
+ Integer deleteByOrderId(@Param("orderId") Long orderId);
}
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
index 3c4f658..2bd0261 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java
@@ -154,7 +154,7 @@
@Override
- public void addAchieveByServiceOrder(SysProjServices projServices) {
+ public void addAchieveByServiceOrder(SysProjServices projServices) {
List<AchieveNew> achieveNewList = new ArrayList<>();
List<SysBeauticianState> beauticianStateList = sysBeauticianStateDao.selectBySerIds(projServices.getId());
int size = beauticianStateList.size();
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
index d053c8f..75b3de3 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java
@@ -365,6 +365,10 @@
AchieveNew achieveNew = new AchieveNew();
achieveNew.setOrderId(id);
achieveNewService.removeByModel(achieveNew);
+
+ // 删除收款记录
+ sysOrderFlowDao.deleteByOrderId(id);
+
// 取消订单
order.setStatu(Dictionary.ORDER_STATU_YQX);
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 5d544e3..8333d05 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -65,6 +65,9 @@
create_time=#{payTime}
where order_id=#{orderId}
</update>
+ <delete id="deleteByOrderId">
+ delete sys_order_flow where order_id=#{orderId}
+ </delete>
<select id="selectByOrderId" resultMap="SysOrderFlowMap">
select a.*, b.order_no from sys_order_flow a
--
Gitblit v1.9.1