From 759f8df85ddb840682f91bad31e874fa0b58c075 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 14 四月 2021 19:16:12 +0800
Subject: [PATCH] 订单系统修改
---
src/main/java/com/yeshi/buwan/controller/TestController.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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..d9399e3 100644
--- a/src/main/java/com/yeshi/buwan/controller/TestController.java
+++ b/src/main/java/com/yeshi/buwan/controller/TestController.java
@@ -1,16 +1,19 @@
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 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;
@@ -29,6 +32,12 @@
@Resource
private VIPService vipService;
+
+ @Resource
+ private OrderService orderService;
+
+ @Resource
+ private SearchService searchService;
Logger logger = LoggerFactory.getLogger(TestController.class);
@@ -51,9 +60,9 @@
@RequestMapping("vipPay")
public void vipPay(String id) {
- VIPOrderRecord record = vipService.getOrderRecord(id);
+ OrderRecord record = orderService.getOrderRecord(id);
try {
- vipService.paySuccess(record.getId(), VIPOrderRecord.PAY_WAY_ALIPAY, record.getMoney(), new Date());
+ orderService.paySuccess(record.getId(), OrderRecord.PAY_WAY_ALIPAY, record.getMoney(), new Date());
} catch (VIPException e) {
e.printStackTrace();
} catch (PPTVException e) {
@@ -61,5 +70,11 @@
}
}
+ @RequestMapping("searchAlbum")
+ public void searchAlbum(String key, PrintWriter out) {
+ SearchService.SearchResult result = searchService.searchAlbum(0, key, 1, 20);
+ out.print(JsonUtil.loadTrueResult(result));
+ }
+
}
--
Gitblit v1.8.0