From 4becc1e8cdb2fbe0dcb94493b75a59ec1817028c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 04 十一月 2023 16:05:04 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 97 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 85 insertions(+), 12 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 6dadc7a..1d64ae8 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -12,6 +12,7 @@
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.model.Driver;
+import com.stylefeng.guns.modular.system.model.OrderCancel;
import com.stylefeng.guns.modular.system.model.OrderPosition;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.*;
@@ -19,8 +20,10 @@
import com.stylefeng.guns.modular.system.util.Tingg.model.*;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
+import com.stylefeng.guns.modular.taxi.model.PaymentRecord;
import com.stylefeng.guns.modular.taxi.model.TransactionDetails;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
+import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -89,6 +92,9 @@
@Autowired
private ITransactionDetailsService transactionDetailsService;
+
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
@Autowired
private IOrderCancelService orderCancelService;
@@ -178,7 +184,7 @@
@ApiImplicitParam(value = "页条数", name = "size", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<List<OrderWarpper>> queryMyOrderList(Integer type, Integer pageNum, Integer size, HttpServletRequest request){
+ public ResultUtil<List<OrderWarpper>> queryMyOrderList(Integer type, Integer pageNum, Integer size, Integer language, HttpServletRequest request){
try {
Integer uid = userInfoService.getUserIdFormRedis(request);
if(null == uid){
@@ -196,7 +202,7 @@
list = orderCrossCityService.queryMyOrderList(uid, pageNum, size);
break;
case 4:
- list = orderLogisticsService.queryMyOrderList(uid, pageNum, size);
+ list = orderLogisticsService.queryMyOrderList(uid, pageNum, size, language);
break;
case 5:
list = orderCharteredCarService.queryMyOrderList(uid, pageNum, size);
@@ -230,23 +236,23 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- String name = language == 1 ? "专车订单" : language == 2 ? "Private car order" : "Commande de voiture exclusive";
+ String name = language == 1 ? "打车" : language == 2 ? "Ride" : "Course";
pageNum = (pageNum - 1) * size;
List<Map<String, Object>> maps = orderCancelService.queryCancel(uid, 2);
for (Map<String, Object> map : maps) {
Integer orderType = Integer.valueOf(map.get("orderType").toString());
if(1 == orderType){
- map.put("name", language == 1 ? "专车订单取消" : language == 2 ? "Private car order cancelled" : "Annulation de commande de voiture exclusive");
+ map.put("name", language == 1 ? "打车订单取消" : language == 2 ? "Ride order cancelled" : "Commande de trajet annulée");
}
if(4 == orderType){
- map.put("name", language == 1 ? "市内小件物流订单取消" : language == 2 ? "The small parts logistics order in the city has been cancelled" : "Annulation de commande pour la logistique de petites pièces dans la ville");
+ map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Parcel order cancellation" : "Annulation de commande de colis");
}
}
List<Map<String, Object>> list = orderPrivateCarService.queryMyTravelRecord(uid);//专车
for (Map<String, Object> map : list) {
map.put("name", name);
}
- name = language == 1 ? "市内小件物流" : language == 2 ? "Small parts logistics in the city" : "Logistique de petites pièces dans la ville";
+ name = language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison";
List<Map<String, Object>> list3 = orderLogisticsService.queryMyTravelRecord(uid);//小件物流
for (Map<String, Object> map : list3) {
map.put("name", name);
@@ -428,7 +434,7 @@
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=同城小件，5=跨城小件）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<OrderInfoWarpper> queryOrderInfo(Integer orderId, Integer orderType){
+ public ResultUtil<OrderInfoWarpper> queryOrderInfo(Integer orderId, Integer orderType, Integer language){
try {
Map<String, Object> map = null;
switch (orderType){
@@ -452,6 +458,15 @@
map.put("driverPhone", map.get("telX"));
}
OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
+ String driverName = orderInfoWarpper.getDriverName();
+ if(language == 2){
+ driverName = "Master " + driverName.replace("师傅", "");
+ }
+ if(language == 3){
+ driverName = "Maître " + driverName.replace("师傅", "");
+ }
+ orderInfoWarpper.setDriverName(driverName);
+
File file = new File(filePath + orderId + "_1.txt");
if(file.exists()){
//读取文件(字符流)
@@ -487,7 +502,7 @@
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "int"),
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际，4=同城小件，5=跨城小件）", name = "orderType", required = true, dataType = "int"),
})
- public ResultUtil<OrderInfoWarpper> queryOrderInfo_(Integer orderId, Integer orderType){
+ public ResultUtil<OrderInfoWarpper> queryOrderInfo_(Integer orderId, Integer orderType, Integer language){
try {
Map<String, Object> map = null;
switch (orderType){
@@ -510,8 +525,16 @@
if(null != map.get("telX")){
map.put("driverPhone", map.get("telX"));
}
-
- return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
+ OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
+ String driverName = orderInfoWarpper.getDriverName();
+ if(language == 2){
+ driverName = "Master " + driverName.replace("师傅", "");
+ }
+ if(language == 3){
+ driverName = "Maître " + driverName.replace("师傅", "");
+ }
+ orderInfoWarpper.setDriverName(driverName);
+ return ResultUtil.success(orderInfoWarpper);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -535,7 +558,7 @@
@ApiImplicitParam(value = "订单类型（1=专车，2=出租车，3=城际）", name = "orderType", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<OrderInfoWarpper> queryCancelPage(Integer orderId, Integer orderType){
+ public ResultUtil<OrderInfoWarpper> queryCancelPage(Integer orderId, Integer orderType, Integer language){
try {
Map<String, Object> map = null;
switch (orderType) {
@@ -555,7 +578,16 @@
map.put("cancelPayMoney", r.getData().getAmount());
break;
}
- return ResultUtil.success(OrderInfoWarpper.getOrderInfoWarpper(map));
+ OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
+ String driverName = orderInfoWarpper.getDriverName();
+ if(language == 2){
+ driverName = "Master " + driverName.replace("师傅", "");
+ }
+ if(language == 3){
+ driverName = "Maître " + driverName.replace("师傅", "");
+ }
+ orderInfoWarpper.setDriverName(driverName);
+ return ResultUtil.success(orderInfoWarpper);
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -871,6 +903,47 @@
}
+ /**
+ * 取消订单退款回调
+ * @param request
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/base/orderCancelRefundCallback")
+ public PayoutCallbackResponse orderCancelRefundCallback(@RequestBody PayoutCallbackRequest request){
+ try {
+ System.err.println("转账回调>>>>" + JSON.toJSONString(request));
+ PayoutCallbackResponse payoutCallbackResponse = new PayoutCallbackResponse();
+ AuthStatus authStatus = new AuthStatus();
+ authStatus.setAuthStatusCode(131);
+ authStatus.setAuthStatusDescription("Authentication was successful");
+ payoutCallbackResponse.setAuthStatus(authStatus);
+ Results results = new Results();
+ PayoutPacket packet = request.getPayload().getPacket();
+ String statusCode = packet.getStatusCode();
+ String beepTransactionID = packet.getBeepTransactionID();
+ String payerTransactionID = packet.getPayerTransactionID();
+
+ String id = payerTransactionID.substring(17);
+ OrderCancel orderCancel = orderCancelService.selectById(id);
+ OrderLogistics orderLogistics = orderLogisticsService.selectById(orderCancel.getOrderId());
+ PaymentRecord query = paymentRecordService.query(1, orderLogistics.getUserId(), 1, orderLogistics.getId(), orderLogistics.getType(), 1, 2);
+ transactionDetailsService.saveData(orderLogistics.getUserId(), "包裹取消退款", query.getAmount(), 1, 1, 1, 4, orderLogistics.getId());
+
+ results.setBeepTransactionID(beepTransactionID);
+ results.setPayerTransactionID(payerTransactionID);
+ results.setStatusCode("188");
+ results.setStatusDescription("Response was received");
+ payoutCallbackResponse.setResults(results);
+ return payoutCallbackResponse;
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
+
+
/**
* 取消操作支付
--
Gitblit v1.7.1