From 34eb869e7350173ff036881fc776bc27d5be6d7a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 30 八月 2023 09:48:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 180 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 146 insertions(+), 34 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index d8e0521..e228dc8 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -1,5 +1,6 @@
package com.supersavedriving.driver.modular.system.service.impl;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -9,12 +10,12 @@
import com.supersavedriving.driver.core.shiro.ShiroUser;
import com.supersavedriving.driver.core.util.JwtTokenUtil;
import com.supersavedriving.driver.core.util.ToolUtil;
+import com.supersavedriving.driver.modular.system.dao.DriverMapper;
import com.supersavedriving.driver.modular.system.model.*;
import com.supersavedriving.driver.modular.system.service.*;
-import com.supersavedriving.driver.modular.system.dao.DriverMapper;
-import com.supersavedriving.driver.modular.system.util.*;
import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
+import com.supersavedriving.driver.modular.system.util.*;
import com.supersavedriving.driver.modular.system.util.huawei.OBSUtil;
import com.supersavedriving.driver.modular.system.util.mongodb.model.Location;
import com.supersavedriving.driver.modular.system.util.rongyun.RongYunUtil;
@@ -44,11 +45,14 @@
import javax.servlet.http.HttpServletRequest;
import java.io.InputStream;
import java.math.BigDecimal;
+import java.math.BigInteger;
import java.math.RoundingMode;
import java.net.InetAddress;
import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
import java.util.*;
-import java.util.stream.Collectors;
/**
* 司机
@@ -110,6 +114,9 @@
@Autowired
private WeChatUtil weChatUtil;
+
+ @Autowired
+ private IDriverOnlineTimeService driverOnlineTimeService;
@Value("${callbackPath}")
private String callbackPath;
@@ -197,7 +204,7 @@
//生成小程序二维码
public String wechatMiniProgramORCode(Integer driverId) throws Exception{
InputStream release = weChatUtil.getwxacodeunlimit("pages/index/index", "driverId=" + driverId, "release");
- String s = OBSUtil.putObjectToBucket(release, "driver_" + driverId + ".jpg");
+ String s = OBSUtil.putObjectToBucket(release, "driver_" + driverId + "_" + UUIDUtil.getNumberRandom(5) + ".jpg");
return s;
}
@@ -249,6 +256,9 @@
driver.setApprovalUserId(null);
driver.setStatus(1);
driver.setSource(driverRegisterWarpper.getSource());
+ driver.setName(driverRegisterWarpper.getName());
+ driver.setIdcard(driverRegisterWarpper.getIdcard());
+ driver.setCarAge(driverRegisterWarpper.getCarAge());
return driver;
}
@@ -473,7 +483,8 @@
@Override
- public ResultUtil<List<String>> queryDriverPosition(Integer uid) throws Exception {
+ public ResultUtil< HashMap<String, Object> > queryDriverPosition(Integer uid) throws Exception {
+ HashMap<String, Object> map = new HashMap<>();
DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", uid).eq("status", 1));
if(null == driverWork){
return ResultUtil.error("请先上班");
@@ -493,21 +504,47 @@
// 构造query对象
Query query = Query.query(Criteria.where("location").withinSphere(circle));
List<Location> locations = mongoTemplate.find(query, Location.class);
- List<Integer> collect = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
- List<Driver> drivers = this.selectBatchIds(collect);
- for (Driver driver : drivers) {
- String value1 = redisUtil.getValue("DRIVER" + driver.getId());
- if(ToolUtil.isEmpty(value1)){
- continue;
+ locations.forEach(s -> {
+ int i=0;
+ Driver driver = this.baseMapper.selectById(s.getDriverId());
+ if(null == driver){
+ return;
}
- if(driver.getId().compareTo(uid) == 0){
- continue;
+ i = driver.getServerStatus();
+ if(driver.getServerStatus()==2){
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("driverId", s.getDriverId()).eq("state", 102));
+ if(orders.size()>0){
+ i = 3;
+ }
}
- list.add(value1 + "," + driver.getServerStatus());
- }
+ String value1 = redisUtil.getValue("DRIVER" + s.getDriverId());
+ if(s.getDriverId().compareTo(uid) != 0 && ToolUtil.isNotEmpty(value1)){
+ list.add(s.getLocation().getX() + "," + s.getLocation().getY()+","+i+","+driver.getName());
+ }
+ });
}
- return ResultUtil.success(list);
+
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("hallOrder",1).eq("state",101));
+
+ map.put("driver",list);
+ ArrayList<String> blue = new ArrayList<>();
+ orders.forEach(e-> blue.add(e.getStartLng()+","+e.getStartLat()));
+
+ map.put("orderList",blue);
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(System.currentTimeMillis());
+ calendar.add(Calendar.HOUR_OF_DAY, -2);
+ Date time = calendar.getTime();
+ List<Order> ordersOne = orderService.selectList(new EntityWrapper<Order>().eq("state",301).between("createTime",time,new Date()));
+
+ ArrayList<String> red = new ArrayList<>();
+ ordersOne.forEach(e-> red.add(e.getStartLng()+","+e.getStartLat()));
+
+ map.put("cancelOrder",red);
+ return ResultUtil.success(map);
}
+
/**
@@ -567,7 +604,14 @@
}
// promotionWarpper.setUrl("https://chaoshengdaijia.com/share/driverShare/index.html?inviterId=" + uid);
promotionWarpper.setUrl(driver1.getReferralCode());
- int user = appUserService.selectCount(new EntityWrapper<AppUser>().eq("inviterType", 2).eq("inviterId", uid).eq("status", 1));
+ int user =0;
+ List<AppUser> appUsers = appUserService.selectList(new EntityWrapper<AppUser>().eq("inviterType", 2).eq("inviterId", uid).eq("status", 1));
+ for (AppUser appUser : appUsers) {
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("state", 109));
+ if(orders.size()>0){
+ user++;
+ }
+ }
int driver = this.selectCount(new EntityWrapper<Driver>().eq("inviterType", 2).eq("inviterId", uid).eq("approvalStatus", 2).eq("status", 1));
promotionWarpper.setTotal(user + driver);
promotionWarpper.setUser(user);
@@ -583,20 +627,6 @@
*/
public void addDurationCredits(Integer driverId) throws Exception {
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
- String value = redisUtil.getValue("ONLINE" + driverId);
- if(ToolUtil.isEmpty(value)){
- redisUtil.setStrValue("ONLINE" + driverId, "0_" + sdf1.format(new Date()) + "_0", 25 * 60 * 60);
- return;
- }
- String today = sdf1.format(new Date());
- String[] s = value.split("_");
- if(!today.equals(s[1])){
- redisUtil.setStrValue("ONLINE" + driverId, "0_" + sdf1.format(new Date()) + "_0", 25 * 60 * 60);
- return;
- }
- Integer second = Integer.valueOf(s[0]) + 5;
- Integer time = Integer.valueOf(s[2]);
-
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
if(null == systemConfig){
return;
@@ -607,12 +637,49 @@
Integer num3 = jsonObject.getInteger("num3");//每小时增加积分
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
long start = sdf.parse(sdf1.format(new Date()) + " " + num1 + ":00").getTime();
- long end = sdf.parse(sdf1.format(new Date()) + " " + num2 + ":00").getTime();
+ Date e = sdf.parse(sdf1.format(new Date()) + " " + num2 + ":00");
+ long end = e.getTime();
+ if(start > end){
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(e);
+ calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + 1);
+ end = calendar.getTimeInMillis();
+ }
+
long l = System.currentTimeMillis();
if(start <= l && end > l){
+ Driver driver = this.selectById(driverId);
+ String value = redisUtil.getValue("ONLINE" + driverId);
+ if(ToolUtil.isEmpty(value)){
+ redisUtil.setStrValue("ONLINE" + driverId, "0_" + sdf1.format(new Date()) + "_0", 25 * 60 * 60);
+ return;
+ }
+ String today = sdf1.format(new Date());
+ String[] s = value.split("_");
+
+ //修改在线时长记录
+ DriverOnlineTime driverOnlineTime = driverOnlineTimeService.selectOne(new EntityWrapper<DriverOnlineTime>().eq("driverId", driverId).last(" and DATE_FORMAT(`day`, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')"));
+ if(null != driverOnlineTime){
+ driverOnlineTime.setOnlineTime(driverOnlineTime.getOnlineTime().add(new BigInteger("5")));
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.updateById(driverOnlineTime);
+ }else{
+ driverOnlineTime = new DriverOnlineTime();
+ driverOnlineTime.setDriverId(driverId);
+ driverOnlineTime.setDay(new Date());
+ driverOnlineTime.setOnlineTime(new BigInteger("0"));
+ driverOnlineTimeService.insert(driverOnlineTime);
+ redisUtil.setStrValue("ONLINE" + driverId, "0_" + sdf1.format(new Date()) + "_0", 25 * 60 * 60);
+ return;
+ }
+ driver.setOnlineTime(driver.getOnlineTime().add(new BigInteger("5")));
+ this.updateById(driver);
+
+ Integer second = Integer.valueOf(s[0]) + 5;
+ Integer time = Integer.valueOf(s[2]);
+
int h = Double.valueOf(second / 3600).intValue();
if(h > 0 && h > time){
- Driver driver = this.selectById(driverId);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
@@ -623,11 +690,13 @@
accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
accountChangeDetail.setExplain("在线时长奖励");
accountChangeDetailService.saveData(accountChangeDetail);
+ driver.setOnlineTime(new BigInteger(s[0]));
this.updateById(driver);
time++;
}
+ redisUtil.setStrValue("ONLINE" + driverId, second + "_" + s[1] + "_" + time);
}
- redisUtil.setStrValue("ONLINE" + driverId, second + "_" + s[1] + "_" + time);
+
}
@@ -1033,4 +1102,47 @@
this.updateById(driver);
return ResultUtil.success();
}
+
+ @Override
+ public ResultUtil<HashMap<String, Object>> queryDriverOrderNum(String time,Integer uid) {
+ String sTime = null;
+ String eTime =null;
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ EntityWrapper<AppUser> wrapperOne = new EntityWrapper<>();
+ if(ToolUtil.isNotEmpty(time)){
+ sTime = time.split(" - ")[0]+" 00:00:00";
+ eTime = time.split(" - ")[1]+" 23:59:59";
+ wrapper.between("orderTakingTime",sTime,eTime);
+ wrapperOne.between("createTime",sTime,eTime);
+ }
+ ArrayList<Integer> objects = new ArrayList<>();
+ objects.add(101);
+ objects.add(201);
+ objects.add(301);
+ objects.add(401);
+ wrapper.eq("driverId",uid);
+ wrapper.notIn("state",objects);
+ HashMap<String, Object> map = new HashMap<>();
+ int orderNum = orderService.selectCount(wrapper);
+ map.put("orderNum",orderNum);
+ // 有效时长
+ Integer okTime = this.baseMapper.getTime(sTime,eTime,uid);
+ map.put("okTime",okTime==null?0:okTime);
+ wrapperOne.eq("inviterType",2);
+ wrapperOne.eq("inviterId",uid);
+ List<AppUser> appUsers = appUserService.selectList(wrapperOne);
+ int userNum=0;
+ for (AppUser appUser : appUsers) {
+ List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("state", 109));
+ if(orders.size()>0){
+ userNum++;
+ }
+ }
+
+
+ map.put("userNum",userNum);
+
+
+ return ResultUtil.success(map);
+ }
}
--
Gitblit v1.7.1