From 0944bb0dedeaf1c0e1b3fa7caa38ebaf11831fa8 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Wed, 03 Feb 2021 10:22:16 +0800
Subject: [PATCH] 1、修改时间，修改交易流水bug
---
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java | 12 ++++++++----
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml | 7 ++++++-
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderFlowDao.java | 3 +++
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
index f72043c..2399c96 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java
@@ -16,10 +16,7 @@
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.bean.*;
-import com.matrix.system.hive.dao.MoneyCardUseDao;
-import com.matrix.system.hive.dao.SysOrderDao;
-import com.matrix.system.hive.dao.SysOrderItemDao;
-import com.matrix.system.hive.dao.SysShopInfoDao;
+import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
@@ -84,6 +81,9 @@
@Autowired
private SysOrderFlowService sysOrderFlowService;
+
+ @Autowired
+ private SysOrderFlowDao sysOrderFlowDao;
@Autowired
RabiitMqTemplate rabiitMqTemplate;
@@ -288,6 +288,10 @@
achieveNew.setOrderId(sysOrder.getId());
achieveNew.setDatatime(sysOrder.getPayTime());
achieveNewService.modifyAchieveTime(achieveNew);
+ //更新收款流水时间
+ sysOrderFlowDao.updateTimeByOrderId(sysOrder.getId(),sysOrder.getPayTime());
+
+
return new AjaxResult(AjaxResult.STATUS_SUCCESS, "修改成功");
}
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 12411f9..14da40d 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
@@ -5,6 +5,7 @@
import com.matrix.system.hive.vo.OrderFlowVo;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
public interface SysOrderFlowDao {
@@ -18,4 +19,6 @@
List<OrderFlowVo> selectInPage(@Param("record") OrderFlowListDto orderFlowListDto);
Integer selectTotal(@Param("record")OrderFlowListDto orderFlowListDto);
+
+ Integer updateTimeByOrderId(@Param("orderId") Long orderId, @Param("payTime") Date payTime);
}
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 eb0d269..5d544e3 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderFlowDao.xml
@@ -60,8 +60,13 @@
#{companyId}
)
</insert>
+ <update id="updateTimeByOrderId">
+ UPDATE sys_order_flow set
+ create_time=#{payTime}
+ where order_id=#{orderId}
+ </update>
- <select id="selectByOrderId" resultMap="SysOrderFlowMap">
+ <select id="selectByOrderId" resultMap="SysOrderFlowMap">
select a.*, b.order_no from sys_order_flow a
left join sys_order b on a.order_id=b.id
where order_id=#{orderId}
--
Gitblit v1.9.1