From 818937959bb19d3669585fa87a526bffe9ce77a4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 24 四月 2025 09:28:41 +0800
Subject: [PATCH] 修改默认验证码
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 20 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
index 4dc5037..1256982 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.google.gson.Gson;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.common.constant.factory.PageFactory;
import com.stylefeng.guns.core.shiro.ShiroKit;
@@ -14,15 +15,13 @@
import com.stylefeng.guns.modular.system.util.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.ui.Model;
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
+import java.io.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -102,25 +101,72 @@
* 跳转到修改出租车订单
*/
@RequestMapping("/tOrderTaxi_update/{tOrderTaxiId}")
- public String tOrderTaxiUpdate(@PathVariable Integer tOrderTaxiId, Model model) {
+ public String tOrderTaxiUpdate(@PathVariable Integer tOrderTaxiId, Model model) throws IOException {
Map<String, Object> tOrderTaxi = tOrderTaxiService.getTaxiOrderDetailById(tOrderTaxiId);
model.addAttribute("item",tOrderTaxi);
// 查询司机扣款
- TPubTransactionDetails tPubTransactionDetails = pubTransactionDetailsService.selectOne(new EntityWrapper<TPubTransactionDetails>()
+ List<TPubTransactionDetails> tPubTransactionDetails = pubTransactionDetailsService.selectList(new EntityWrapper<TPubTransactionDetails>()
.eq("userId", tOrderTaxi.get("driverId"))
- .eq("state", 2)
+ .eq("orderId", tOrderTaxi.get("id"))
.eq("type", 1)
- .eq("userType", 6)
- .eq("payState", 2)
- .last("LIMIT 1"));
- model.addAttribute("companyMoney",tPubTransactionDetails.getMoney());
- model.addAttribute("driverMoney",new BigDecimal(tOrderTaxi.get("payMoney").toString()).subtract(tPubTransactionDetails.getMoney()));
- if(tOrderTaxi.get("payManner").equals("1")){
+ .eq("userType", 2));
+ if(CollectionUtils.isEmpty(tPubTransactionDetails)){
+ model.addAttribute("companyMoney","");
+ model.addAttribute("driverMoney","");
+ }else {
+ TPubTransactionDetails pubTransactionDetailCompany = tPubTransactionDetails.stream().filter(e -> e.getOrderType().equals(6)).findFirst().orElse(null);
+ if(Objects.nonNull(pubTransactionDetailCompany)){
+ model.addAttribute("companyMoney",pubTransactionDetailCompany.getMoney());
+ }else {
+ model.addAttribute("companyMoney","");
+ }
+ TPubTransactionDetails pubTransactionDetailDriver = tPubTransactionDetails.stream().filter(e -> e.getOrderType().equals(2)).findFirst().orElse(null);
+ if(Objects.nonNull(pubTransactionDetailDriver)){
+ model.addAttribute("driverMoney",pubTransactionDetailDriver.getMoney());
+ }else {
+ model.addAttribute("driverMoney","");
+ }
+ }
+ if(tOrderTaxi.get("payManner")!=null && tOrderTaxi.get("payManner").equals("1")){
model.addAttribute("payMannerStr","线上收款");
}else {
model.addAttribute("payMannerStr","计费打表");
}
LogObjectHolder.me().set(tOrderTaxi);
+ try{
+ //将数据存储到文件中
+ File file = new File(filePath + tOrderTaxiId + "_2.txt");
+
+ //读取文件(字符流)
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
+ //循环取出数据
+ String str = null;
+ StringBuffer sb = new StringBuffer();
+ while ((str = in.readLine()) != null) {
+ sb.append(str);
+ }
+ List<TOrderPosition> list = JSONArray.parseArray(sb.toString(), TOrderPosition.class);
+ List<Map> maps = new ArrayList<>();
+ for (TOrderPosition tOrderPosition : list) {
+ Map<String, String> map = new HashMap<>();
+ map.put("lon",tOrderPosition.getLon());
+ map.put("lat",tOrderPosition.getLat());
+ maps.add(map);
+ }
+// resultUtil = ResultUtil.success(list);
+ // 将maps转化为jsonArray字符串
+ // 使用 Gson 转换为 JSON 字符串
+// Gson gson = new Gson();
+// String jsonString = gson.toJson(maps);
+// System.out.println(jsonString);
+ model.addAttribute("guiji",maps);
+ }catch (Exception e){
+ e.printStackTrace();
+ resultUtil = ResultUtil.runErr();
+ model.addAttribute("guiji","");
+ }
+
+
return PREFIX + "tOrderTaxi_edit.html";
}
@@ -139,8 +185,40 @@
* 跳转到出租车订单轨迹页面
*/
@RequestMapping("/tOrderTaxi_trajectory/{tOrderTaxiId}")
- public String tOrderTaxi_trajectory(@PathVariable Integer tOrderTaxiId, Model model) {
+ public String tOrderTaxi_trajectory(@PathVariable Integer tOrderTaxiId, Model model) throws IOException {
model.addAttribute("tOrderTaxiId",tOrderTaxiId);
+ try{
+ //将数据存储到文件中
+ File file = new File(filePath + tOrderTaxiId + "_2.txt");
+
+ //读取文件(字符流)
+ BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file),"UTF-8"));
+ //循环取出数据
+ String str = null;
+ StringBuffer sb = new StringBuffer();
+ while ((str = in.readLine()) != null) {
+ sb.append(str);
+ }
+ List<TOrderPosition> list = JSONArray.parseArray(sb.toString(), TOrderPosition.class);
+ List<Map> maps = new ArrayList<>();
+ for (TOrderPosition tOrderPosition : list) {
+ Map<String, String> map = new HashMap<>();
+ map.put("lon",tOrderPosition.getLon());
+ map.put("lat",tOrderPosition.getLat());
+ maps.add(map);
+ }
+// resultUtil = ResultUtil.success(list);
+ // 将maps转化为jsonArray字符串
+ // 使用 Gson 转换为 JSON 字符串
+// Gson gson = new Gson();
+// String jsonString = gson.toJson(maps);
+// System.out.println(jsonString);
+ model.addAttribute("guiji",maps);
+ }catch (Exception e){
+ e.printStackTrace();
+ resultUtil = ResultUtil.runErr();
+ model.addAttribute("guiji","");
+ }
return PREFIX + "tOrderTaxi_trajectory.html";
}
@@ -371,12 +449,12 @@
tOrderTaxi.setUserId(tUser.getId());
tOrderTaxi.setOrderNum(this.getOrderNum());
tOrderTaxi.setPlacementAddress(tOrderTaxi.getStartAddress());
- tOrderTaxi.setPlacementLon(Double.valueOf(s.get(0).split(",")[0]));
- tOrderTaxi.setPlacementLat(Double.valueOf(s.get(0).split(",")[1]));
- tOrderTaxi.setStartLon(Double.valueOf(s.get(0).split(",")[0]));
- tOrderTaxi.setStartLat(Double.valueOf(s.get(0).split(",")[1]));
- tOrderTaxi.setEndLon(Double.valueOf(e.get(0).split(",")[0]));
- tOrderTaxi.setEndLat(Double.valueOf(e.get(0).split(",")[1]));
+ tOrderTaxi.setPlacementLon(Double.valueOf(s.get(0).split(",")[1]));
+ tOrderTaxi.setPlacementLat(Double.valueOf(s.get(0).split(",")[0]));
+ tOrderTaxi.setStartLon(Double.valueOf(s.get(0).split(",")[1]));
+ tOrderTaxi.setStartLat(Double.valueOf(s.get(0).split(",")[0]));
+ tOrderTaxi.setEndLon(Double.valueOf(e.get(0).split(",")[1]));
+ tOrderTaxi.setEndLat(Double.valueOf(e.get(0).split(",")[0]));
tOrderTaxi.setMileage(0D);
tOrderTaxi.setOrderMoney(new BigDecimal(0));
tOrderTaxi.setTravelMoney(new BigDecimal(0));
@@ -390,6 +468,7 @@
tOrderTaxi.setSubstitute(0);
tOrderTaxi.setOrderSource(5);
tOrderTaxi.setIsDelete(1);
+ tOrderTaxi.setPayManner(3);
tOrderTaxiService.insert(tOrderTaxi);
if(tOrderTaxi.getState() == 1){
//推送司机抢单
--
Gitblit v1.7.1