From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java
index 24e50fd..b5304d0 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderCharteredCarController.java
@@ -21,7 +21,7 @@
import java.util.Map;
/**
- * 旅游包车订单控制器
+ * 包车订单控制器
*
* @author fengshuonan
* @Date 2020-09-24 11:08:23
@@ -36,7 +36,7 @@
private ITOrderCharteredCarService tOrderCharteredCarService;
/**
- * 跳转到旅游包车订单首页
+ * 跳转到包车订单首页
*/
@RequestMapping("")
public String index() {
@@ -44,7 +44,7 @@
}
/**
- * 跳转到修改旅游包车订单
+ * 跳转到修改包车订单
*/
@RequestMapping("/tOrderCharteredCar_immediately/{tOrderCharteredCarId}")
public String tOrderCharteredCarUpdate(@PathVariable Integer tOrderCharteredCarId, Model model) {
@@ -53,7 +53,7 @@
}
/**
- * 获取旅游包车订单列表
+ * 获取包车订单列表
*/
@RequestMapping(value = "/list")
@ResponseBody
@@ -70,12 +70,12 @@
page.setRecords(null);
}else{
List<Map<String, Object>> charterCarOrderList = tOrderCharteredCarService.getCharterCarOrderList(page, beginTime, endTime, userName, contactPerson, contactPhone, modelUse, state, ShiroKit.getUser().getRoleType(), ShiroKit.getUser().getObjectId());
- for(Map<String, Object> map : charterCarOrderList){
- String[] prices = map.get("price").toString().split("-");
- String p = Double.valueOf(prices[0]) * Integer.valueOf(map.get("peopleNumber").toString()) + "-" + Double.valueOf(prices[1]) * Integer.valueOf(map.get("peopleNumber").toString());
- map.put("price", p);
-
- }
+// for(Map<String, Object> map : charterCarOrderList){
+// String[] prices = map.get("price").toString().split("-");
+// String p = Double.valueOf(prices[0]) * Integer.valueOf(map.get("peopleNumber").toString()) + "-" + Double.valueOf(prices[1]) * Integer.valueOf(map.get("peopleNumber").toString());
+// map.put("price", p);
+//
+// }
page.setRecords(charterCarOrderList);
}
return super.packForBT(page);
@@ -95,7 +95,7 @@
}
/**
- * 删除旅游包车订单
+ * 删除包车订单
*/
@RequestMapping(value = "/delete")
@ResponseBody
--
Gitblit v1.7.1