From eb7f3343af839a7c71f16e8ada2b25d5e2201c08 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 四月 2021 19:27:52 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/TestController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 00bcc3d..290f213 100644
--- a/src/main/java/com/yeshi/buwan/controller/TestController.java
+++ b/src/main/java/com/yeshi/buwan/controller/TestController.java
@@ -1,7 +1,7 @@
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;
@@ -9,6 +9,8 @@
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;
@@ -60,9 +62,9 @@
@RequestMapping("vipPay")
public void vipPay(String id) {
- VIPOrderRecord record = orderService.getOrderRecord(id);
+ OrderRecord record = orderService.getOrderRecord(id);
try {
- orderService.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) {
@@ -76,5 +78,25 @@
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