From cad915058c3c53bf328a8ae9ca9bc7de099caba7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 06 二月 2021 15:27:49 +0800
Subject: [PATCH] 接口bug修改
---
src/main/java/com/yeshi/buwan/controller/api/VIPController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 762c037..c912480 100644
--- a/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
+++ b/src/main/java/com/yeshi/buwan/controller/api/VIPController.java
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
+import org.yeshi.utils.annotation.RequestSerializableByKey;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@@ -102,7 +103,7 @@
}
if (StringUtil.isNullOrEmpty(user.getPhone())) {
- return JsonUtilV2.loadFalseJson(10001,"璇风粦瀹氱數璇濆彿鐮�");
+ return JsonUtilV2.loadFalseJson(10001, "璇风粦瀹氱數璇濆彿鐮�");
}
@@ -116,6 +117,7 @@
record.setUid(loginUid);
record.setType(vipPrice.getType());
record.setMoney(vipPrice.getPrice());
+ record.setPayWay(payWay);
record.setState(VIPOrderRecord.STATE_NOT_PAY);
try {
vipService.addVIPRecord(record);
@@ -129,12 +131,12 @@
case VIPOrderRecord
.PAY_WAY_ALIPAY: {
//鐢熸垚鏀粯瀹濇敮浠樿鍗�
- String form = VipUtil.getVipChargeAlipayForm(orderNo, record.getMoney());
+ String form = VipUtil.getVipChargeAlipayForm(record.getId(), orderNo, record.getMoney());
//鏆傚瓨2鍒嗛挓
String id = StringUtil.Md5(UUID.randomUUID().toString() + "#" + System.currentTimeMillis());
redisManager.cacheCommonString(id, form, 120);
org.json.JSONObject data = new org.json.JSONObject();
- data.put("payUrl", "http://api.ysdq.yeshitv.com:8089/BuWan/alipay/printPayForm?formId=" + id);
+ data.put("payUrl", Constant.HOST + "/BuWan/alipay/printPayForm?formId=" + id);
data.put("payWay", payWay);
return JsonUtilV2.loadTrueJson(data.toString());
}
@@ -144,7 +146,7 @@
.PAY_WAY_WX: {
//鐢熸垚寰俊鏀粯璁㈠崟
try {
- String payUrl = VipUtil.createWXOrder(ip, orderNo, vipPrice.getPrice(), "褰辫澶у叏VIP-" + vipPrice.getType().getName());
+ String payUrl = VipUtil.createWXOrder(record.getId(), ip, orderNo, vipPrice.getPrice(), "褰辫澶у叏VIP-" + vipPrice.getType().getName());
org.json.JSONObject data = new org.json.JSONObject();
data.put("payUrl", payUrl);
data.put("payWay", payWay);
@@ -159,5 +161,34 @@
return JsonUtilV2.loadFalseJson("璇烽�夋嫨鏀粯鏂瑰紡");
}
+ /**
+ * 妫�鏌ユ槸鍚︽敮浠�
+ *
+ * @param acceptData
+ * @param loginUid
+ * @param id
+ * @return
+ */
+ @RequestMapping("checkPay")
+ @ResponseBody
+ @RequestSerializableByKey(key = "'vip-checkPay-'+#id")
+ public String checkPay(AcceptData acceptData, String loginUid, String id) {
+ VIPOrderRecord record = vipService.getOrderRecord(id);
+ if (record == null || !record.getUid().equalsIgnoreCase(loginUid)) {
+ return JsonUtilV2.loadFalseJson("璁板綍涓嶅瓨鍦�/涓嶆槸鎮ㄧ殑璁㈠崟");
+ }
+
+ record = vipService.checkOrderPayState(id);
+ //鏈敮浠�
+ if (record != null && record.getState() != VIPOrderRecord.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