From 9d5309c820d525b46e65490475957b641707db51 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 15:57:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 235 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 182 insertions(+), 53 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 bb8f25a..7190d0f 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,13 @@
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;
import com.supersavedriving.driver.modular.system.util.weChat.WeChatUtil;
@@ -41,10 +43,16 @@
import org.springframework.web.context.request.ServletRequestAttributes;
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;
/**
* 司机
@@ -107,6 +115,9 @@
@Autowired
private WeChatUtil weChatUtil;
+ @Autowired
+ private IDriverOnlineTimeService driverOnlineTimeService;
+
@Value("${callbackPath}")
private String callbackPath;
@@ -149,7 +160,7 @@
//新账号
if(null == driver){
driver = new Driver();
- driver.setCode(UUIDUtil.getNumberRandom(16));
+ driver.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
try {
driver = setDriverParamete(driver, driverRegisterWarpper);
}catch (Exception e){
@@ -157,6 +168,10 @@
}
driver.setCreateTime(new Date());
this.insert(driver);
+ String s = wechatMiniProgramORCode(driver.getId());
+ driver.setReferralCode(s);
+ this.updateById(driver);
+
//司机邀请注册奖励
if(null != driver.getInviterId()){
@@ -166,7 +181,7 @@
Integer num7 = JSON.parseObject(systemConfig.getContent()).getInteger("num7");
if(num7 > 0){
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(2);
@@ -185,6 +200,16 @@
}
+
+ //生成小程序二维码
+ public String wechatMiniProgramORCode(Integer driverId) throws Exception{
+ InputStream release = weChatUtil.getwxacodeunlimit("pages/index/index", "driverId=" + driverId, "release");
+ String s = OBSUtil.putObjectToBucket(release, "driver_" + driverId + "_" + UUIDUtil.getNumberRandom(5) + ".jpg");
+ return s;
+ }
+
+
+
/**
* 组装个人信息
* @param driver
@@ -193,6 +218,7 @@
*/
public Driver setDriverParamete(Driver driver, DriverRegisterWarpper driverRegisterWarpper) throws Exception{
driver.setAvatar(driverRegisterWarpper.getAvatar());
+ driver.setName(driverRegisterWarpper.getName());
driver.setPhone(driverRegisterWarpper.getPhone());
driver.setEmergencyContact(driverRegisterWarpper.getEmergencyContact());
driver.setEmergencyPhone(driverRegisterWarpper.getEmergencyPhone());
@@ -230,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;
}
@@ -285,6 +314,11 @@
}
}
+ if(ToolUtil.isEmpty(driver.getReferralCode())){
+ String s = wechatMiniProgramORCode(driver.getId());
+ driver.setReferralCode(s);
+ this.updateById(driver);
+ }
return ResultUtil.success(tokenWarpper);
}
@@ -371,8 +405,8 @@
if(token.length() > 16){
key = token.substring(token.length() - 16);
}
- redisUtil.setStrValue(key, driver.getId().toString(), 7 * 24 * 60 * 60);//7天
- redisUtil.setStrValue("DRIVER_" + phone, key, 7 * 24 * 60 * 60);//7天
+ redisUtil.setStrValue(key, driver.getId().toString(), 94608000);//7天
+ redisUtil.setStrValue("DRIVER_" + phone, key, 94608000);//7天
//下线
for (int i = 0; i < 5; i++) {
@@ -449,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("请先上班");
@@ -463,27 +498,50 @@
//找到中心点
GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(lon), Double.valueOf(lat));
//构造半径
- Distance distanceR = new Distance(5D, Metrics.KILOMETERS);
+ Distance distanceR = new Distance(10D, Metrics.KILOMETERS);
//画圆
Circle circle = new Circle(geoJsonPoint, distanceR);
// 构造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());
+ 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;
+ }
}
- if(driver.getId().compareTo(uid) == 0){
- continue;
+ 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());
}
- list.add(value1 + "," + driver.getServerStatus());
- }
+ });
}
- 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);
}
+
/**
@@ -535,13 +593,19 @@
@Override
public PromotionWarpper queryPromotionQRCode(Integer uid) throws Exception {
PromotionWarpper promotionWarpper = new PromotionWarpper();
- promotionWarpper.setUrl("https://chaoshengdaijia.com/share/driverShare/index.html?inviterId=" + uid);
+ Driver driver1 = this.selectById(uid);
+ if(ToolUtil.isEmpty(driver1.getReferralCode())){
+ String s = wechatMiniProgramORCode(driver1.getId());
+ driver1.setReferralCode(s);
+ this.updateById(driver1);
+ }
+// 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 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);
promotionWarpper.setDriver(driver);
- Driver driver1 = this.selectById(uid);
promotionWarpper.setAvatar(driver1.getAvatar());
promotionWarpper.setName(driver1.getName());
return promotionWarpper;
@@ -553,20 +617,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;
@@ -580,11 +630,39 @@
long end = sdf.parse(sdf1.format(new Date()) + " " + num2 + ":00").getTime();
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("_");
+ if(!today.equals(s[1])){
+ //修改在线时长记录
+ DriverOnlineTime driverOnlineTime = driverOnlineTimeService.selectOne(new EntityWrapper<DriverOnlineTime>().eq("driverId", driverId).eq("DATE_FORMAT(`day`, '%Y-%m-%d')", s[1]));
+ if(null != driverOnlineTime){
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.updateById(driverOnlineTime);
+ }else{
+ driverOnlineTime = new DriverOnlineTime();
+ driverOnlineTime.setDriverId(driverId);
+ driverOnlineTime.setDay(sdf1.parse(s[1]));
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.insert(driverOnlineTime);
+ }
+ driver.setOnlineTime(new BigInteger(s[0]));
+ this.updateById(driver);
+ 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]);
+
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(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driverId);
accountChangeDetail.setType(2);
@@ -593,11 +671,26 @@
accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
accountChangeDetail.setExplain("在线时长奖励");
accountChangeDetailService.saveData(accountChangeDetail);
+ driver.setOnlineTime(new BigInteger(s[0]));
this.updateById(driver);
time++;
+
+ //修改在线时长记录
+ DriverOnlineTime driverOnlineTime = driverOnlineTimeService.selectOne(new EntityWrapper<DriverOnlineTime>().eq("driverId", driverId).eq("DATE_FORMAT(`day`, '%Y-%m-%d')", s[1]));
+ if(null != driverOnlineTime){
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.updateById(driverOnlineTime);
+ }else{
+ driverOnlineTime = new DriverOnlineTime();
+ driverOnlineTime.setDriverId(driverId);
+ driverOnlineTime.setDay(sdf1.parse(s[1]));
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.insert(driverOnlineTime);
+ }
}
+ redisUtil.setStrValue("ONLINE" + driverId, second + "_" + s[1] + "_" + time);
}
- redisUtil.setStrValue("ONLINE" + driverId, second + "_" + s[1] + "_" + time);
+
}
@@ -613,8 +706,8 @@
DriverInfoWarpper driverInfo = new DriverInfoWarpper();
BeanUtils.copyProperties(driver, driverInfo);
driverInfo.setWithdrawBalance(driver.getBalance());
- driverInfo.setBalance(driver.getBalance() + driver.getBackgroundBalance());//司机充值+平台充值
- driverInfo.setCommission(driver.getCommission() + driver.getCouponBalance());//司机订单收入+司机佣金收入+司机优惠券收入+司机折扣收入
+ driverInfo.setBalance(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());//司机充值+平台充值
+ driverInfo.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(driver.getCouponBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());//司机订单收入+司机佣金收入+司机优惠券收入+司机折扣收入
YouTuiDriver youTuiDriver = youTuiDriverService.selectOne(new EntityWrapper<YouTuiDriver>().eq("driverId", uid)
.eq("state", 2).last(" and failureTime > now() order by failureTime limit 0, 1"));
if(null != youTuiDriver){
@@ -693,7 +786,7 @@
List<AccountChangeDetail> list = new ArrayList<>();
for (Driver driver : drivers) {
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver.getId());
accountChangeDetail.setCreateTime(new Date());
@@ -717,7 +810,7 @@
Driver driver = this.selectById(uid);
//调起微信
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String out_trade_no = sdf.format(new Date()) + UUIDUtil.getNumberRandom(3);
+ String out_trade_no = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
RechargeRecord rechargeRecord = new RechargeRecord();
rechargeRecord.setType(2);
rechargeRecord.setUserId(uid);
@@ -731,7 +824,7 @@
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(Double.valueOf(amount * 100).intValue()));
+ paymentOrder.setAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
paymentOrder.setOrderName("账户充值");
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
@@ -792,14 +885,14 @@
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setChangeType(3);
accountChangeDetail.setType(1);
accountChangeDetail.setCreateTime(new Date());
accountChangeDetail.setExplain("账户充值");
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance());
- driver1.setBalance(driver1.getBalance() + rechargeRecord1.getAmount());
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getBalance()).add(new BigDecimal(driver1.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver1.setBalance(new BigDecimal(driver1.getBalance()).add(new BigDecimal(rechargeRecord1.getAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getBalance()).add(new BigDecimal(driver1.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
DriverServiceImpl.this.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
@@ -865,14 +958,14 @@
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(rechargeRecord1.getUserId());
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setChangeType(3);
accountChangeDetail.setType(1);
accountChangeDetail.setCreateTime(new Date());
accountChangeDetail.setExplain("账户充值");
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance());
- driver1.setBalance(driver1.getBalance() + rechargeRecord1.getAmount());
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getBalance()).add(new BigDecimal(driver1.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver1.setBalance(new BigDecimal(driver1.getBalance()).add(new BigDecimal(rechargeRecord1.getAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getBalance()).add(new BigDecimal(driver1.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
this.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
@@ -971,7 +1064,7 @@
public ResultUtil microenterprise(Integer uid, String name, String number, String phone, String notifyUrl) throws Exception {
Driver driver = this.selectById(uid);
Register registerVO = new Register();
- registerVO.setMerUserId("driver_" + uid);
+ registerVO.setMerUserId(driver.getCode());//"driver_" + uid
registerVO.setPhone(phone);
registerVO.setUserType("0");
registerVO.setUserName(name);
@@ -1003,4 +1096,40 @@
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);
+ int userNum = appUserService.selectCount(wrapperOne);
+
+
+ map.put("userNum",userNum);
+
+
+ return ResultUtil.success(map);
+ }
}
--
Gitblit v1.7.1