From 9d731c918a193337eb308481b346076b31eecd0a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 27 Apr 2022 14:17:29 +0800
Subject: [PATCH] 20220426

---
 zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java |   19 ++++++++++++++++++-
 1 files changed, 18 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..de0098d 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,8 +5,13 @@
 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.padApi.dto.PadOrderListDto;
+import com.matrix.system.padApi.vo.PadOrderDetailVo;
+import com.matrix.system.shopXcx.api.dto.ErpOrderListDto;
+import com.matrix.system.shopXcx.api.vo.ErpOrderDetailVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -35,17 +40,29 @@
 
 	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);
 
 	List<OrderDetailVo> selectApiOrderListInPage(@Param("record") OrderListDto orderListDto, @Param("pageVo") PaginationVO pageVo);
 
+	List<PadOrderDetailVo> selectPadApiOrderListInPage(@Param("record") PadOrderListDto orderListDto, @Param("pageVo") PaginationVO pageVo);
+
 	int selectApiOrderListTotal(@Param("record") OrderListDto orderListDto);
 
 	OrderDetailVo selectApiOrderDetailById(@Param("orderId") Long orderId);
 
+	PadOrderDetailVo selectPadApiOrderDetailById(@Param("orderId") Long orderId);
+
 	List<RankingVo> selectShopAchieveRanking(@Param("record") SysOrder sysOrder);
 
 	List<RankingVo> selectStaffSaleAchieveRanking(@Param("record") SysOrder sysOrder);
+
+	List<ErpOrderDetailVo> selectErpOrderList(ErpOrderListDto erpOrderListDto);
+
+	ErpOrderDetailVo findUserOrderById(Long orderId);
+
+	BigDecimal selectArrearsByVipId(Long vipId);
+
+	int selectPadApiOrderListTotal(@Param("record") PadOrderListDto orderListDto);
 }
\ No newline at end of file

--
Gitblit v1.9.1