From 77e706cca33c97a4428879cc9a6f98aae085c142 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期六, 24 四月 2021 00:35:13 +0800
Subject: [PATCH] 0元购完善
---
src/main/java/com/yeshi/buwan/controller/TestController.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/TestController.java b/src/main/java/com/yeshi/buwan/controller/TestController.java
index 48a56a4..14f6870 100644
--- a/src/main/java/com/yeshi/buwan/controller/TestController.java
+++ b/src/main/java/com/yeshi/buwan/controller/TestController.java
@@ -1,16 +1,21 @@
package com.yeshi.buwan.controller;
import com.yeshi.buwan.domain.system.DetailSystem;
-import com.yeshi.buwan.domain.vip.VIPOrderRecord;
+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.service.imp.DetailSystemConfigService;
+import com.yeshi.buwan.service.imp.SearchService;
+import com.yeshi.buwan.service.inter.order.OrderService;
import com.yeshi.buwan.service.inter.vip.VIPService;
+import com.yeshi.buwan.util.JsonUtilV2;
+import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import javax.annotation.Resource;
import java.io.PrintWriter;
@@ -30,6 +35,12 @@
@Resource
private VIPService vipService;
+ @Resource
+ private OrderService orderService;
+
+ @Resource
+ private SearchService searchService;
+
Logger logger = LoggerFactory.getLogger(TestController.class);
@RequestMapping("config")
@@ -48,18 +59,33 @@
logger.error("娴嬭瘯");
out.print("success");
}
+
- @RequestMapping("vipPay")
- public void vipPay(String id) {
- VIPOrderRecord record = vipService.getOrderRecord(id);
- try {
- vipService.paySuccess(record.getId(), VIPOrderRecord.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);
+ 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