From b77c1869930d044db13a0d4a672bf98da1cab2c2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 22 八月 2024 12:00:07 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 45 +++++++++++++++++++++++++++------------------
1 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 43aa8b6..090c631 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -264,10 +264,10 @@
for (Map<String, Object> map : maps) {
Integer orderType = Integer.valueOf(map.get("orderType").toString());
if(1 == orderType){
- map.put("name", language == 1 ? "打车订单取消" : language == 2 ? "Ride order cancelled" : "Commande de trajet annulée");
+ map.put("name", language == 1 ? "打车订单取消" : language == 2 ? "Ride order cancelled" : "Commande de course annulée");
}
if(4 == orderType){
- map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Parcel order cancellation" : "Annulation de commande de livraison");
+ map.put("name", language == 1 ? "包裹订单取消" : language == 2 ? "Delivery order cancelled" : "Commande de livraison annulée");
}
}
List<Map<String, Object>> list = orderPrivateCarService.queryMyTravelRecord(language, uid);//专车
@@ -924,20 +924,24 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- reason = reason.replaceAll("& #40;", "(")
- .replaceAll("& #41;", ")")
- .replaceAll("& #40;", "(")
- .replaceAll("& #41;", ")")
- .replaceAll("& #39;", "'")
- .replaceAll("& lt;", "<")
- .replaceAll("& gt;", ">");
- remark = remark.replaceAll("& #40;", "(")
- .replaceAll("& #41;", ")")
- .replaceAll("& #40;", "(")
- .replaceAll("& #41;", ")")
- .replaceAll("& #39;", "'")
- .replaceAll("& lt;", "<")
- .replaceAll("& gt;", ">");
+ if(ToolUtil.isNotEmpty(reason)){
+ reason = reason.replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #39;", "'")
+ .replaceAll("& lt;", "<")
+ .replaceAll("& gt;", ">");
+ }
+ if(ToolUtil.isNotEmpty(remark)){
+ remark = remark.replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #40;", "(")
+ .replaceAll("& #41;", ")")
+ .replaceAll("& #39;", "'")
+ .replaceAll("& lt;", "<")
+ .replaceAll("& gt;", ">");
+ }
switch (orderType){
case 1:
return orderPrivateCarService.addCancle(id, reason, remark, uid, lon, lat, address, language);
@@ -1752,11 +1756,13 @@
return ResultUtil.tokenErr();
}
Double payMoney = 0D;
- Integer companyId = 1;
switch (orderType){
case 1:
OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
Double orderMoney = orderPrivateCar.getOrderMoney();
+ if(null == orderMoney){
+ orderMoney = 0D;
+ }
UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(orderPrivateCar.getCompanyId());
if(null != query2){
Integer orderNum=orderPrivateCarService.selectCount(new EntityWrapper<OrderPrivateCar>().eq("userId", uid).eq("activityId",query2.getId()).last(" and to_days(getoffTime) = to_days(now())"));
@@ -1772,11 +1778,14 @@
case 4:
OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
Double orderMoney1 = orderLogistics.getOrderMoney();
+ if(null == orderMoney1){
+ orderMoney1 = 0D;
+ }
UserActivityDiscount1 query1 = userActivityDiscount1Mapper.query(orderLogistics.getCompanyId());
if(null != query1){
Integer orderNum=orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("userId", uid).eq("activityId",query1.getId()).last(" and to_days(getoffTime) = to_days(now())"));
if(query1.getDistance()*1000>orderLogistics.getMileage() && query1.getOrderNum()>orderNum){
- Double special = query1.getSpecial();
+ Double special = query1.getLogistics();
if(null != special){
double v = new BigDecimal(orderMoney1).multiply(new BigDecimal(special / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
payMoney = v;
--
Gitblit v1.7.1