From f2b9a83f75a4345cd42d008f3153c18f8f890cad Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 19 Sep 2022 13:54:17 +0800 Subject: [PATCH] fix:退款订单退业绩是订单状态的判断 --- zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 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 22ef160..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,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.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; @@ -44,9 +46,13 @@ 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); @@ -57,4 +63,6 @@ ErpOrderDetailVo findUserOrderById(Long orderId); BigDecimal selectArrearsByVipId(Long vipId); + + int selectPadApiOrderListTotal(@Param("record") PadOrderListDto orderListDto); } \ No newline at end of file -- Gitblit v1.9.1