From e28d33c09405e246a2d75fcb1f69a9e8e9d911b8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 29 九月 2022 09:07:31 +0800
Subject: [PATCH] 更新最新代码
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
index 696c812..0ac6f4f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -9,7 +9,10 @@
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.util.JwtTokenUtil;
import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
+import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
+import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -124,6 +127,9 @@
@Autowired
private ICityService cityService;
+
+ @Autowired
+ private IOrderPrivateCarService orderPrivateCarService;
@Autowired
private IOrderLogisticsService orderLogisticsService;
@@ -361,6 +367,7 @@
driver.setName(registeredWarpper.getName());
driver.setSex(registeredWarpper.getSex());
driver.setIdCard(registeredWarpper.getIdCard());
+ driver.setBirthday(registeredWarpper.getBirthday());
City city1 = cityService.selectById(registeredWarpper.getPlaceOfPracticeId());
String[] city = new String[]{city1.getEnglishName()};
@@ -545,6 +552,22 @@
Map<String, Object> map = driverMapper.queryHomeData(uid);
int size = this.queryMyActivity(uid, new Date()).size();
map.put("activity", size);
+ //获取司机待支付的现金支付订单推送司机支付
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ List<OrderPrivateCar> orderPrivateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().eq("driverId", uid).eq("payType", 4)
+ .eq("driverPay", 1).eq("isDelete", 1));
+ for (OrderPrivateCar orderPrivateCar : orderPrivateCars) {
+ pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
+ }
+ List<OrderLogistics> orderLogistics = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().eq("driverId", uid).eq("payType", 4)
+ .eq("isDelete", 1).eq("driverPay", 1));
+ for (OrderLogistics orderLogistic : orderLogistics) {
+ pushUtil.pushOfflinePayment(2, orderLogistic.getDriverId(), orderLogistic.getId(), orderLogistic.getType());
+ }
+ }
+ }).start();
return map;
}
--
Gitblit v1.7.1