From 19533a17aa55fafc70d0a385928e785cb50e1ebc Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 30 七月 2021 02:05:14 +0800
Subject: [PATCH] 爱奇艺视频更新
---
src/main/java/com/yeshi/buwan/controller/WXController.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/WXController.java b/src/main/java/com/yeshi/buwan/controller/WXController.java
index 195f3da..4154131 100644
--- a/src/main/java/com/yeshi/buwan/controller/WXController.java
+++ b/src/main/java/com/yeshi/buwan/controller/WXController.java
@@ -1,7 +1,9 @@
package com.yeshi.buwan.controller;
+import com.yeshi.buwan.service.inter.order.OrderService;
import com.yeshi.buwan.service.inter.vip.VIPService;
import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.util.log.LoggerUtil;
import com.yeshi.buwan.util.user.VipUtil;
import com.yeshi.buwan.util.vip.VIPOrderUtil;
import net.sf.json.JSONObject;
@@ -34,7 +36,7 @@
Logger logger = LoggerFactory.getLogger(WXController.class);
@Resource
- private VIPService vipService;
+ private OrderService orderService;
private static String decryptToString(String apiV3Key, String associatedData, String nonce, String ciphertext)
throws GeneralSecurityException, IOException {
@@ -64,9 +66,10 @@
WXAPPInfo wxappInfo = VipUtil.getWXAPP();
//楠岃瘉璇佷功搴忓垪鍙�
String mchSerialNo = request.getHeader("Wechatpay-Serial");
- if (!mchSerialNo.equalsIgnoreCase(wxappInfo.getMchSerialNo())) {
- throw new Exception("璇佷功搴忓垪鍙蜂笉涓�鑷�");
- }
+ LoggerUtil.getTestLogger().info("寰俊鏀粯mchSerialNo锛歿}",mchSerialNo);
+// if (!mchSerialNo.equalsIgnoreCase(wxappInfo.getMchSerialNo())) {
+// throw new Exception("璇佷功搴忓垪鍙蜂笉涓�鑷�");
+// }
String timeStamp = request.getHeader("Wechatpay-Timestamp");
String nonce = request.getHeader("Wechatpay-Nonce");
@@ -77,7 +80,7 @@
if (request.getInputStream() != null) {
String entity = IOUtils.toString(request.getInputStream(), "UTF-8");
data = entity;
- logger.error("寰俊鏀粯鍥炶皟entity锛�" + entity);
+ LoggerUtil.getTestLogger().info("寰俊鏀粯鍥炶皟entity锛歿}",entity);
}
} catch (IOException e) {
e.printStackTrace();
@@ -97,6 +100,7 @@
String ciphertext = resource.optString("ciphertext");
String r = decryptToString(wxappInfo.getApiV3Key(), resource.optString("associated_data"), resource.optString("nonce"), ciphertext);
//瑙ｅ瘑鏍煎紡濡備笅 {"mchid":"1520950211","appid":"wxa99686bb65a9f466","out_trade_no":"buwan-vip-8","transaction_id":"4200000796202101259681241680","trade_type":"MWEB","trade_state":"SUCCESS","trade_state_desc":"鏀粯鎴愬姛","bank_type":"OTHERS","attach":"","success_time":"2021-01-25T16:18:33+08:00","payer":{"openid":"oq7R20lxhKF8qSnkszxFJHViyKEY"},"amount":{"total":10,"payer_total":10,"currency":"CNY","payer_currency":"CNY"}}
+ LoggerUtil.getTestLogger().info("鏁版嵁瑙ｇ爜锛歿}",r);
JSONObject decript = JSONObject.fromObject(r);
String outTradeNo = decript.optString("out_trade_no");
String appId = decript.optString("appid");
@@ -105,7 +109,7 @@
//鏀粯鎴愬姛
if (tradeState.equalsIgnoreCase("SUCCESS")) {
String id = VIPOrderUtil.getIdFromOutOrderNo(outTradeNo);
- vipService.checkOrderPayState(id);
+ orderService.checkOrderPayState(id);
}
break;
}
@@ -127,6 +131,7 @@
data.put("message", "澶勭悊鎴愬姛");
response.sendError(200, data.toString());
} catch (Exception e) {
+ logger.error("寰俊鏀粯鍥炶皟澶勭悊鍑洪敊锛�",e);
e.printStackTrace();
JSONObject data = new JSONObject();
data.put("code", "FAIL");
--
Gitblit v1.8.0