From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽

---
 src/main/java/com/yeshi/buwan/service/inter/order/OrderService.java |   39 ++++++++++++++++++++++++---------------
 1 files changed, 24 insertions(+), 15 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..6e74b72 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,15 +1,16 @@
 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.OrderPaySuccessForm;
 import com.yeshi.buwan.dto.order.PayWayInfoDTO;
 import com.yeshi.buwan.exception.PPTVException;
 import com.yeshi.buwan.exception.goldcorn.GoldCornException;
 import com.yeshi.buwan.exception.order.OrderException;
 import com.yeshi.buwan.exception.order.PayException;
 import com.yeshi.buwan.exception.vip.VIPException;
+import com.yeshi.buwan.exception.vip.VideoBuyRecordException;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 public interface OrderService {
@@ -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,12 @@
      *
      * @param id
      */
-    public VIPOrderRecord checkOrderPayState(String id);
+    public OrderRecord checkOrderPayState(String id);
 
 
-    public VIPOrderRecord getOrderRecord(String id);
+    public OrderRecord checkApplePay(String orderNo,String receipt) throws Exception;
+
+    public OrderRecord getOrderRecord(String id);
 
 
     /**
@@ -59,21 +62,17 @@
      *
      * @param record
      */
-    public PayWayInfoDTO payOrder(VIPOrderRecord record) throws OrderException, GoldCornException, PayException;
+    public PayWayInfoDTO payOrder(OrderRecord record) throws OrderException, GoldCornException, PayException, VIPException, PPTVException, VideoBuyRecordException;
 
 
     /**
      * 鏀粯鎴愬姛
      *
-     * @param id
-     * @param payWay
-     * @param payMoney
-     * @param payTime
      * @return
      * @throws VIPException
      * @throws PPTVException
      */
-    public VIPOrderRecord paySuccess(final String id, int payWay, BigDecimal payMoney, Date payTime) throws VIPException, PPTVException;
+    public OrderRecord paySuccess(OrderPaySuccessForm successForm) throws VIPException, PPTVException, VideoBuyRecordException, OrderException;
 
 
     /**
@@ -81,7 +80,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