From 56481656c7de11cdca69c1a7dd69db176ffd9ecd Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 08 五月 2021 12:49:30 +0800 Subject: [PATCH] 华为屏蔽金币任务中的看海量视频,新增广告平台概率控制 --- src/main/java/com/yeshi/buwan/service/inter/order/OrderService.java | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 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 1cef3bf..fcd0df6 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,12 +1,14 @@ package com.yeshi.buwan.service.inter.order; 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; 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; @@ -32,7 +34,7 @@ * @param state * @return */ - public List<OrderRecord> 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 +42,7 @@ * @param state * @return */ - public long countOrderRecord(String uid, Integer state); + public long countOrderRecord(String uid, OrderType orderType, Integer state); /** @@ -59,7 +61,7 @@ * * @param record */ - public PayWayInfoDTO payOrder(OrderRecord record) throws OrderException, GoldCornException, PayException; + public PayWayInfoDTO payOrder(OrderRecord record) throws OrderException, GoldCornException, PayException, VIPException, PPTVException, VideoBuyRecordException; /** @@ -73,7 +75,7 @@ * @throws VIPException * @throws PPTVException */ - public OrderRecord 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, VideoBuyRecordException, OrderException; /** @@ -84,4 +86,14 @@ 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