From a13a93a493e7e94e28b2225c26e7e13b52d3288c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 12 Apr 2021 19:48:45 +0800
Subject: [PATCH] 20210412  tqq环境

---
 zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java
index b0c55ff..c052f28 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java
@@ -5,6 +5,8 @@
 import com.matrix.system.app.vo.OrderDetailVo;
 import com.matrix.system.app.vo.RankingVo;
 import com.matrix.system.hive.bean.SysOrder;
+import com.matrix.system.shopXcx.api.dto.ErpOrderListDto;
+import com.matrix.system.shopXcx.api.vo.ErpOrderDetailVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -35,7 +37,7 @@
 
 	public int selectInPageCount(@Param("record") SysOrder sysOrder);
 
-	public void updateOrderTime(@Param("orderTime") Date orderTime, @Param("id") Long id);
+	public void updateOrderTime(@Param("payTime") Date orderTime, @Param("id") Long id);
 
 	SysOrder selectVipOrderInfoTotal(@Param("vipId") Long vipId);
 
@@ -48,4 +50,8 @@
 	List<RankingVo> selectShopAchieveRanking(@Param("record") SysOrder sysOrder);
 
 	List<RankingVo> selectStaffSaleAchieveRanking(@Param("record") SysOrder sysOrder);
+
+	List<ErpOrderDetailVo> selectErpOrderList(ErpOrderListDto erpOrderListDto);
+
+	ErpOrderDetailVo findUserOrderById(Long orderId);
 }
\ No newline at end of file

--
Gitblit v1.9.1