From 58508692587d5d99ae905e8f1e4e4249ffb3b08a Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Sat, 09 Jan 2021 16:32:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/api' into api --- zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java b/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java index a283ccf..40a7f9e 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java @@ -2,6 +2,9 @@ import com.matrix.core.exception.GlobleException; 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.hive.plugin.util.BaseServices; import com.matrix.system.hive.pojo.CzXkVo; @@ -128,4 +131,14 @@ SysOrder checkAndSaveOrder(SysOrder sysOrder); SysOrder findSysOrderTjByVipId(Long vipId); + + List<OrderDetailVo> findApiOrderListInPage(OrderListDto orderListDto, PaginationVO pageVo); + + int findApiOrderListTotal(OrderListDto orderListDto); + + OrderDetailVo findApiOrderDetailByOrderId(Long orderId); + + List<RankingVo> findApiShopAchieveRanking(SysOrder sysOrder); + + List<RankingVo> findStaffSaleAchieveRanking(SysOrder sysOrder); } \ No newline at end of file -- Gitblit v1.9.1