From 745320cbb4edfa4fbc8f0f95483a4ee7893d5769 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 22 四月 2021 20:18:08 +0800
Subject: [PATCH] 3.9.2完善
---
src/main/java/com/yeshi/buwan/controller/api/VIPController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/api/VIPController.java b/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
index d9c02f3..d72c0df 100644
--- a/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
+++ b/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
@@ -10,6 +10,7 @@
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 com.yeshi.buwan.pptv.entity.PPTVSeries;
import com.yeshi.buwan.pptv.entity.VideoPPTVMap;
import com.yeshi.buwan.service.inter.LoginUserService;
@@ -134,13 +135,13 @@
}).create();
JSONObject root = new JSONObject();
- List<OrderRecord> list = orderService.listOrderRecord(loginUid, OrderType.valueOf(type), null, page, Constant.pageCount);
+ List<OrderRecord> list = orderService.listOrderRecord(loginUid, type == null ? null : OrderType.valueOf(type), null, page, Constant.pageCount);
List<OrderInfoVO> voList = new ArrayList<>();
for (OrderRecord record : list) {
voList.add(OrderInfoVO.create(record));
}
- long count = orderService.countOrderRecord(loginUid, OrderType.valueOf(type), null);
+ long count = orderService.countOrderRecord(loginUid, type == null ? null : OrderType.valueOf(type), null);
root.put("list", gson.toJson(voList));
root.put("count", count);
return JsonUtilV2.loadTrueJson(root.toString());
@@ -155,7 +156,7 @@
*/
@RequestMapping("createOrder")
@ResponseBody
- public String createOrder(AcceptData acceptData, HttpServletRequest request, String loginUid, String priceId, String infoId, Integer goldCorn, int payWay) {
+ public String createOrder(AcceptData acceptData, HttpServletRequest request, String loginUid, String priceId, String cid, String vid, Integer goldCorn, int payWay) {
if (StringUtil.isNullOrEmpty(loginUid)) {
return JsonUtilV2.loadFalseJson("鐢ㄦ埛鏈櫥褰�");
@@ -170,7 +171,7 @@
return JsonUtilV2.loadFalseJson(10001, "璇风粦瀹氱數璇濆彿鐮�");
}
- if (StringUtil.isNullOrEmpty(priceId) && StringUtil.isNullOrEmpty(infoId)) {
+ if (StringUtil.isNullOrEmpty(priceId) && StringUtil.isNullOrEmpty(cid)) {
return JsonUtilV2.loadFalseJson("璇烽�夋嫨璐拱绫诲瀷");
}
@@ -179,7 +180,7 @@
OrderType orderType = OrderType.vip;
- if (!StringUtil.isNullOrEmpty(infoId)) {
+ if (!StringUtil.isNullOrEmpty(cid)) {
orderType = OrderType.video;
}
@@ -191,13 +192,13 @@
VIPPrice vipPrice = null;
if (orderType == OrderType.video) {
- //瑙嗛
- VideoPPTVMap map = pptvService.selectVideoPPTVMapByInfoId(infoId);
- if (map == null) {
+ PPTVSeries pptvSeries = pptvService.selectSeriesBySeriesCode(cid);
+ if (pptvSeries == null) {
return JsonUtilV2.loadFalseJson("褰辩墖涓嶅瓨鍦�");
}
- PPTVSeries pptvSeries = pptvService.selectSeriesByInfoId(infoId);
- if (pptvSeries == null) {
+ //瑙嗛
+ VideoPPTVMap map = pptvService.selectVideoPPTVMapByPPInfo(pptvSeries.getInfoID(), vid);
+ if (map == null) {
return JsonUtilV2.loadFalseJson("褰辩墖涓嶅瓨鍦�");
}
record.setRemarks(pptvSeries.getName());
@@ -219,7 +220,8 @@
}
record.setOrderType(orderType);
- record.setVideoInfoId(infoId);
+ record.setVideoCid(cid);
+ record.setVideoVid(vid);
record.setGoldCorn(goldCorn);
record.setPayWay(payWay);
record.setState(OrderRecord.STATE_NOT_PAY);
@@ -248,6 +250,8 @@
return JsonUtilV2.loadFalseJson(e.getMessage());
} catch (PPTVException e) {
return JsonUtilV2.loadFalseJson(e.getMessage());
+ } catch (VideoBuyRecordException e) {
+ return JsonUtilV2.loadFalseJson("鍗曠墖璐拱澶辫触");
}
return JsonUtilV2.loadTrueJson(new Gson().toJson(payResult));
}
--
Gitblit v1.8.0