From 31ce6be2d56798d9509e6d90335999064351f7f3 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 10 十二月 2024 16:06:26 +0800
Subject: [PATCH] 12.10
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
index 733d58a..ee9f367 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
@@ -272,7 +272,7 @@
tUser.setBalance(tUser.getBalance().add(orderCrossCity.getPayMoney()));
userService.updateById(tUser);
//添加交易明细
- transactionDetailsService.saveData(orderCrossCity.getUserId(), "直通车取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tOrderCrossCityId);
+ transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tOrderCrossCityId);
} else {
PaymentRecord query = paymentRecordService.query(1, null, null, tOrderCrossCityId, 3, null, 2).get(0);
if (null == query) {
@@ -284,14 +284,14 @@
return ResultUtil.error(map.get("return_msg"));
}
//添加交易明细
- transactionDetailsService.saveData(query.getUserId(), "直通车取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
+ transactionDetailsService.saveData(query.getUserId(), "跨城取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
}else{//支付宝
Map<String, String> map = payMoneyUtil.aliRefund(query.getCode(), query.getAmount().toString());
if(!"10000".equals(map.get("code"))){
return ResultUtil.error(map.get("msg"));
}
//添加交易明细
- transactionDetailsService.saveData(query.getUserId(), "直通车取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
+ transactionDetailsService.saveData(query.getUserId(), "跨城取消退款", query.getAmount(), 1, 1, query.getType(), 3, orderCrossCity.getId());
}
}
@@ -331,7 +331,7 @@
map1.put("id", tOrderCrossCity.getId().toString());
map1.put("orderType", "3");
String result1 = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map1);
- System.out.println("直通车取消:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result1);
+ System.out.println("跨城取消:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result1);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1