From aa72a1d1d8c792b322281f5ab01996bc62820b13 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 16 九月 2025 15:31:07 +0800
Subject: [PATCH] 修改bug及数据加密传输
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
index 0837007..1d23c14 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCrossCityController.java
@@ -205,7 +205,8 @@
// 列【封装】
List<String> shellList = new ArrayList<String>();
shellList.add("下单时间");
- shellList.add("订单编号");
+ shellList.add("系统订单编号");
+ shellList.add("订单中心编号");
shellList.add("订单来源");
shellList.add("乘车时间");
shellList.add("下单用户昵称");
@@ -236,6 +237,11 @@
}
if(SinataUtil.isNotEmpty(object.get("orderNum"))){
shellList.add(object.get("orderNum").toString());
+ }else{
+ shellList.add("-");
+ }
+ if(SinataUtil.isNotEmpty(object.get("travelId"))){
+ shellList.add(object.get("travelId").toString());
}else{
shellList.add("-");
}
@@ -498,22 +504,6 @@
}
}
- //中台修改订单状态
- ModifyTravelItineraryRequest request1 = new ModifyTravelItineraryRequest();
- request1.setOrderId(orderCrossCity.getTravelId());
- request1.setStatus(orderCrossCity.getState());
- if (null != orderCrossCity.getDriverId()) {
- TDriver driver2 = tDriverService.selectById(orderCrossCity.getDriverId());
- TCompany company = iTCompanyService.selectById(driver2.getCompanyId());
- request1.setDriverId(driver2.getEmpId().toString());
- request1.setSupplierShopId(company.getEnterCode());
- }
- if (2 == orderCrossCity.getPromotion() && null != orderCrossCity.getPromotionDriverId()) {
- TDriver driver2 = tDriverService.selectById(orderCrossCity.getPromotionDriverId());
- request1.setPromoterId(driver2.getEmpId().toString());
- }
- OrderUtil.modifyTravelItinerary(request1);
-
//未支付，调取消订单
if(null == orderCrossCity.getPayType() && ToolUtil.isNotEmpty(orderCrossCity.getTravelId())){
OrderUtil.tradeOrderCancel(orderCrossCity.getTravelId());
@@ -576,7 +566,7 @@
request2.setRefundType("5");
request2.setApplyRefundCharge(orderCrossCity.getPayMoney());
request2.setActualRefundCharge(orderCrossCity.getPayMoney());
- request2.setRefundAccount(user1.getEnterId().toString());
+ request2.setRefundAccount(user1.getEmpId().toString());
request2.setRemark("服务商取消订单退款");
OrderUtil.orderRefundNotice(request2);
//添加交易明细
--
Gitblit v1.7.1