From 67ac6f18da66cc5b703e1ec849e96bdac586d6d1 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 10 五月 2023 18:16:26 +0800
Subject: [PATCH] BUG修改
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 297 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 254 insertions(+), 43 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 a3d2fd9..9adcdc1 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
@@ -2,16 +2,26 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.core.base.tips.SuccessTip;
+import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.DateUtil;
+import com.stylefeng.guns.modular.system.controller.resp.TDriverCommissionResp;
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.enums.PayStatusEnum;
+import com.stylefeng.guns.modular.system.enums.StatusEnum;
+import com.stylefeng.guns.modular.system.enums.UserTypeEnum;
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.apache.commons.io.FileUtils;
+import org.apache.poi.hdf.extractor.TC;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,15 +30,17 @@
import org.springframework.util.StringUtils;
import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
+import java.net.URL;
+import java.net.URLConnection;
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.Objects;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -58,10 +70,18 @@
@Autowired
private TRegionMapper tRegionMapper;
@Autowired
+ private TRevenueMapper tRevenueMapper;
+ @Autowired
private ITRegionService itRegionService;
@Autowired
private HttpUtils httpUtils;
+ @Autowired
+ private TRechargeRecordMapper tRechargeRecordMapper;
+ @Autowired
+ private TCashWithdrawalMapper tCashWithdrawalMapper;
+
+ private Logger log = LoggerFactory.getLogger(this.getClass());
@Override
public EntityWrapper<TDriver> getPageList(String createTime, String phone, Integer status) {
EntityWrapper<TDriver> wrapper = new EntityWrapper<>();
@@ -81,6 +101,15 @@
wrapper.between("createTime",startTime,endTime);
}
wrapper.orderBy(true,"approvalStatus");
+ // 判断是否为代理商或者分公司
+ if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 2){
+ // 分公司
+ wrapper.eq("branchOfficeId",ShiroKit.getUser().getObjectId());
+ }
+ if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
+ // 代理商
+ wrapper.eq("agentId",ShiroKit.getUser().getObjectId());
+ }
return wrapper;
}
@@ -96,8 +125,10 @@
TDriverResp tDriverResp = new TDriverResp();
BeanUtils.copyProperties(tDriver,tDriverResp);
- // 设置余额
- tDriverResp.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));
+ if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance())){
+ // 设置余额
+ tDriverResp.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));
+ }
// 所属代理商
TAgent tAgent = tAgentMapper.selectById(tDriver.getAgentId());
@@ -110,12 +141,12 @@
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());
+ List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
+ && (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())
+ List<TOrder> monthOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
+ && (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());
// 拒单次数
@@ -190,18 +221,20 @@
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","");
+ if(Objects.nonNull(tDriver.getInviterId())){
+ // 查询邀请人
+ 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","");
+ }
}
// 查询当前用户邀请了哪些人
@@ -216,19 +249,46 @@
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());
+ List<TOrder> cumulativeOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
+ && (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())
+ List<TOrder> monthOrderCount = tOrders.stream().filter(order -> tDriver.getId().equals(order.getDriverId())
+ && (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);
+ // 累计收入 司机提现记录加上余额减去充值金额，为累计收入
+ List<TCashWithdrawal> tCashWithdrawals = tCashWithdrawalMapper.selectList(new EntityWrapper<TCashWithdrawal>()
+ .eq("type", UserTypeEnum.DRIVER.getCode())
+ .eq("userDriverId", tDriver.getId())
+ .eq("state", 2));
+ BigDecimal balance = tDriver.getBalance();
+// if(!CollectionUtils.isEmpty(tCashWithdrawals)){
+// Optional<BigDecimal> reduce = tCashWithdrawals.stream().map(TCashWithdrawal::getAmount).reduce(BigDecimal::add);
+// if(reduce.isPresent()){
+// balance = balance.add(reduce.get());
+// }
+// }
+// List<TRechargeRecord> tRechargeRecords = tRechargeRecordMapper.selectList(new EntityWrapper<TRechargeRecord>()
+// .eq("type", UserTypeEnum.DRIVER.getCode())
+// .eq("userId", tDriver.getId())
+// .eq("payType", 1)
+// .eq("payStatus", PayStatusEnum.FINISH.getCode()));
+// if(!CollectionUtils.isEmpty(tRechargeRecords)){
+// Optional<BigDecimal> reduce = tRechargeRecords.stream().map(TRechargeRecord::getAmount).reduce(BigDecimal::add);
+// if(reduce.isPresent()){
+// balance = balance.subtract(reduce.get());
+// }
+// }
+ List<TRevenue> tRevenues = tRevenueMapper.selectList(new EntityWrapper<TRevenue>()
+ .eq("userType", 2)
+ .eq("userId", tDriver.getId()));
+ Optional<BigDecimal> reduce = tRevenues.stream().map(TRevenue::getAmount).reduce(BigDecimal::add);
+ // 减去充值金额
+ reduce.ifPresent(bigDecimal -> model.addAttribute("cumulativeIncome", bigDecimal));
}else {
model.addAttribute("cumulativeOrderCount",0);
model.addAttribute("monthOrderCount",0);
@@ -239,15 +299,13 @@
}
@Override
- public JSONObject ocr(String imgUrl) {
- File file = new File(imgUrl);
+ public JSONObject ocr(File file) {
String result = httpUtils.ocr("2", file);
- JSONObject jsonObject = JSONObject.parseObject(result);
- return jsonObject;
+ return JSONObject.parseObject(result);
}
@Override
- public void addOrUpdate(TDriver tDriver) {
+ public Object addOrUpdate(TDriver tDriver) {
// 对省市区做处理
String[] split = tDriver.getAreaId().split("/");
// 查询省市
@@ -271,36 +329,43 @@
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())
+ .eq("status", StatusEnum.NORMAL.getCode())
.last("LIMIT 1"));
if(!CollectionUtils.isEmpty(tAgent)){
tDriver.setAgentId(tAgent.get(0).getId());
+ }else {
+ return new SuccessTip(500, "该区域代理商被冻结或不存在");
}
- // 查询邀约人（司机端）
- 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);
+ if(StringUtils.hasLength(tDriver.getInviterPhone())){
+ // 查询邀约人（司机端）
+ List<TDriver> emergencyDriver = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("phone", tDriver.getInviterPhone())
+ .last("LIMIT 1"));
+ if(!CollectionUtils.isEmpty(emergencyDriver)){
+ tDriver.setInviterId(emergencyDriver.get(0).getId());
+ tDriver.setInviterType(2);
+ }else {
+ return new SuccessTip(500, "该邀约人:"+tDriver.getInviterName()+"不存在");
+ }
}
// 通过省市区查询分公司
List<TBranchOffice> tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
.eq("cityCode", city.getCode())
+ .eq("status", StatusEnum.NORMAL.getCode())
.eq("districtCode", area.getCode())
.last("LIMIT 1"));
if(!CollectionUtils.isEmpty(tBranchOffice)){
tDriver.setBranchOfficeId(tBranchOffice.get(0).getId());
+ }else {
+ return new SuccessTip(500, "该区域分公司被冻结或不存在");
}
// ocr识别
// JSONObject ocr = this.ocr("E:\\071bf986db0b00355c0ed190bbd3b16.png");
// System.err.println(ocr);
+ return null;
}
@Override
@@ -319,6 +384,152 @@
wrapper.like("name",name);
}
wrapper.orderBy(true,"approvalStatus");
+ // 判断是否为代理商或者分公司
+ if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 2){
+ // 分公司
+ wrapper.eq("branchOfficeId",ShiroKit.getUser().getObjectId());
+ }
+ if(Objects.requireNonNull(ShiroKit.getUser()).getRoleType() == 3){
+ // 代理商
+ wrapper.eq("agentId",ShiroKit.getUser().getObjectId());
+ }
return wrapper;
}
+
+ @Override
+ public List<TDriverCommissionResp> getTDriverCommissionResp(List<TDriver> drivers) {
+ List<TDriverCommissionResp> commissionRespList = new ArrayList<>(drivers.size());
+ for (TDriver driver : drivers) {
+ TDriverCommissionResp commissionResp = new TDriverCommissionResp();
+ BeanUtils.copyProperties(driver,commissionResp);
+
+ // 查询代理商
+ // 所属代理商
+ TAgent tAgent = tAgentMapper.selectById(driver.getAgentId());
+ if(Objects.nonNull(tAgent)){
+ commissionResp.setAgentName(tAgent.getPrincipal());
+ }
+
+ // 关联人数
+ AtomicInteger connectedPersons = new AtomicInteger(0);
+
+ List<TDriver> inviterTwoList = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("inviterId", driver.getId()));
+ if(!CollectionUtils.isEmpty(inviterTwoList)){
+ // 推广人数
+ commissionResp.setNumberPromoters(inviterTwoList.size());
+ List<Integer> inviterTwoIds = inviterTwoList.stream().map(TDriver::getId).collect(Collectors.toList());
+ connectedPersons.addAndGet(inviterTwoList.size());
+ // 查询三级
+ List<TDriver> inviterThreeList = tDriverMapper.selectList(new EntityWrapper<TDriver>().in("inviterId", inviterTwoIds));
+ if(!CollectionUtils.isEmpty(inviterThreeList)){
+ List<Integer> inviterThreeIds = inviterThreeList.stream().map(TDriver::getId).collect(Collectors.toList());
+ connectedPersons.addAndGet(inviterThreeList.size());
+ // 查询四级
+ List<TDriver> inviterFourList = tDriverMapper.selectList(new EntityWrapper<TDriver>().in("inviterId", inviterThreeIds));
+ connectedPersons.addAndGet(inviterFourList.size());
+
+ }
+ }
+
+ commissionResp.setConnectedPersons(connectedPersons.get());
+
+ // 已提现佣金 查询该司机的佣金提现记录
+ commissionResp.setWithdrawnAmount(BigDecimal.ZERO);
+
+ // 累计佣金 可提现佣金+已提现佣金
+ commissionResp.setAccumulatedCommission(BigDecimal.ZERO);
+
+ commissionRespList.add(commissionResp);
+
+ }
+ return commissionRespList;
+ }
+
+ @Override
+ public void driverCommissionDetail(Integer tDriverId, Model model) {
+
+ // 查询司机
+ TDriver driver = tDriverMapper.selectById(tDriverId);
+
+ // 司机信息封装
+ model.addAttribute("driverId",tDriverId);
+ model.addAttribute("name",driver.getName());
+ model.addAttribute("phone",driver.getPhone());
+ model.addAttribute("sex",driver.getSex());
+ model.addAttribute("status",driver.getStatus());
+ model.addAttribute("commission",driver.getCommission());
+ model.addAttribute("startTimeToEndTime",new SimpleDateFormat("yyyy-MM-dd").format(driver.getCreateTime()).replace("-",".")+"-"+
+ new SimpleDateFormat("yyyy-MM-dd").format(new Date()).replace("-","."));
+
+ // 所属代理商
+ TAgent tAgent = tAgentMapper.selectById(driver.getAgentId());
+ if(Objects.nonNull(tAgent)){
+ model.addAttribute("agentName",tAgent.getPrincipal());
+ }else {
+ model.addAttribute("agentName","");
+ }
+
+ // 关联人数
+ AtomicInteger connectedPersons = new AtomicInteger(0);
+ // 推广人数
+ List<TDriver> inviterTwoList = tDriverMapper.selectList(new EntityWrapper<TDriver>().eq("inviterId", driver.getId()));
+ if(!CollectionUtils.isEmpty(inviterTwoList)){
+ model.addAttribute("numberPromoters",inviterTwoList.size());
+ List<Integer> inviterTwoIds = inviterTwoList.stream().map(TDriver::getId).collect(Collectors.toList());
+ connectedPersons.addAndGet(inviterTwoList.size());
+ // 查询三级
+ List<TDriver> inviterThreeList = tDriverMapper.selectList(new EntityWrapper<TDriver>().in("inviterId", inviterTwoIds));
+ if(!CollectionUtils.isEmpty(inviterThreeList)){
+ List<Integer> inviterThreeIds = inviterThreeList.stream().map(TDriver::getId).collect(Collectors.toList());
+ connectedPersons.addAndGet(inviterThreeList.size());
+ // 查询四级
+ List<TDriver> inviterFourList = tDriverMapper.selectList(new EntityWrapper<TDriver>().in("inviterId", inviterThreeIds));
+ connectedPersons.addAndGet(inviterFourList.size());
+ }
+ }else {
+ model.addAttribute("numberPromoters",0);
+ }
+ model.addAttribute("connectedPersons",connectedPersons.get());
+ // 已提现佣金 查询该司机的佣金提现记录
+ model.addAttribute("withdrawnAmount",BigDecimal.ZERO);
+// commissionResp.setWithdrawnAmount(BigDecimal.ZERO);
+ // 累计佣金 可提现佣金+已提现佣金
+ model.addAttribute("accumulatedCommission",BigDecimal.ZERO);
+// commissionResp.setAccumulatedCommission(BigDecimal.ZERO);
+
+ }
+
+ @Override
+ public void getDataStatistics(Integer agentId, Model model,Map<String, Object> map) {
+ // 司机总数
+ Integer driverTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
+ .eq("agentId", agentId));
+ // 司机最近一月数量
+ LocalDate now = LocalDate.now();
+ LocalDate localDate = now.plusMonths(1);
+ Integer driverMonthTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
+ .eq("agentId", agentId)
+ .between("createTime", localDate, now));
+ model.addAttribute("driverTotal",driverTotal);
+ model.addAttribute("driverMonthTotal",driverMonthTotal);
+ map.put("driverTotal",driverTotal);
+ map.put("driverMonthTotal",driverMonthTotal);
+ }
+
+ @Override
+ public void getDataStatisticsByIds(List<Integer> ids, Model model, Map<String, Object> map) {
+ // 司机总数
+ Integer driverTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
+ .in("agentId", ids));
+ // 司机最近一月数量
+ LocalDate now = LocalDate.now();
+ LocalDate localDate = now.plusMonths(1);
+ Integer driverMonthTotal = tDriverMapper.selectCount(new EntityWrapper<TDriver>()
+ .in("agentId", ids)
+ .between("createTime", localDate, now));
+ model.addAttribute("driverTotal",driverTotal);
+ model.addAttribute("driverMonthTotal",driverMonthTotal);
+ map.put("driverTotal",driverTotal);
+ map.put("driverMonthTotal",driverMonthTotal);
+ }
}
--
Gitblit v1.7.1