From b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 二月 2023 10:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 320 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 290 insertions(+), 30 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index a47b5e0..a3d2fd9 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -1,64 +1,324 @@
package com.stylefeng.guns.modular.system.service.impl;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.stylefeng.guns.modular.system.model.TDriver;
-import com.stylefeng.guns.modular.system.dao.TDriverMapper;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.modular.system.controller.resp.TDriverResp;
+import com.stylefeng.guns.modular.system.controller.util.HttpUtils;
+import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
+import com.stylefeng.guns.modular.system.dao.*;
+import com.stylefeng.guns.modular.system.enums.OrderStateEnum;
+import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITDriverService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.modular.system.service.ITRegionService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.ui.Model;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import java.io.File;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.ZoneId;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
/**
* <p>
- * 司机表 服务实现类
+ * 司机基础信息 服务实现类
* </p>
*
- * @author 吕雪
- * @since 2020-06-04
+ * @author stylefeng
+ * @since 2023-02-20
*/
@Service
public class TDriverServiceImpl extends ServiceImpl<TDriverMapper, TDriver> implements ITDriverService {
+
+ @Autowired
+ private TAgentMapper tAgentMapper;
+ @Autowired
+ private TBranchOfficeMapper tBranchOfficeMapper;
+ @Autowired
+ private TOrderMapper tOrderMapper;
+ @Autowired
+ private TDriverMapper tDriverMapper;
+ @Autowired
+ private TAppUserMapper tAppUserMapper;
+ @Autowired
+ private TOrderRefusalMapper tOrderRefusalMapper;
+ @Autowired
+ private TRegionMapper tRegionMapper;
+ @Autowired
+ private ITRegionService itRegionService;
+ @Autowired
+ private HttpUtils httpUtils;
+
@Override
- public List<Map<String, Object>> getAuthDriverList(Page<Map<String, Object>> page, String beginTime, String endTime, String companyName, String phone, String account, Integer addType, Integer authState) {
- return this.baseMapper.getAuthDriverList(page, beginTime, endTime, companyName, phone, account, addType, authState);
+ public EntityWrapper<TDriver> getPageList(String createTime, String phone, Integer status) {
+ EntityWrapper<TDriver> wrapper = new EntityWrapper<>();
+ // 手机号
+ if(StringUtils.hasLength(phone)){
+ wrapper.like("phone",phone);
+ }
+ // 状态
+ if(Objects.nonNull(status)){
+ wrapper.eq("status",status);
+ }
+ // 开始，结束时间
+ if(StringUtils.hasLength(createTime)){
+ String[] split = createTime.split(" - ");
+ Date startTime = DateUtil.getDate_str4(split[0]);
+ Date endTime = DateUtil.getDate_str4(split[1]);
+ wrapper.between("createTime",startTime,endTime);
+ }
+ wrapper.orderBy(true,"approvalStatus");
+ return wrapper;
}
@Override
- public Map<String, Object> getDriverById(Integer driverId) {
- return this.baseMapper.getDriverById(driverId);
+ public List<TDriverResp> getTDriverResp(List<TDriver> tDrivers) {
+ List<TDriverResp> tDriverRespList = new ArrayList<>(tDrivers.size());
+
+ List<TOrder> tOrders = tOrderMapper.selectList(new EntityWrapper<TOrder>());
+
+ String monthDate = new SimpleDateFormat("yyyyMM").format(new Date());
+
+ for (TDriver tDriver : tDrivers) {
+ TDriverResp tDriverResp = new TDriverResp();
+ BeanUtils.copyProperties(tDriver,tDriverResp);
+
+ // 设置余额
+ tDriverResp.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));
+
+ // 所属代理商
+ TAgent tAgent = tAgentMapper.selectById(tDriver.getAgentId());
+ if(Objects.nonNull(tAgent)){
+ tDriverResp.setAgentName(tAgent.getPrincipal());
+ }
+ //所属分公司
+ TBranchOffice tBranchOffice = tBranchOfficeMapper.selectById(tDriver.getBranchOfficeId());
+ if(Objects.nonNull(tBranchOffice)){
+ tDriverResp.setBranchName(tBranchOffice.getPrincipal());
+ }
+ //累计订单量
+ List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
+ && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())).collect(Collectors.toList());
+ tDriverResp.setCumulativeOrderCount(cumulativeOrderCount.size());
+ //当月订单量
+ List<TOrder> monthOrderCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
+ && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())
+ && new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());
+ tDriverResp.setMonthOrderCount(monthOrderCount.size());
+ // 拒单次数
+ List<TOrderRefusal> driverRefusalList = tOrderRefusalMapper.selectList(new EntityWrapper<TOrderRefusal>().eq("driver_id", tDriver.getId()));
+ tDriverResp.setRefusalCount(driverRefusalList.size());
+
+ tDriverRespList.add(tDriverResp);
+ }
+ return tDriverRespList;
}
@Override
- public List<Map<String, Object>> getDriverList(Page<Map<String, Object>> page, Integer roleType,Integer nowUserId,String beginTime, String endTime, String companyName, String phone, String name, Integer addType, Integer authState) {
- return this.baseMapper.getDriverList(page,roleType,nowUserId, beginTime, endTime, companyName, phone, name, addType, authState);
+ public void auditPage(Integer id, Model model) {
+
+ TDriver tDriver = tDriverMapper.selectById(id);
+
+ model.addAttribute("id",tDriver.getId());
+ model.addAttribute("code",tDriver.getCode());
+ model.addAttribute("name",tDriver.getName());
+ model.addAttribute("avatar",tDriver.getAvatar());
+ model.addAttribute("phone",tDriver.getPhone());
+ model.addAttribute("sex",tDriver.getSex());
+ model.addAttribute("driverLicenseNumber",tDriver.getDriverLicenseNumber());
+ model.addAttribute("driverLicense",tDriver.getDriverLicense());
+ model.addAttribute("idcard",tDriver.getIdcard());
+ model.addAttribute("idcardFront",tDriver.getIdcardFront());
+ model.addAttribute("idcardBack",tDriver.getIdcardBack());
+ model.addAttribute("emergencyContact",tDriver.getEmergencyContact());
+ model.addAttribute("emergencyPhone",tDriver.getEmergencyPhone());
+ model.addAttribute("provinceName",tDriver.getProvinceName());
+ model.addAttribute("cityName",tDriver.getCityName());
+ model.addAttribute("areaName",tDriver.getAreaName());
+ model.addAttribute("integral",tDriver.getIntegral());
+ model.addAttribute("score",tDriver.getScore());
+ model.addAttribute("createTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tDriver.getCreateTime()));
+
+ // 计算驾龄
+ if(Objects.nonNull(tDriver.getFirstCertificateTime())){
+ ZoneId zoneId = ZoneId.systemDefault();
+ LocalDate firstTime = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
+ LocalDate now = tDriver.getFirstCertificateTime().toInstant().atZone(zoneId).toLocalDate();
+ Period period = Period.between(firstTime, now);
+ model.addAttribute("drivingExperience",period.getYears());
+ }else {
+ model.addAttribute("drivingExperience",0);
+ }
+
+ List<TOrder> tOrders = tOrderMapper.selectList(new EntityWrapper<TOrder>());
+
+ String monthDate = new SimpleDateFormat("yyyyMM").format(new Date());
+
+ if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance())){
+ // 设置余额
+ tDriver.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));
+ model.addAttribute("balance",tDriver.getBalance());
+ }else {
+ model.addAttribute("balance",BigDecimal.ZERO);
+ }
+
+ // 所属代理商
+ TAgent tAgent = tAgentMapper.selectById(tDriver.getAgentId());
+ if(Objects.nonNull(tAgent)){
+ model.addAttribute("agentName",tAgent.getPrincipal());
+ }else {
+ model.addAttribute("agentName","");
+ }
+ //所属分公司
+ TBranchOffice tBranchOffice = tBranchOfficeMapper.selectById(tDriver.getBranchOfficeId());
+ if(Objects.nonNull(tBranchOffice)){
+ model.addAttribute("principal",tBranchOffice.getPrincipal());
+ }else {
+ model.addAttribute("principal","");
+ }
+
+ // 查询邀请人
+ if(Objects.nonNull(tDriver.getInviterType()) && 1 == tDriver.getInviterType()){
+ TAppUser tAppUser = tAppUserMapper.selectById(tDriver.getInviterId());
+ model.addAttribute("inviterName",tAppUser.getNickname());
+ model.addAttribute("inviterPhone",tAppUser.getPhone());
+ }else if(Objects.nonNull(tDriver.getInviterType()) && 2 == tDriver.getInviterType()){
+ TDriver tDriver1 = tDriverMapper.selectById(tDriver.getInviterId());
+ model.addAttribute("inviterName",tDriver1.getName());
+ model.addAttribute("inviterPhone",tDriver1.getPhone());
+ }else {
+ model.addAttribute("inviterName","");
+ model.addAttribute("inviterPhone","");
+ }
+
+ // 查询当前用户邀请了哪些人
+ List<TDriver> list = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("inviterId", tDriver.getId()));
+ if(!CollectionUtils.isEmpty(list)){
+ model.addAttribute("inviterCount",list.size());
+ model.addAttribute("inviterCommission",0);
+ }else {
+ model.addAttribute("inviterCommission",0);
+ model.addAttribute("inviterCount",0);
+ }
+
+ if(!CollectionUtils.isEmpty(tOrders)){
+ //累计订单量
+ List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
+ && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())).collect(Collectors.toList());
+ model.addAttribute("cumulativeOrderCount",cumulativeOrderCount.size());
+ //当月订单量
+ List<TOrder> monthOrderCount = tOrders.stream().filter(order -> order.getDriverId().equals(tDriver.getId())
+ && order.getState().equals(OrderStateEnum.WAIT_EVALUATED.getCode()) && order.getState().equals(OrderStateEnum.FINISH.getCode())
+ && new SimpleDateFormat("yyyyMM").format(order.getCreateTime()).equals(monthDate)).collect(Collectors.toList());
+ model.addAttribute("monthOrderCount",monthOrderCount.size());
+ // 拒单次数
+ List<TOrderRefusal> driverRefusalList = tOrderRefusalMapper.selectList(new EntityWrapper<TOrderRefusal>().eq("driver_id", tDriver.getId()));
+ model.addAttribute("refusalCount",driverRefusalList.size());
+ // todo 累计收入
+ model.addAttribute("cumulativeIncome",0);
+ }else {
+ model.addAttribute("cumulativeOrderCount",0);
+ model.addAttribute("monthOrderCount",0);
+ model.addAttribute("refusalCount",0);
+ // 累计收入
+ model.addAttribute("cumulativeIncome",0);
+ }
}
@Override
- public String getUseCarIdStr(Integer carId) {
- return this.baseMapper.getUseCarIdStr(carId);
+ public JSONObject ocr(String imgUrl) {
+ File file = new File(imgUrl);
+ String result = httpUtils.ocr("2", file);
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ return jsonObject;
}
@Override
- public List<Map<String, Object>> getCanSelectCarList(Page<Map<String, Object>> page, Integer roleType, Integer nowUserId, String carIdStr, String carLicensePlate, String brandName, String modelName, String color, String serverStr) {
- return this.baseMapper.getCanSelectCarList(page, roleType, nowUserId, carIdStr, carLicensePlate, brandName, modelName, color, serverStr);
+ public void addOrUpdate(TDriver tDriver) {
+ // 对省市区做处理
+ String[] split = tDriver.getAreaId().split("/");
+ // 查询省市
+ // 黑龙江省/大兴安岭地区
+ // 702/852
+ TRegion province = tRegionMapper.selectById(split[0]);
+ tDriver.setProvinceName(province.getName());
+ tDriver.setProvinceCode(province.getCode());
+
+ TRegion city = tRegionMapper.selectById(split[1]);
+ if(Objects.isNull(city)){
+ city = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[1]));
+ }
+ tDriver.setCityName(city.getName());
+ tDriver.setCityCode(city.getCode());
+
+ TRegion area = tRegionMapper.selectById(split[2]);
+ if(Objects.isNull(area)){
+ area = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[2]));
+ }
+ tDriver.setAreaName(area.getName());
+ tDriver.setAreaCode(area.getCode());
+
+ tDriver.setCode(UUIDUtil.getNumberRandom(16));
+ tDriver.setBalance(BigDecimal.ZERO);
+ tDriver.setBackgroundBalance(BigDecimal.ZERO);
+
+ // 通过省市查询代理商
+ List<TAgent> tAgent = tAgentMapper.selectList(new EntityWrapper<TAgent>().eq("provinceCode", province.getCode())
+ .eq("cityCode", city.getCode())
+ .last("LIMIT 1"));
+ if(!CollectionUtils.isEmpty(tAgent)){
+ tDriver.setAgentId(tAgent.get(0).getId());
+ }
+ // 查询邀约人（司机端）
+ List<TDriver> emergencyDriver = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("phone", tDriver.getEmergencyPhone())
+ .last("LIMIT 1"));
+ if(!CollectionUtils.isEmpty(emergencyDriver)){
+ tDriver.setInviterId(emergencyDriver.get(0).getId());
+ tDriver.setInviterType(2);
+ }
+ // 通过省市区查询分公司
+ List<TBranchOffice> tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
+ .eq("cityCode", city.getCode())
+ .eq("districtCode", area.getCode())
+ .last("LIMIT 1"));
+ if(!CollectionUtils.isEmpty(tBranchOffice)){
+ tDriver.setBranchOfficeId(tBranchOffice.get(0).getId());
+ }
+
+ // ocr识别
+// JSONObject ocr = this.ocr("E:\\071bf986db0b00355c0ed190bbd3b16.png");
+// System.err.println(ocr);
}
@Override
- public void updateCompanyDriverState(Integer authState, Integer companyId) {
- this.baseMapper.updateCompanyDriverState(authState, companyId);
+ public EntityWrapper<TDriver> getCommissionPageList(String name, String phone, Integer status) {
+ EntityWrapper<TDriver> wrapper = new EntityWrapper<>();
+ // 手机号
+ if(StringUtils.hasLength(phone)){
+ wrapper.like("phone",phone);
+ }
+ // 状态
+ if(Objects.nonNull(status)){
+ wrapper.eq("status",status);
+ }
+ // 姓名
+ if(StringUtils.hasLength(name)){
+ wrapper.like("name",name);
+ }
+ wrapper.orderBy(true,"approvalStatus");
+ return wrapper;
}
-
- @Override
- public void updateFranchiseeDriverState(Integer authState, Integer franchiseeId) {
- this.baseMapper.updateFranchiseeDriverState(authState, franchiseeId);
- }
-
- @Override
- public List<Map<String, Object>> getDriverListNoPage(Integer roleType, Integer nowUserId) {
- return this.baseMapper.getDriverListNoPage(roleType, nowUserId);
- }
-
}
--
Gitblit v1.7.1