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/TOrderPrivateCarController.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index 63bf04a..4613b93 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -129,7 +129,8 @@
Integer rideType,
Integer abnormal,
Integer promotion,
- String promotionUser
+ String promotionUser,
+ Integer payType
) {
String beginTime = null;
String endTime = null;
@@ -140,7 +141,7 @@
}
Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
page.setRecords(tOrderPrivateCarService.getPrivateCarOrderList(page, beginTime, endTime, shiroExtUtil.getUser().getRoleType(), shiroExtUtil.getUser().getObjectId(),
- orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,null));
+ orderNum, orderSource, userName, userPhone, passengers, passengersPhone, serverCarModelId, driver, state, rideType, abnormal, promotion, promotionUser,null, payType));
return super.packForBT(page);
}
@@ -160,7 +161,7 @@
Integer rideType,
Integer abnormal,
Integer promotion,
- String promotionUser, HttpServletRequest request, HttpServletResponse response) {
+ String promotionUser, Integer payType, HttpServletRequest request, HttpServletResponse response) {
try {
String beginTime = null;
String endTime = null;
@@ -184,7 +185,8 @@
// 列【封装】
List<String> shellList = new ArrayList<String>();
shellList.add("下单时间");
- shellList.add("订单编号");
+ shellList.add("系统订单编号");
+ shellList.add("订单中心编号");
shellList.add("订单来源");
shellList.add("订单类型");
shellList.add("乘车时间");
@@ -199,10 +201,12 @@
shellList.add("接单车辆");
shellList.add("订单金额");
shellList.add("状态");
+ shellList.add("支付方式");
shellList.add("是否异常订单");
shellList.add("是否推广订单");
shellList.add("推广员姓名");
shellList.add("推广员电话");
+ shellList.add("所属公司");
dataList.add(shellList);
for (Map<String,Object> object : list){
@@ -215,6 +219,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("-");
}
@@ -295,11 +304,6 @@
shellList.add("-");
}
- if(SinataUtil.isNotEmpty(object.get("contactPersonPhone"))){
- shellList.add(object.get("contactPersonPhone").toString());
- }else{
- shellList.add("-");
- }
if(SinataUtil.isNotEmpty(object.get("startAddress"))){
shellList.add(object.get("startAddress").toString());
@@ -383,7 +387,22 @@
break;
}
}
-
+ if(SinataUtil.isNotEmpty(object.get("payType"))){
+ switch (object.get("payType").toString()){
+ case "1":
+ shellList.add("微信");
+ break;
+ case "3":
+ shellList.add("余额");
+ break;
+ case "5":
+ shellList.add("备付金");
+ break;
+ default:
+ shellList.add("-");
+ break;
+ }
+ }
if(SinataUtil.isNotEmpty(object.get("abnormal"))){
shellList.add(object.get("abnormal").toString().equals("1")?"否":"是");
@@ -409,6 +428,11 @@
}else{
shellList.add("-");
}
+ if(SinataUtil.isNotEmpty(object.get("companyName"))){
+ shellList.add(object.get("companyName").toString());
+ }else{
+ shellList.add("-");
+ }
dataList.add(shellList);
--
Gitblit v1.7.1