From 6c741ac9e80353ca42906c1c6c7109324ae9f9f9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 03 十月 2024 01:02:38 +0800
Subject: [PATCH] 修改bug和翻译
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index 02d52a4..70ee736 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.mchange.util.FailSuppressedMessageLogger;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
@@ -22,14 +23,20 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import java.io.BufferedReader;
import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -41,6 +48,8 @@
@RestController
@RequestMapping("")
public class DriverController {
+
+ private Logger log = LoggerFactory.getLogger(DriverController.class);
@Autowired
private IDriverService driverService;
@@ -95,6 +104,9 @@
@Autowired
private FleetEngineUtil fleetEngineUtil;
+
+ @Autowired
+ private IOrderCancelService orderCancelService;
@@ -808,7 +820,7 @@
return ResultUtil.tokenErr();
}
Map<String, Object> map = driverService.queryInfo(language, uid);
- map.put("qrCodeIsOpen",driverService.getAppOpenInfo(1)==1);
+ map.put("qrCodeIsOpen", driverService.getAppOpenInfo(1)==1);
DriverInfoWarpper driverInfoWarpper = DriverInfoWarpper.getDriverInfoWarpper(map);
// Double money = driverService.getThisWeekMoney(uid);
// driverInfoWarpper.setLaveBusinessMoney(driverInfoWarpper.getLaveBusinessMoney()-(money==null?0d:money));
@@ -1274,6 +1286,7 @@
continue;
}
List<Income> incomes3 = incomeService.queryData(1, null, 2, orderLogistics.getId(), 4);
+ map1.put("travelMoney", orderLogistics != null ? orderLogistics.getOrderMoney() : 0);//行程费
map1.put("parkMoney", orderLogistics != null ? orderLogistics.getParkMoney() : 0);//停车费
map1.put("tipMoney", 0);//小费
map1.put("roadTollMoney", orderLogistics != null ? orderLogistics.getRoadTollMoney() : 0);//过路费
@@ -1286,9 +1299,9 @@
}
List<Income> incomes4 = incomeService.queryData(1, null, 2, orderLogistics1.getId(), 5);
map1.put("travelMoney", orderLogistics1 != null ? orderLogistics1.getOrderMoney() : 0);//行程费
- map1.put("parkMoney", 0);//停车费
+ map1.put("parkMoney", orderLogistics1 != null ? orderLogistics1.getParkMoney() : 0);//停车费
map1.put("tipMoney", 0);//小费
- map1.put("roadTollMoney", 0);//过路费
+ map1.put("roadTollMoney", orderLogistics1 != null ? orderLogistics1.getRoadTollMoney() : 0);//过路费
map1.put("rakeMoney", incomes4.size() > 0 ? incomes4.get(0).getMoney() : 0);//抽成
break;
}
@@ -1316,6 +1329,10 @@
baseWarpper.setName(language == 1 ? "取消订单费用" : language == 2 ? "Cancellation fee" : "Frais d'annulation");
List<Income> incomes = incomeService.queryData(1, 1, 3, Integer.valueOf(map.get("incomeId").toString()), Integer.valueOf(map.get("orderType").toString()));
Map<String, Object> map1 = new HashMap<>();
+
+ OrderCancel orderCancel = orderCancelService.selectOne(new EntityWrapper<OrderCancel>().eq("orderType", map.get("orderType"))
+ .eq("orderId", map.get("incomeId")).eq("state", 2));
+ map1.put("travelMoney", orderCancel.getMoney());//支付金额
map1.put("rakeMoney", incomes.size() > 0 ? incomes.get(0).getMoney() : 0);//抽成
baseWarpper.setData(map1);
}
@@ -1470,7 +1487,7 @@
return ResultUtil.tokenErr();
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- List<ActivityWarpper> activityWarppers = driverService.queryMyActivity(uid, sdf.parse(time), language);
+ List<ActivityWarpper> activityWarppers = driverService.queryHistoryList(uid, sdf.parse(time), language);
return ResultUtil.success(activityWarppers);
}catch (Exception e){
e.printStackTrace();
@@ -1760,6 +1777,9 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ if(!StringUtils.hasLength(vehicleId)){
+ return ResultUtil.paranErr();
+ }
Map<String, Object> s = fleetEngineUtil.fleetEngineAuth(2, vehicleId);
return ResultUtil.success(s);
}catch (Exception e){
@@ -1788,7 +1808,7 @@
public void run() {
Process process = null;
try {
- process = Runtime.getRuntime().exec("rm -rf /usr/local/nginx/html/files/audio/" + fileName + ".mp3");
+ process = Runtime.getRuntime().exec("sudo rm -rf /home/igotechgh/nginx/html/files/audio/" + fileName + ".mp3");
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -1817,4 +1837,29 @@
throw new RuntimeException(e);
}
}
+
+
+
+ /**
+ * 短信回调通知
+ * @param request
+ */
+ @ResponseBody
+ @PostMapping("/base/sendCellulantMessageCallback")
+ public void sendCellulantMessageCallback(HttpServletRequest request){
+ try {
+ StringBuilder sb = new StringBuilder();
+ InputStream inputStream = request.getInputStream();
+ String s;
+ BufferedReader in = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((s = in.readLine()) != null) {
+ sb.append(s);
+ }
+ in.close();
+ inputStream.close();
+ log.info("短信通知回调：" + sb.toString());
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.7.1