From ec37a0bddbec09bab3eb23e7858a9a6a633d28c6 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 05 May 2022 16:21:25 +0800 Subject: [PATCH] 20220505 --- zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 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 83a8ada..91f18c7 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 @@ -8,6 +8,8 @@ import com.matrix.system.hive.bean.SysOrder; import com.matrix.system.hive.plugin.util.BaseServices; import com.matrix.system.hive.pojo.CzXkVo; +import com.matrix.system.padApi.dto.PadOrderListDto; +import com.matrix.system.padApi.vo.PadOrderDetailVo; import java.math.BigDecimal; import java.util.List; @@ -80,9 +82,9 @@ * @date 2016年7月18日 上午11:14:07 * @throws */ - public void updateReceiptMoney(SysOrder sysOrder) throws GlobleException; + public void payOrder(SysOrder sysOrder) throws GlobleException; - public void refundOrderMoney(SysOrder sysOrder); + public void orderTk(SysOrder sysOrder); /** * 补交 @@ -100,10 +102,7 @@ * @date 2016年9月20日 下午12:07:21 * @throws */ - public SysOrder updateAddCardMoney(CzXkVo czVo); - - - + public SysOrder moneyCardCz(CzXkVo czVo); /** * 校验订单是否满足结算条件 @@ -117,6 +116,8 @@ List<OrderDetailVo> findApiOrderListInPage(OrderListDto orderListDto, PaginationVO pageVo); + List<PadOrderDetailVo> findPadApiOrderListInPage(PadOrderListDto orderListDto, PaginationVO pageVo); + int findApiOrderListTotal(OrderListDto orderListDto); OrderDetailVo findApiOrderDetailByOrderId(Long orderId); @@ -125,4 +126,5 @@ BigDecimal findVipArrearsByVipId(Long vipId); + int findPadApiOrderListTotal(PadOrderListDto orderListDto); } \ No newline at end of file -- Gitblit v1.9.1