From 0b39a6b4f6962d9454a61d34bba2098ffa3993a9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 20 四月 2025 01:51:14 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java | 125 ++++++++++++++++++++++++++++++++---------
1 files changed, 98 insertions(+), 27 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
index 9ab6a9c..3240c07 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -46,7 +46,8 @@
@Autowired
private GDMapElectricFenceUtil gdMapElectricFenceUtil;
-
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
@Autowired
private GDFalconUtil gdFalconUtil;
@@ -208,7 +209,22 @@
Company company = companyService.selectById(driver.getCompanyId());
orderTaxi.setState(9);
driver.setState(2);
- driver.setBalance(driver.getBalance() - company.getFixedDeduction());
+// driver.setBalance(driver.getBalance() - company.getFixedDeduction());
+
+ if(Objects.isNull(company)){
+ company = companyService.selectById(driver.getCompanyId());
+ }
+ // 平台收入
+ double money;
+ if(orderTaxi.getOrderSource() == 2 || orderTaxi.getOrderSource() == 3){
+ double v = company.getPercentageDeduction() / 100;
+ money = v * orderTaxi.getOrderMoney();
+ }else {
+ money = company.getFixedDeduction();
+ }
+ driver.setBalance(driver.getBalance() - money);
+ // 新增扣除使用费记录
+ transactionDetailsService.saveData(driver.getId(), "软件使用费", money, 2, 1, 2, 6, orderTaxi.getId(),company.getId());
driverService.updateById(driver);
Car car = carService.selectById(driver.getCarId());
@@ -438,33 +454,69 @@
orderTaxi.setGetoffLat(lat);
orderTaxi.setGetoffAddress(address);
orderTaxi.setGetoffTime(new Date());
- orderTaxi.setState(6);
orderTaxi.setEndServiceTime(new Date());
+ if(orderTaxi.getPayManner()==3){
+ orderTaxi.setState(9);
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
-// List<TUseMoney> money = useMoneyMapper.selectList(null);
- Driver driver = driverService.selectById(orderTaxi.getDriverId());
- Company company = companyService.selectById(driver.getCompanyId());
- TransactionDetails transactionDetails = new TransactionDetails();
- if(orderTaxi.getOrderSource() == 2 || orderTaxi.getOrderSource() == 3){
- double v = company.getPercentageDeduction() / 100;
- v = v * orderTaxi.getOrderMoney();
- driver.setBalance(driver.getBalance() - v);
- transactionDetails.setMoney(v);
- }else {
+ Company company = companyService.selectById(driver.getFranchiseeId());
+ if(Objects.isNull(company)){
+ company = companyService.selectById(driver.getCompanyId());
+ }
+ TransactionDetails transactionDetails = new TransactionDetails();
driver.setBalance(driver.getBalance() - company.getFixedDeduction());
transactionDetails.setMoney(company.getFixedDeduction());
+ // 新增扣除使用费记录
+ transactionDetails.setUserId(driver.getId());
+ transactionDetails.setInsertTime(new Date());
+ transactionDetails.setRemark("软件使用费");
+ transactionDetails.setState(2);
+ transactionDetails.setType(1);
+ transactionDetails.setUserType(2);
+ transactionDetails.setOrderType(6);
+ transactionDetails.setOrderId(orderTaxi.getId());
+ transactionDetailsMapper.insert(transactionDetails);
+ driverService.updateById(driver);
}
- // 新增扣除使用费记录
- transactionDetails.setUserId(driver.getId());
- transactionDetails.setInsertTime(new Date());
- transactionDetails.setRemark("软件使用费");
- transactionDetails.setState(2);
- transactionDetails.setType(1);
- transactionDetails.setUserType(2);
- transactionDetails.setOrderType(6);
- transactionDetails.setOrderId(orderTaxi.getId());
- transactionDetailsMapper.insert(transactionDetails);
+ //打表计费，直接订单完成支付，
+ if(orderTaxi.getPayManner()==2){
+ orderTaxi = this.setMoney2(orderTaxi, 0D, 0D);
+ //在线上计费的基础上随机加0.01-1的金额
+ Double orderMoney = orderTaxi.getOrderMoney() + (new BigDecimal(Math.random()).setScale(2, BigDecimal.ROUND_DOWN).doubleValue());
+ orderTaxi.setState(8);
+ orderTaxi.setOrderMoney(orderMoney);
+ orderTaxi.setPayMoney(orderMoney);
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
+
+ Company company = companyService.selectById(driver.getFranchiseeId());
+ if(Objects.isNull(company)){
+ company = companyService.selectById(driver.getCompanyId());
+ }
+ TransactionDetails transactionDetails = new TransactionDetails();
+ driver.setBalance(driver.getBalance() - company.getMeterPrintingFee());
+ transactionDetails.setMoney(company.getMeterPrintingFee());
+ // 新增扣除使用费记录
+ transactionDetails.setUserId(driver.getId());
+ transactionDetails.setInsertTime(new Date());
+ transactionDetails.setRemark("软件使用费");
+ transactionDetails.setState(2);
+ transactionDetails.setType(1);
+ transactionDetails.setUserType(2);
+ transactionDetails.setOrderType(6);
+ transactionDetails.setOrderId(orderTaxi.getId());
+ transactionDetailsMapper.insert(transactionDetails);
+ driverService.updateById(driver);
+ }
+ //线上计费，计算费用后修改为待支付
+ if(orderTaxi.getPayManner()==1){
+ orderTaxi = this.setMoney2(orderTaxi, 0D, 0D);
+ orderTaxi.setState(7);
+ }
+ //回滚司机状态为空闲
+ Driver driver = driverService.selectById(orderTaxi.getDriverId());
+ driver.setState(2);
driverService.updateById(driver);
+
pushUtil.removeTask(orderId, 2);//删除定时任务，结束推送数据
systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderTaxi.getUserId());
break;
@@ -472,11 +524,12 @@
this.updateById(orderTaxi);
// TODO: 2020/6/5 推送状态
+ OrderTaxi finalOrderTaxi = orderTaxi;
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderTaxi.getUserId(), orderTaxi.getId(), 2, orderTaxi.getState());
- pushUtil.pushOrderState(2, orderTaxi.getDriverId(), orderTaxi.getId(), 2, orderTaxi.getState());
+ pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
+ pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 2, finalOrderTaxi.getState());
}
}).start();
return ResultUtil.success();
@@ -500,9 +553,11 @@
if(type == 2){//其他支付，不需要操作，直接完成订单
orderTaxi = this.setMoney1(orderTaxi, travelFee, parkingFee, crossingFee);
orderTaxi.setState(7);
- }else{
+ }else if (type == 1){
orderTaxi = this.setMoney2(orderTaxi, parkingFee, crossingFee);
orderTaxi.setState(7);
+ }else {
+ orderTaxi.setState(8);
}
this.updateById(orderTaxi);
@@ -722,6 +777,9 @@
System.err.println("订单数据异常：" + orderId);
return false;
}
+ if(orderTaxi.getState() != 5){
+ return false;
+ }
OrderPosition orderPosition = orderPositionService.queryNew(orderId, 2);
String now = lon + "," + lat;
String old = null;
@@ -776,10 +834,18 @@
if(orderTaxi.getState() == 5 || orderTaxi.getState() == 6){//服务中的时候获取实时费用数据
if(orderTaxi.getPayManner() == 2){//其他支付，不需要操作，直接完成订单
orderTaxi = this.setMoney1(orderTaxi, 0D, 0D, 0D);
- }else{
+ }else if(orderTaxi.getPayManner() == 1){
orderTaxi = this.setMoney2(orderTaxi, 0D, 0D);
+ }else {
+ // 无
}
}
+
+ // 查询平台服务费
+ TransactionDetails transactionDetails = transactionDetailsService.selectOne(new EntityWrapper<TransactionDetails>()
+ .eq("orderId", orderId)
+ .eq("orderType", 6)
+ .last("LIMIT 1"));
Map<String, Object> map = new HashMap<>();
map.put("orderMoney", orderTaxi.getOrderMoney());//订单金额
@@ -799,6 +865,11 @@
map.put("couponMoney", orderTaxi.getCouponMoney());//优惠券抵扣金额
map.put("discountMoney", orderTaxi.getDiscountMoney());//折扣抵扣金额
map.put("discount", orderTaxi.getDiscount());//折扣
+ if(Objects.isNull(transactionDetails)){
+ map.put("platformFee", 0);//折扣
+ }else {
+ map.put("platformFee", transactionDetails.getMoney());//折扣
+ }
return map;
}
--
Gitblit v1.7.1