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/TReassignController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
index 22dc8ad..61df75f 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java
@@ -407,7 +407,7 @@
tReassign.setReviewerType(2);
tReassignService.updateById(tReassign);
//添加交易明细
- transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "直通车改派拒绝退款", money, 1, 1, 2, 1, tReassign.getOrderId());
+ transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "跨城改派拒绝退款", money, 1, 1, 2, 1, tReassign.getOrderId());
}
if(tReassign.getPayType() == 2){//支付宝
Map<String, String> map = payMoneyUtil.aliRefund(tReassign.getPayOrder(), money.toString());
@@ -416,7 +416,7 @@
tReassign.setReviewerType(2);
tReassignService.updateById(tReassign);
//添加交易明细
- transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "直通车改派拒绝退款", money, 1, 1, 2, 1, tReassign.getOrderId());
+ transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "跨城改派拒绝退款", money, 1, 1, 2, 1, tReassign.getOrderId());
}
if(null == map || !"10000".equals(map.get("code"))){
System.err.println(map.get("msg"));
@@ -527,7 +527,7 @@
map.put("id", orderCrossCity.getId().toString());
map.put("orderType", "3");
String result = HttpRequestUtil.postRequest(PushURL.cancel_order_url, map);
- System.out.println("直通车取消:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result);
+ System.out.println("跨城取消:【orderId="+orderCrossCity.getId().toString()+"】,调用接口:"+result);
//已支付的情况下进行退款操作
@@ -537,7 +537,7 @@
tUser.setBalance(tUser.getBalance().add(orderCrossCity.getPayMoney()));
userService.updateById(tUser);
//添加交易明细
- transactionDetailsService.saveData(orderCrossCity.getUserId(), "直通车改派取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tReassign.getOrderId());
+ transactionDetailsService.saveData(orderCrossCity.getUserId(), "跨城改派取消退款", orderCrossCity.getPayMoney().doubleValue(), 1, 1, 1, 3, tReassign.getOrderId());
}else{
PaymentRecord query = paymentRecordService.query(1, null, null, tReassign.getOrderId(), 3, null, 2).get(0);
if(null == query){
@@ -550,14 +550,14 @@
return ResultUtil.error(map1.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> map1 = payMoneyUtil.aliRefund(query.getCode(), query.getAmount().toString());
if(!"10000".equals(map1.get("code"))){
return ResultUtil.error(map1.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());
}
}
@@ -606,7 +606,7 @@
tReassign.setReviewerType(2);
tReassignService.updateById(tReassign);
//添加交易明细
- transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "直通车改派拒绝退款", money, 1, 1, 2, 3, tReassign.getOrderId());
+ transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "跨城改派拒绝退款", money, 1, 1, 2, 3, tReassign.getOrderId());
}
if(tReassign.getPayType() == 2){//支付宝
Map<String, String> map = payMoneyUtil.aliRefund(tReassign.getPayOrder(), money.toString());
@@ -615,7 +615,7 @@
tReassign.setReviewerType(2);
tReassignService.updateById(tReassign);
//添加交易明细
- transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "直通车改派拒绝退款", money, 1, 1, 2, 3, tReassign.getOrderId());
+ transactionDetailsService.saveData(tReassign.getOriginalDriverId(), "跨城改派拒绝退款", money, 1, 1, 2, 3, tReassign.getOrderId());
}
if(null == map || !"10000".equals(map.get("code"))){
System.err.println(map.get("msg"));
@@ -1045,7 +1045,7 @@
map.put("orderId", tOrderCrossCity.getId().toString());
map.put("orderType", "3");
String result = HttpRequestUtil.postRequest(PushURL.order_push_url, map);
- System.out.println("直通车改派:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result);
+ System.out.println("跨城改派:【orderId="+tOrderCrossCity.getId().toString()+"】,调用接口:"+result);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1