From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播
---
src/main/java/com/yeshi/buwan/controller/TestController.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/TestController.java b/src/main/java/com/yeshi/buwan/controller/TestController.java
index d9399e3..8160426 100644
--- a/src/main/java/com/yeshi/buwan/controller/TestController.java
+++ b/src/main/java/com/yeshi/buwan/controller/TestController.java
@@ -1,10 +1,7 @@
package com.yeshi.buwan.controller;
import com.yeshi.buwan.domain.system.DetailSystem;
-import com.yeshi.buwan.domain.vip.OrderRecord;
-import com.yeshi.buwan.exception.PPTVException;
-import com.yeshi.buwan.exception.vip.VIPException;
-import com.yeshi.buwan.funtv.FunTVUtil;
+import com.yeshi.buwan.videos.funtv.FunTVUtil;
import com.yeshi.buwan.service.imp.DetailSystemConfigService;
import com.yeshi.buwan.service.imp.SearchService;
import com.yeshi.buwan.service.inter.order.OrderService;
@@ -17,7 +14,6 @@
import javax.annotation.Resource;
import java.io.PrintWriter;
-import java.util.Date;
import java.util.Map;
@Controller
@@ -58,23 +54,32 @@
out.print("success");
}
- @RequestMapping("vipPay")
- public void vipPay(String id) {
- OrderRecord record = orderService.getOrderRecord(id);
- try {
- orderService.paySuccess(record.getId(), OrderRecord.PAY_WAY_ALIPAY, record.getMoney(), new Date());
- } catch (VIPException e) {
- e.printStackTrace();
- } catch (PPTVException e) {
- e.printStackTrace();
- }
- }
@RequestMapping("searchAlbum")
public void searchAlbum(String key, PrintWriter out) {
- SearchService.SearchResult result = searchService.searchAlbum(0, key, 1, 20);
+ SearchService.SearchResult result = searchService.searchAlbum(0, key, null, 1, 20, false);
out.print(JsonUtil.loadTrueResult(result));
}
+//
+// @RequestMapping("checkPay")
+// public String checkPay(String loginUid,String id, PrintWriter out) {
+// OrderRecord record = orderService.getOrderRecord(id);
+// if (record == null || !record.getUid().equalsIgnoreCase(loginUid)) {
+// return JsonUtilV2.loadFalseJson("璁板綍涓嶅瓨鍦�/涓嶆槸鎮ㄧ殑璁㈠崟");
+// }
+//
+// record = orderService.checkOrderPayState(id);
+// //鏈敮浠�
+// if (record != null && record.getState() != OrderRecord.STATE_PAY) {
+// return JsonUtilV2.loadFalseJson(1, "鏀粯鏈畬鎴�");
+// }
+//
+// JSONObject data = new JSONObject();
+// data.put("money", record.getPayMoney() == null ? record.getMoney() : record.getPayMoney());
+//
+// return JsonUtilV2.loadTrueJson(data.toString());
+// }
+
}
--
Gitblit v1.8.0