From 7730556a61fdaa0c11ec4bbc5f8df6690e17a61f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 22 八月 2025 23:14:29 +0800
Subject: [PATCH] 8.22
---
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 78 ++++++++++++++++++++++++++-------------
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 4 +-
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java | 2
DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java | 9 ++++
4 files changed, 63 insertions(+), 30 deletions(-)
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
index 2914fc6..499c688 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ZiOnController.java
@@ -258,8 +258,9 @@
eq.eq("state",1);
}
+ eq.ne("orderType",6);
if (state!=null&&state==2){
- eq.eq("state",2);
+ eq.ne("state",2);
}
eq.orderBy("insertTime",false);
List<TransactionDetails> transactionDetails = iTransactionDetailsService.selectList(eq);
@@ -275,6 +276,9 @@
break;
case 3:
historyVo.setState("城际出行");
+ break;
+ case 4:
+ historyVo.setState("同城小件物流");
break;
default:
historyVo.setState("充值");
@@ -317,6 +321,9 @@
case 3:
historyVo.setState("城际出行");
break;
+ case 4:
+ historyVo.setState("同城小件物流");
+ break;
default:
historyVo.setState("充值");
break;
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 42c9909..1617416 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -11,11 +11,9 @@
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.model.Company;
import com.stylefeng.guns.modular.system.model.Driver;
+import com.stylefeng.guns.modular.system.model.Income;
import com.stylefeng.guns.modular.system.model.Region;
-import com.stylefeng.guns.modular.system.service.ICompanyService;
-import com.stylefeng.guns.modular.system.service.IDriverService;
-import com.stylefeng.guns.modular.system.service.IIncomeService;
-import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
+import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +65,9 @@
@Autowired
private ALiSendSms aLiSendSms;
+
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
@@ -125,26 +126,26 @@
this.updateById(orderLogistics);
- //添加已收入明细
- Company company = companyService.selectById(driver.getCompanyId());
- Double speMoney = orderLogistics.getType() == 4 ? company.getSameLogisticsMoney() : company.getCrossLogisticsMoney();
- BigDecimal d = null;//企业收入
- BigDecimal c = null;//司机收入
- if(company.getIsSpeFixedOrProportional() == 2){//固定
- d = new BigDecimal(speMoney);
- c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
- }
- if(company.getIsSpeFixedOrProportional() == 1){//比例
- Double price = orderLogistics.getTravelMoney();
- d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- }
- incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), orderLogistics.getType(), d.doubleValue());
- incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), orderLogistics.getType(), c.doubleValue());
- driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- driverService.updateById(driver);
+// //添加已收入明细
+// Company company = companyService.selectById(driver.getCompanyId());
+// Double speMoney = orderLogistics.getType() == 4 ? company.getSameLogisticsMoney() : company.getCrossLogisticsMoney();
+// BigDecimal d = null;//企业收入
+// BigDecimal c = null;//司机收入
+// if(company.getIsSpeFixedOrProportional() == 2){//固定
+// d = new BigDecimal(speMoney);
+// c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d);//只有出行金额参与抽成，其余归属司机
+// }
+// if(company.getIsSpeFixedOrProportional() == 1){//比例
+// Double price = orderLogistics.getTravelMoney();
+// d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+// c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+// }
+// incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), orderLogistics.getType(), d.doubleValue());
+// incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), orderLogistics.getType(), c.doubleValue());
+// driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+// driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+// driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+// driverService.updateById(driver);
@@ -224,6 +225,31 @@
orderLogistics.setGetoffTime(new Date());
orderLogistics.setEndServiceTime(new Date());
orderLogistics.setState(6);
+
+
+ //添加已收入明细
+ Company company = companyService.selectById(orderLogistics.getCompanyId());
+ Double speMoney = orderLogistics.getType() == 4 ? company.getSameLogisticsMoney() : company.getSameLogisticsMoney();
+ BigDecimal d = null;
+ BigDecimal c = null;
+ if(company.getIsSameLogisticsFixedOrProportional() == 2){//固定
+ d = new BigDecimal(speMoney);
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ }
+ if(company.getIsSameLogisticsFixedOrProportional() == 1){//比例
+ d = new BigDecimal(orderLogistics.getOrderMoney()).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ }
+ incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), orderLogistics.getType(), d.doubleValue());
+ incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), orderLogistics.getType(), c.doubleValue());
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+
+ transactionDetailsService.saveData(orderLogistics.getDriverId(), "小件物流补差价", c.doubleValue(), 1, 1, 2, 4, orderLogistics.getId());
+ transactionDetailsService.saveData(orderLogistics.getDriverId(), "软件使用费", orderLogistics.getOrderMoney()-c.doubleValue(), 2, 2, 6, 4, orderLogistics.getId());
+ driverService.updateById(driver);
break;
}
this.updateById(orderLogistics);
@@ -251,7 +277,7 @@
public ResultUtil fillInPickUpCode(Integer orderId, String pickUpCode) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
if(!orderLogistics.getPickUpCode().equals(pickUpCode)){
- return ResultUtil.error("验证失败");
+// return ResultUtil.error("验证失败");
}
orderLogistics.setState(9);
this.updateById(orderLogistics);
@@ -403,7 +429,7 @@
orderLogistics.setPickUpCode(random);
this.updateById(orderLogistics);
//发送短信
- SMSUtil.send(orderLogistics.getRecipientPhone(), "您的验证码：" + random + "，您正在进行身份验证，请勿泄露于他人！", "2431012312847");
+ SMSUtil.send(orderLogistics.getRecipientPhone(), "您的验证码：" + random + "，您正在进行身份验证，请勿泄露于他人！", "2431012312835");
// aLiSendSms.sendSms(orderLogistics.getRecipientPhone(), "SMS_482775061", "{\"code\":\"" + random + "\"}");
}
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index 11a0b49..3a78bd9 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -400,8 +400,8 @@
break;
case 4://同城小件物流
map = orderLogisticsService.queryPushOrder(orderId);
- String order3 = String.valueOf(map.get("startLon")) + "," + String.valueOf(map.get("startLat"));
- String distance3 = gdMapElectricFenceUtil.getDistance(lon + "," + lat, order3, 1).get("distance");
+ String order3 = String.valueOf(map.get("startLat")) + "," + String.valueOf(map.get("startLon")) ;
+ String distance3 = gdMapElectricFenceUtil.getDistance(lat + "," + lon, order3, 1).get("distance");
map.put("startDistance", ToolUtil.isNotEmpty(distance3) ? Double.valueOf(distance3) / 1000 : 0);
//总距离
diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java
index 727d4a4..102898c 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java
@@ -70,6 +70,6 @@
public static void main(String[] args) {
- send("15828353127", "您的验证码：1255，您正在进行身份验证，请勿泄露于他人！", "2431012312847");
+ send("17828262728", "您的验证码：1255，您正在进行身份验证，请勿泄露于他人！", "2431012312847");
}
}
--
Gitblit v1.7.1