From ed79668a9a0d49f0f532c6e603a821eb508085bf Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 三月 2023 09:20:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 210 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 198 insertions(+), 12 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index 7838115..646f3a3 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -91,6 +91,9 @@
@Autowired
private IAccountChangeDetailService accountChangeDetailService;
+ @Autowired
+ private IRevenueService revenueService;
+
private Map<String, Timer> timerMap = new HashMap<>();
@@ -173,7 +176,6 @@
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
order = getOrderPrice(1, d, 0, order, city);
- order.setHallOrder(0);
order.setState(null == order.getDriverId() ? 101 : 102);
order.setStatus(1);
order.setCreateTime(new Date());
@@ -184,7 +186,7 @@
pushUtil.pushOrderStatus(uid, 2, order.getId(), order.getStatus());
}else{
//开始推单
-// pushOrder(order);
+ pushOrder(order);
}
return ResultUtil.success();
}
@@ -393,7 +395,7 @@
//1
//找到中心点
- GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLat), Double.valueOf(startLng));
+ GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
Double num = num3 / 1000;//范围公里
//构造半径
Distance distanceR = new Distance(num, Metrics.KILOMETERS);
@@ -404,8 +406,10 @@
List<Location> locations = mongoTemplate.find(query, Location.class);
List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
Integer driver = null;
+ YouTuiDriver youTuiDriver1 = null;
if(driverIds.size() > 0){
- List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds).last(" and now() < failureTime"));
+ List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
+ .eq("state", 2).last(" and (surplusQuantity > 0 or now() < endTime) and now() < failureTime"));
Double d = null;
for (YouTuiDriver youTuiDriver : youTuiDrivers) {
String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
@@ -417,10 +421,15 @@
if(d == null || d.compareTo(wgs84) > 0){
d = wgs84;
driver = youTuiDriver.getDriverId();
+ youTuiDriver1 = youTuiDriver;
}
}
}
+ if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
+ youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
+ youTuiDriverService.updateById(youTuiDriver1);
+ }
//开始范围查找
if(null == driver){
@@ -510,9 +519,12 @@
pageNum = (pageNum - 1) * pageSize;
List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
hallOrderLists.forEach(hallOrderList -> {
- Map<String, Double> distance = GeodesyUtil.getDistance(hallOrderList.getStartLng() + "," + hallOrderList.getStartLat(), hallOrderList.getEndLng() + "," + hallOrderList.getEndLat());
- Double wgs84 = distance.get("WGS84");
- hallOrderList.setCurrentDistance(wgs84);
+ hallOrderList.setCurrentDistance(0D);
+ if(ToolUtil.isNotEmpty(hallOrderList.getEndLng())){
+ Map<String, Double> distance = GeodesyUtil.getDistance(hallOrderList.getStartLng() + "," + hallOrderList.getStartLat(), hallOrderList.getEndLng() + "," + hallOrderList.getEndLat());
+ Double wgs84 = distance.get("WGS84");
+ hallOrderList.setCurrentDistance(wgs84);
+ }
});
return hallOrderLists;
}
@@ -550,6 +562,7 @@
Integer num10 = JSON.parseObject(systemConfig.getContent()).getInteger("num10");
if (num10 > 0) {
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setType(2);
@@ -674,10 +687,18 @@
@Override
public OrderInfoWarpper queryOrderInfo(Integer uid, Long orderId) throws Exception {
OrderInfoWarpper orderInfoWarpper = this.baseMapper.queryOrderInfo(orderId);
+ AppUser appUser = appUserService.selectById(uid);
+ orderInfoWarpper.setBalance(appUser.getAccountBalance());
+ orderInfoWarpper.setCurrentDistance(0D);
String value = redisUtil.getValue("DRIVER" + uid);
- Map<String, Double> distance = GeodesyUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value);
- Double wgs84 = distance.get("WGS84");
- orderInfoWarpper.setCurrentDistance(wgs84);
+ orderInfoWarpper.setPickUpTime(0);
+ if(ToolUtil.isNotEmpty(value)){
+ Map<String, Double> distance = GeodesyUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value);
+ Double wgs84 = distance.get("WGS84");
+ orderInfoWarpper.setCurrentDistance(null == wgs84 ? 0d : wgs84);
+ Map<String, String> distance1 = MapUtil.getDistance(orderInfoWarpper.getStartLng() + "," + orderInfoWarpper.getStartLat(), value, 0);
+ orderInfoWarpper.setPickUpTime(Integer.valueOf(distance1.get("duration")) / 60);
+ }
return orderInfoWarpper;
}
@@ -777,6 +798,7 @@
Integer num5 = JSON.parseObject(systemConfig.getContent()).getInteger("num5");
if(num5 > 0){
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setType(2);
@@ -790,6 +812,7 @@
Integer num8 = JSON.parseObject(systemConfig.getContent()).getInteger("num8");
if(num8 > 0){
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setType(2);
@@ -818,6 +841,7 @@
}
Driver driver1 = driverService.selectById(appUser.getInviterId());
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(2);
@@ -864,8 +888,11 @@
pushOrderInfoWarpper.setWaitTime(order.getWaitTime());
pushOrderInfoWarpper.setState(order.getState());
pushOrderInfoWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
- int travelTime = Double.valueOf((System.currentTimeMillis() - order.getStartTime().getTime()) / 60000).intValue();
- pushOrderInfoWarpper.setTravelTime(travelTime);
+ pushOrderInfoWarpper.setTravelTime(0);
+ if(null != order.getStartTime()){
+ int travelTime = Double.valueOf((System.currentTimeMillis() - order.getStartTime().getTime()) / 60000).intValue();
+ pushOrderInfoWarpper.setTravelTime(travelTime);
+ }
pushUtil.pushOrderInfo(uid, 2, pushOrderInfoWarpper);
}
},0, 5000);
@@ -1062,4 +1089,163 @@
public void saveRevenue(Order order){
}
+
+ /**
+ * 获取司机的订单列表
+ * @param driverId
+ * @param state
+ * @param pageNum
+ * @param pageSize
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<DriverOrderListWarpper> queryDriverOrderList(Integer driverId, Integer state, Integer pageNum, Integer pageSize) throws Exception {
+ pageNum = (pageNum - 1) * pageSize;
+ return this.baseMapper.queryDriverOrderList(driverId, state, pageNum, pageSize);
+ }
+
+ /**
+ * 司机邀请列表
+ * @param driverId
+ * @param time
+ * @param pageNum
+ * @param pageSize
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<InviteListWarpper> queryInviteList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception {
+ pageNum = (pageNum - 1) * pageSize;
+ return this.baseMapper.queryInviteList(driverId, time, pageNum, pageSize);
+ }
+
+
+ /**
+ * 获取业绩汇总数据
+ * @param driverId
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public PerformanceSummaryWarpper queryPerformanceSummary(Integer driverId, Integer type, String time, Integer dayType) throws Exception {
+ Driver driver = driverService.selectById(driverId);
+ PerformanceSummaryWarpper performanceSummaryWarpper = new PerformanceSummaryWarpper();
+ BeanUtils.copyProperties(driver, performanceSummaryWarpper);
+ Double amount = revenueService.queryTotalAmount(driverId);
+ performanceSummaryWarpper.setGrossIncome(amount);
+ List<Integer> state = Arrays.asList(107, 108, 109);
+ int count = this.selectCount(new EntityWrapper<Order>().eq("driverId", driverId).in("state", state).eq("status", 1));
+ performanceSummaryWarpper.setTotalOrder(count);
+ List<PerformanceRankingWarpper> list = new ArrayList<>();
+ int position = 0;
+ Double d = 0D;
+ List<PerformanceRankingWarpper> performanceRankingWarppers = null;
+ if(type == 1){//订单量
+ performanceRankingWarppers = this.baseMapper.queryDriverRank(time, dayType);
+ }
+ if(type == 2){//佣金
+ performanceRankingWarppers = revenueService.queryDriverRank(2, time, dayType);
+ }
+ if(type == 3){//收入
+ performanceRankingWarppers = revenueService.queryDriverRank(null, time, dayType);
+ }
+ for (int i = 0; i < performanceRankingWarppers.size(); i++) {
+ PerformanceRankingWarpper performanceRankingWarpper = performanceRankingWarppers.get(i);
+ Double amountOfData = performanceRankingWarpper.getAmountOfData();
+ if(amountOfData.compareTo(d) != 0){
+ position++;
+ d = amountOfData;
+ }
+ if(position <= 10){
+ list.add(performanceRankingWarpper);
+ }
+ if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
+ break;
+ }
+ }
+ performanceSummaryWarpper.setPosition(position);
+ performanceSummaryWarpper.setList(list);
+ return performanceSummaryWarpper;
+ }
+
+
+ /**
+ * 获取我的业绩
+ * @param driverId
+ * @param time
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public List<MyAchievementWarpper> queryMyAchievement(Integer driverId, String time) throws Exception {
+ List<MyAchievementWarpper> list = new ArrayList<>();
+ time = time.replaceAll("-", "年") + "月";
+ //订单量
+ List<PerformanceRankingWarpper> performanceRankingWarppers = performanceRankingWarppers = this.baseMapper.queryDriverRank(time, 2);
+ int position = 0;
+ Double d = 0D;
+ for (int i = 0; i < performanceRankingWarppers.size(); i++) {
+ PerformanceRankingWarpper performanceRankingWarpper = performanceRankingWarppers.get(i);
+ Double amountOfData = performanceRankingWarpper.getAmountOfData();
+ if(amountOfData.compareTo(d) != 0){
+ position++;
+ d = amountOfData;
+ }
+ if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
+ break;
+ }
+ }
+ MyAchievementWarpper myAchievementWarpper = new MyAchievementWarpper();
+ myAchievementWarpper.setType("订单");
+ myAchievementWarpper.setTime(time);
+ myAchievementWarpper.setRank(position);
+ myAchievementWarpper.setAmountOfData(d);
+ list.add(myAchievementWarpper);
+
+ //收入
+ performanceRankingWarppers = revenueService.queryDriverRank(null, time, 2);
+ position = 0;
+ d = 0D;
+ for (int i = 0; i < performanceRankingWarppers.size(); i++) {
+ PerformanceRankingWarpper performanceRankingWarpper = performanceRankingWarppers.get(i);
+ Double amountOfData = performanceRankingWarpper.getAmountOfData();
+ if(amountOfData.compareTo(d) != 0){
+ position++;
+ d = amountOfData;
+ }
+ if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
+ break;
+ }
+ }
+ myAchievementWarpper = new MyAchievementWarpper();
+ myAchievementWarpper.setType("收入");
+ myAchievementWarpper.setTime(time);
+ myAchievementWarpper.setRank(position);
+ myAchievementWarpper.setAmountOfData(d);
+ list.add(myAchievementWarpper);
+
+ //佣金
+ performanceRankingWarppers = revenueService.queryDriverRank(2, time, 2);
+ position = 0;
+ d = 0D;
+ for (int i = 0; i < performanceRankingWarppers.size(); i++) {
+ PerformanceRankingWarpper performanceRankingWarpper = performanceRankingWarppers.get(i);
+ Double amountOfData = performanceRankingWarpper.getAmountOfData();
+ if(amountOfData.compareTo(d) != 0){
+ position++;
+ d = amountOfData;
+ }
+ if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
+ break;
+ }
+ }
+ myAchievementWarpper = new MyAchievementWarpper();
+ myAchievementWarpper.setType("佣金");
+ myAchievementWarpper.setTime(time);
+ myAchievementWarpper.setRank(position);
+ myAchievementWarpper.setAmountOfData(d);
+ list.add(myAchievementWarpper);
+ return list;
+ }
}
--
Gitblit v1.7.1