From 1c2477de8878b0b830bb7ced392bd309c9f1647a Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 25 十一月 2025 14:27:40 +0800
Subject: [PATCH] 斗拱退款对接

---
 ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
index e00cec5..7d319c4 100644
--- a/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
+++ b/ManagementJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
@@ -217,6 +217,7 @@
         if(orderCrossCity.getState() > 5 && orderCrossCity.getState() != 11 && orderCrossCity.getState() != 7){
             return ResultUtil.error("订单状态不在可取消范围内");
         }
+        Integer orgState = orderCrossCity.getState();
         orderCrossCity.setState(10);
         tOrderCrossCityService.updateById(orderCrossCity);
 
@@ -293,7 +294,10 @@
                     String refundReqSeqId = RequestSeqUtil.generate("TK");
                     Map<String, Object> refund = douGongRefundBiz.refund(refundReqSeqId, BigDecimal.valueOf(query.getAmount()), DateUtil.format(query.getInsertTime(), "yyyyMMdd"), orderCrossCity.getOutTradeNo(), 1);
                     orderCrossCity.setRefundReqSeqId(refundReqSeqId);
-                    if (!"00000000".equals(refund.get("resp_code")) && "S".equals(refund.get("trans_stat"))) {
+                    orderCrossCity.setState(orgState);
+                    if ("00000000".equals(refund.get("resp_code")) && "S".equals(refund.get("trans_stat"))) {
+                        orderCrossCity.setState(10);
+                    }else if (!"00000000".equals(refund.get("resp_code"))) {
                         return ResultUtil.error("订单取消失败:" + refund.get("resp_desc").toString());
                     }
                     tOrderCrossCityService.updateById(orderCrossCity);
@@ -323,7 +327,10 @@
                     String refundReqSeqId = RequestSeqUtil.generate("TK");
                     Map<String, Object> refund = douGongRefundBiz.refund(refundReqSeqId, BigDecimal.valueOf(query.getAmount()), DateUtil.format(query.getInsertTime(), "yyyyMMdd"), orderCrossCity.getOutTradeNo(), 1);
                     orderCrossCity.setRefundReqSeqId(refundReqSeqId);
-                    if (!"00000000".equals(refund.get("resp_code")) && "S".equals(refund.get("trans_stat"))) {
+                    orderCrossCity.setState(orgState);
+                    if ("00000000".equals(refund.get("resp_code")) && "S".equals(refund.get("trans_stat"))) {
+                        orderCrossCity.setState(10);
+                    }else if (!"00000000".equals(refund.get("resp_code"))) {
                         return ResultUtil.error("订单取消失败:" + refund.get("resp_desc").toString());
                     }
                     tOrderCrossCityService.updateById(orderCrossCity);

--
Gitblit v1.7.1