From eb7f3343af839a7c71f16e8ada2b25d5e2201c08 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 四月 2021 19:27:52 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/service/inter/order/OrderService.java | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/inter/order/OrderService.java b/src/main/java/com/yeshi/buwan/service/inter/order/OrderService.java
index fdb894b..84cb8bc 100644
--- a/src/main/java/com/yeshi/buwan/service/inter/order/OrderService.java
+++ b/src/main/java/com/yeshi/buwan/service/inter/order/OrderService.java
@@ -1,6 +1,7 @@
package com.yeshi.buwan.service.inter.order;
-import com.yeshi.buwan.domain.vip.VIPOrderRecord;
+import com.yeshi.buwan.domain.vip.OrderRecord;
+import com.yeshi.buwan.domain.vip.OrderType;
import com.yeshi.buwan.dto.order.PayWayInfoDTO;
import com.yeshi.buwan.exception.PPTVException;
import com.yeshi.buwan.exception.goldcorn.GoldCornException;
@@ -22,7 +23,7 @@
* @return
* @throws OrderException
*/
- public VIPOrderRecord createOrder(VIPOrderRecord orderRecord) throws OrderException;
+ public OrderRecord createOrder(OrderRecord orderRecord) throws OrderException;
/**
@@ -32,7 +33,7 @@
* @param state
* @return
*/
- public List<VIPOrderRecord> listOrderRecord(String uid, Integer state, int page, int pageSize);
+ public List<OrderRecord> listOrderRecord(String uid, OrderType orderType, Integer state, int page, int pageSize);
/**
@@ -40,7 +41,7 @@
* @param state
* @return
*/
- public long countOrderRecord(String uid, Integer state);
+ public long countOrderRecord(String uid, OrderType orderType, Integer state);
/**
@@ -48,10 +49,10 @@
*
* @param id
*/
- public VIPOrderRecord checkOrderPayState(String id);
+ public OrderRecord checkOrderPayState(String id);
- public VIPOrderRecord getOrderRecord(String id);
+ public OrderRecord getOrderRecord(String id);
/**
@@ -59,7 +60,7 @@
*
* @param record
*/
- public PayWayInfoDTO payOrder(VIPOrderRecord record) throws OrderException, GoldCornException, PayException;
+ public PayWayInfoDTO payOrder(OrderRecord record) throws OrderException, GoldCornException, PayException, VIPException, PPTVException;
/**
@@ -73,7 +74,7 @@
* @throws VIPException
* @throws PPTVException
*/
- public VIPOrderRecord paySuccess(final String id, int payWay, BigDecimal payMoney, Date payTime) throws VIPException, PPTVException;
+ public OrderRecord paySuccess(final String id, int payWay, BigDecimal payMoney, Date payTime) throws VIPException, PPTVException;
/**
@@ -81,7 +82,17 @@
*
* @param id
*/
- public void cancelOrder(String id, String reason) throws OrderException;
+ public void cancelOrder(String id, String reason) throws OrderException, GoldCornException;
+
+
+ /**
+ * 鑾峰彇鍙互鍙栨秷鐨勮鍗曡褰�
+ *
+ * @param page
+ * @param pageSize
+ * @return
+ */
+ public List<OrderRecord> getCanCancelOrderList(int page, int pageSize);
}
--
Gitblit v1.8.0