From 2b75097b5a3630ce29410c3a8d13ef1ceff8d0d4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 15:16:35 +0800
Subject: [PATCH] 管理后台二期
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 6c44fd3..49cac6f 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -448,10 +448,11 @@
}
if(query.getPayType() == 1){//微信
- Map<String, String> map1 = payMoneyUtil.wxRefund(query.getCode(), orderCrossCity.getId() + "_3_" + UUIDUtil.getRandomCode(3), query.getAmount().toString(), query.getAmount().toString(), "/user/base/cancleOrderWXPay");
- if(!"SUCCESS".equals(map1.get("return_code"))){
- return ResultUtil.error(map1.get("return_msg"));
- }
+ Map<String, String> map1 = payMoneyUtil.wxRefund(query.getCode(), orderCrossCity.getOrderNum(), String.valueOf(query.getAmount()), String.valueOf(query.getAmount()), "");
+// if(!"SUCCESS".equals(map1.get("return_code"))){
+// return ResultUtil.error(map1.get("return_msg"));
+// }
+ System.err.println("跨城退款数据：：："+map1);
//添加交易明细
transactionDetailsService.saveData(query.getUserId(), "跨城改派取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
}else{//支付宝
@@ -500,11 +501,13 @@
String out_refund_no = sdf.format(new Date()) + "_" + tReassign.getId();
Double money = tReassign.getMoney();
if(tReassign.getPayType() == 1){//微信
- Map<String, String> map = payMoneyUtil.wxRefund(tReassign.getPayOrder(), out_refund_no, money.toString(), money.toString(), "/dispatch/base/order/reassignRefundCallback");
- if(null == map || !"SUCCESS".equals(map.get("return_code"))){
- System.err.println(map.get("return_msg"));
- return ResultUtil.error(map.get("return_msg"));
- }
+// Map<String, String> map = payMoneyUtil.wxRefund(tReassign.getPayOrder(), out_refund_no, money.toString(), money.toString(), "/dispatch/base/order/reassignRefundCallback");
+// if(null == map || !"SUCCESS".equals(map.get("return_code"))){
+// System.err.println(map.get("return_msg"));
+// return ResultUtil.error(map.get("return_msg"));
+// }
+ Map<String, String> map1 = payMoneyUtil.wxRefund(tReassign.getPayOrder(), out_refund_no, String.valueOf(money), String.valueOf(money), "");
+ System.err.println("跨城退款数据：：："+map1);
tReassign.setReviewer(ShiroKit.getUser().getId());
tReassign.setReviewerType(2);
tReassignService.updateById(tReassign);
--
Gitblit v1.7.1