From c7fe9d122a14fa2cd4463d4d1b0f14a6058f7955 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 19 八月 2025 15:40:22 +0800
Subject: [PATCH] 8.18
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 114 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 76 insertions(+), 38 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index d6c9495..487bf9e 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -743,6 +743,10 @@
}
this.updateAllColumnById(orderCrossCity);
+
+ if(userInfo.getPhone()!=null){
+ SMSUtil.send(userInfo.getPhone(), "您的订单已生成，如有疑问请咨询0715-8911666", "2431012323525");
+ }
return resultUtil;
}
// /**
@@ -926,7 +930,11 @@
}
//添加交易明细
transactionDetailsService.saveData(orderCrossCity.getUserId(), "完成订单", query.getAmount(), 2, 1, 1, 3, query.getOrderId());
- orderCrossCity.setState(2);//先支付再服务
+ if(orderCrossCity.getDriverId()==null){
+ orderCrossCity.setState(1);
+ }else {
+ orderCrossCity.setState(2);//先支付再服务
+ }
orderCrossCity.setPayType(type);
orderCrossCity.setPayMoney(query.getAmount());
this.updateById(orderCrossCity);
@@ -968,7 +976,7 @@
// 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.getFranchiseeId());
+// Company company = companyService.selectById(driver.getFranchiseeId());
// if(Objects.isNull(company)){
// company = companyService.selectById(driver.getCompanyId());
// }
@@ -992,20 +1000,35 @@
//
// driverService.updateById(driver);
+
+
+
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
- pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
- pushUtil.pushDriverPosition(orderCrossCity.getId(), 3);
+
+ if(driver!=null){
+ pushUtil.pushOrderState(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
+ pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
+ pushUtil.pushDriverPosition(orderCrossCity.getId(), 3);
+ }else {
+ try {
+ pushCrossCityOrder(orderCrossCity);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
}
}).start();
// systemNoticeService.addSystemNotice(1, "您已使用" + (type == 1 ? "微信" : "支付宝") + "成功完成出行订单支付，谢谢使用！", orderCrossCity.getUserId(), 1);
//添加司机消息提醒
- systemNoticeService.addSystemNotice(2, "用户已线上完成支付", driver.getId(), 1);
+ if(driver!=null){
+ systemNoticeService.addSystemNotice(2, "用户已线上完成支付", driver.getId(), 1);
+ }
}else{
System.err.println("预支付数据异常（orderId = " + id + ")");
}
@@ -1258,7 +1281,7 @@
orderCrossCity.setLineId(orderCrossCityWarpperPushOrder.getLineId());
// orderCrossCity.setLineShiftDriverId(orderCrossCityWarpper.getLineShiftDriverId());
// orderCrossCity.setCarId(orderCrossCityWarpper.getCarId());
-// orderCrossCity.setOrderNum(this.getOrderNum(orderCrossCityWarpperPushOrder.getDriverId(), orderCrossCityWarpperPushOrder.getLineShiftDriverId()));
+ orderCrossCity.setOrderNum(this.getOrderNum(orderCrossCityWarpperPushOrder.getDriverId(), orderCrossCityWarpperPushOrder.getLineShiftDriverId()));
orderCrossCity.setPlacementLon(orderCrossCityWarpperPushOrder.getPlacementLon());
orderCrossCity.setPlacementLat(orderCrossCityWarpperPushOrder.getPlacementLat());
String placementAddress = orderCrossCityWarpperPushOrder.getPlacementAddress();
@@ -1310,8 +1333,8 @@
// }
//调用移动的小号接口
- Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
- Region region = regionMapper.query(geocode.get("districtCode"));
+// Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
+// Region region = regionMapper.query(geocode.get("districtCode"));
// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
// if (String.valueOf(map.get("code")).equals("200")) {
// orderCrossCity.setTelX(map.get("telX"));
@@ -1406,6 +1429,7 @@
};
Timer timer = new Timer();
timer.schedule(timerTask, 30 * 60 * 1000);
+
return ResultUtil.success(baseWarpper);
}
@@ -1926,7 +1950,9 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
+ if(orderCrossCity.getDriverId()!=null){
+ pushUtil.pushOrderState(2, orderCrossCity.getDriverId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 0);
+ }
System.err.println("推送取消操作---------------------");
}
}).start();
@@ -1934,9 +1960,12 @@
//修改司机座位
LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId());
- lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
- lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity.getTravelMode() == 1 ? "," : "") + orderCrossCity.getSeatNumber());
- lineShiftDriverMapper.updateById(lineShiftDriver);
+ if(lineShiftDriver!=null){
+ lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber());
+ lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity.getTravelMode() == 1 ? "," : "") + orderCrossCity.getSeatNumber());
+ lineShiftDriverMapper.updateById(lineShiftDriver);
+ }
+
//修改司机为空闲
List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11);
@@ -2530,34 +2559,33 @@
if(ToolUtil.isNotEmpty(vehicle)){
integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
}
-// Company query = companyCityService.query(String.valueOf(orderCrossCity.getStartLon()), String.valueOf(orderCrossCity.getStartLat()));//获取起点所属分公司
+ Company query = companyCityService.query(String.valueOf(orderCrossCity.getStartLon()), String.valueOf(orderCrossCity.getStartLat()));//获取起点所属分公司
// List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
- Company query = companyService.selectById(1);
+// Company query = companyService.selectById(1);
for(int i = 1; i <= 3; i++){
- PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
- //获取空闲司机
-// List<Driver> list = driverService.queryIdleDriver(1, orderCrossCity.getServerCarModelId(), orderCrossCity.getStartLon(), orderCrossCity.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
+// PushOrder pushOrder = pushOrderService.querys(i, 4, query.getId()).get(0);
+
//获取同线路的同车型的跨城司机
List<Driver> list = driverService.queryDriversByLineAndCarModel(3,orderCrossCity.getServerCarModelId(), orderCrossCity.getLineId());
if(list.size() > 0){
- double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
- int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
- list = list.subList(0, lastIndex);//获取空闲司机中占比数据
+// double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
+// int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
+// list = list.subList(0, lastIndex);//获取空闲司机中占比数据
for(Driver driver : list){//开始进行推送
- boolean bo = false;
- for(Integer integer : integers){
- if(integer.compareTo(driver.getId()) == 0){
- bo = true;
- break;
- }
- }
- if(bo){
- continue;
- }
- pushUtil.pushOrderState(2, driver.getId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), pushOrder.getPushTime());
+// boolean bo = false;
+// for(Integer integer : integers){
+// if(integer.compareTo(driver.getId()) == 0){
+// bo = true;
+// break;
+// }
+// }
+// if(bo){
+// continue;
+// }
+ pushUtil.pushOrderState(2, driver.getId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 10);
}
}
- Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
+ Thread.sleep(10 * 1000);//设置等待时间
Integer state = orderCrossCityMapper.selectById(orderCrossCity.getId()).getState();
if(state > 1){
break;
@@ -2566,10 +2594,8 @@
if(i == 3 && state == 1){
pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 1);
orderIds.remove(orderCrossCity.getId());
- OrderCrossCity orderCrossCity1 = orderCrossCityMapper.selectById(orderCrossCity.getId());
-// if(orderCrossCity1.getState() == 7 && orderCrossCity1.getPayMoney() == null){
- orderCrossCity1.setState(10);
- orderCrossCityMapper.updateById(orderCrossCity1);
+ orderCrossCity.setState(10);
+ orderCrossCityMapper.updateById(orderCrossCity);
OrderCancel orderCancel = new OrderCancel();
orderCancel.setOrderId(orderCrossCity.getId());
@@ -2581,7 +2607,19 @@
orderCancel.setUserType(2);
orderCancelService.insert(orderCancel);
//TODO：退款
-// }
+ UserInfo userInfo = userInfoService.selectById (orderCrossCity.getUserId());
+ userInfo.setBalance (new BigDecimal (userInfo.getBalance ())
+ .add (new BigDecimal (orderCrossCity.getOrderMoney())) // 余额增加订单金额
+ .setScale (2, BigDecimal.ROUND_HALF_EVEN)
+ .doubleValue ());
+ SysIntegral query1 = sysIntegralMapper.query (orderCrossCity.getCompanyId ());
+ if (query1 != null) {
+ int addIntegral = orderCrossCity.getOrderMoney().intValue () * query1.getIntegral (); // 原增加的积分
+ userInfo.setIntegral (userInfo.getIntegral () - addIntegral); // 扣除对应积分（确保积分不为负可加额外判断）
+ }
+ transactionDetailsService.saveData (orderCrossCity.getUserId(), "订单取消退款", orderCrossCity.getOrderMoney (), 1, 1, 1, 3, orderCrossCity.getId ());
+ userInfoService.updateById (userInfo);
+
}
}
} catch (Exception e) {
--
Gitblit v1.7.1