From e52227b01983146f2e3c81dc575141d8b9889497 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 10:16:30 +0800
Subject: [PATCH] 代码调整
---
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java
index e41c246..78517fe 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/CallbackController.java
@@ -25,7 +25,6 @@
@Autowired
private IReassignService reassignService;
-
@Autowired
private ICBCPayUtil icbcPayUtil;
@@ -45,16 +44,19 @@
try {
Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
if(null != map){
- String id = map.get("out_trade_no");
- String order_id = map.get("transaction_id");
+ String out_trade_no = map.get("out_trade_no");
+ String transaction_id = map.get("transaction_id");
+
+ String substring = out_trade_no.substring(17);
+ Integer type = Integer.valueOf(substring.substring(0, 1));
+ Integer id = Integer.valueOf(substring.substring(1));
+ reassignService.payReassign(id.toString(), type, transaction_id, 1);
+
String result = map.get("result");
- if(ToolUtil.isNotEmpty(id) && ToolUtil.isNotEmpty(order_id)){
- PrintWriter out = response.getWriter();
- out.write(result);
- out.flush();
- out.close();
- reassignService.payReassign(id, order_id, 1);
- }
+ PrintWriter out = response.getWriter();
+ out.print(result);
+ out.flush();
+ out.close();
}
}catch (Exception e){
e.printStackTrace();
@@ -72,11 +74,17 @@
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
- String id = map.get("out_trade_no");
- String order_id = map.get("trade_no");
- if(ToolUtil.isNotEmpty(id) && ToolUtil.isNotEmpty(order_id)){
- reassignService.payReassign(id, order_id, 2);
- }
+ String out_trade_no = map.get("out_trade_no");
+ String trade_no = map.get("trade_no");
+
+ String substring = out_trade_no.substring(17);
+ Integer type = Integer.valueOf(substring.substring(0, 1));
+ Integer id = Integer.valueOf(substring.substring(1));
+ reassignService.payReassign(id.toString(), type, trade_no, 2);
+ PrintWriter out = response.getWriter();
+ out.print("success");
+ out.flush();
+ out.close();
}
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1