From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java | 16 +++++++++++++++-
1 files changed, 15 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 8320974..22ef160 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
@@ -3,9 +3,13 @@
import com.matrix.core.pojo.PaginationVO;
import com.matrix.system.app.dto.OrderListDto;
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.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -34,7 +38,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);
@@ -43,4 +47,14 @@
int selectApiOrderListTotal(@Param("record") OrderListDto orderListDto);
OrderDetailVo selectApiOrderDetailById(@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);
}
\ No newline at end of file
--
Gitblit v1.9.1