From 7086b58623f83547f50c9363954b155b4d44174d Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期一, 19 八月 2024 13:32:51 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml | 3 +--
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 1 +
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml | 6 ++----
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 3 ++-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java | 3 +++
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 483d27d..ad00677 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -652,7 +652,7 @@
Element email2_user = document.getElementById("email2_user");
email2_user.text("Bonjour " + userInfo.getFirstName() + " " + userInfo.getLastName());
Element email2_content = document.getElementById("email2_content");
- email2_content.text("Le code de ramassage de votre colis est " + random + ", veuillez effectuer la verification dans les 5minutes.");
+ email2_content.text("Le code de ramassage de votre colis est " + random + ", veuillez effectuer la verification dans les 5 minutes.");
}
EmailUtil.send(userInfo.getEmail(), language == 1 ? "取件码邮件" : language == 2 ? "Pickup code" : "Code de ramassage", document.html());
//开始生成pdf收据和html收据
@@ -773,6 +773,7 @@
map.put("discountMoney", orderLogistics.getDiscountMoney());//折扣抵扣金额
map.put("discount", orderLogistics.getDiscount());//折扣
map.put("priceDifference", orderLogistics.getPriceDifference());//补差价
+ map.put("isDispute", orderLogistics.getIsDispute());
return map;
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
index 37acf95..3b2574e 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml
@@ -223,8 +223,7 @@
a.bindId as bindId,
(
(select count(id) from t_order_private_car where userId = b.id and state in (8, 9)) +
- (select count(id) from t_order_taxi where userId = b.id and state in (8, 9)) +
- (select count(id) from t_order_cross_city where userId = b.id and state in (8, 9))
+ (select count(id) from t_order_logistics where userId = b.id and state in (8, 9))
) as historyNum,
(select phone from t_phone where companyId = a.companyId and `type` = 1) as emergencyCall,
c.reason as cancelReason,
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 06cf476..cabeeb7 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -743,6 +743,7 @@
map.put("couponMoney", orderPrivateCar.getCouponMoney());//优惠券抵扣金额
map.put("discountMoney", orderPrivateCar.getDiscountMoney());//折扣抵扣金额
map.put("discount", orderPrivateCar.getDiscount());//折扣
+ map.put("isDispute", orderPrivateCar.getIsDispute());
return map;
}
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
index 75c57bb..3d0d3d9 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml
@@ -179,10 +179,8 @@
b.vehicleId,
CONCAT(d.`name`, ' ', c.`name`) as brand,
(
- (select count(id) from t_order_private_car where driverId = a.id and state in (7, 8, 9)) +
- (select count(id) from t_order_taxi where driverId = a.id and state in (7, 8, 9)) +
- (select count(id) from t_order_cross_city where driverId = a.id and state in (6, 8, 9)) +
- (select count(id) from t_order_logistics where driverId = a.id and state in (6, 9))
+ (select count(id) from t_order_private_car where driverId = a.id and state in (6, 7, 8, 9)) +
+ (select count(id) from t_order_logistics where driverId = a.id and state in (6, 7, 8, 9))
) as orderNum,
((select sum(fraction) from t_order_evaluate where driverId = a.id) / (select count(fraction) from t_order_evaluate where driverId = a.id)) as score
from t_driver a
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java
index f3abe79..4997c2c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MoneyInfoWarpper.java
@@ -48,6 +48,8 @@
private Double discount;
@ApiModelProperty("补差价")
private Double priceDifference;
+ @ApiModelProperty("争议订单（0=否，1=是）")
+ private Integer isDispute;
public static MoneyInfoWarpper getMoneyInfoWarpper(Map<String, Object> map){
MoneyInfoWarpper moneyInfoWarpper = new MoneyInfoWarpper();
@@ -70,6 +72,7 @@
moneyInfoWarpper.setDiscountMoney(null != map.get("discountMoney") ? Double.valueOf(map.get("discountMoney").toString()) : 0D);
moneyInfoWarpper.setDiscount(null != map.get("discount") ? Double.valueOf(map.get("discount").toString()) : 0D);
moneyInfoWarpper.setPriceDifference(null != map.get("priceDifference") ? Double.valueOf(map.get("priceDifference").toString()) : 0D);
+ moneyInfoWarpper.setIsDispute(null != map.get("isDispute") ? Integer.valueOf(map.get("isDispute").toString()) : 0);
}
return moneyInfoWarpper;
}
--
Gitblit v1.7.1