From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sun, 09 Oct 2022 21:41:13 +0800 Subject: [PATCH] Merge branch 'score_shop' --- zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java | 18 +++++++++++++++++- 1 files changed, 17 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..ec8828a 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; @@ -32,9 +36,11 @@ public SysOrder selectById(Long id); + public List<SysOrder> selectByIds(@Param("list")List<Long> ids); + 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 +49,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