From c9f0611f690b3fb0cb120f5b6799f94977d3f129 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 四月 2026 11:34:23 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java | 845 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 764 insertions(+), 81 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java
index e67a9b0..8110145 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java
@@ -17,19 +17,36 @@
import com.doumee.dao.business.MultifileMapper;
import com.doumee.dao.business.SmsrecordMapper;
import com.doumee.dao.business.CategoryMapper;
+import com.doumee.dao.business.OrdersMapper;
+import com.doumee.dao.business.OrdersDetailMapper;
+import com.doumee.dao.business.RevenueMapper;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.biz.system.OperationConfigBiz;
+import com.doumee.dao.business.OrderLogMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.DriverInfo;
+import com.doumee.dao.business.model.OrderLog;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Multifile;
import com.doumee.dao.business.model.Smsrecord;
+import com.doumee.dao.business.model.Orders;
+import com.doumee.dao.business.model.OrdersDetail;
+import com.doumee.dao.business.model.Revenue;
import com.doumee.dao.vo.AccountResponse;
+import com.doumee.dao.vo.DriverCenterVO;
+import com.doumee.dao.vo.DriverGrabOrderVO;
+import com.doumee.dao.vo.DriverOrderDetailVO;
import com.doumee.dao.dto.AuditDTO;
+import com.doumee.dao.dto.ChangeStatusDTO;
import com.doumee.dao.dto.DriverLoginRequest;
import com.doumee.dao.dto.DriverRegisterRequest;
import com.doumee.dao.dto.DriverVerifyRequest;
-import com.doumee.service.business.AliSmsService;
+import com.doumee.dao.dto.DriverActiveOrderDTO;
+import com.doumee.dao.dto.DriverGrabOrderDTO;
+import com.doumee.core.utils.aliyun.AliSmsService;
import com.doumee.service.business.DriverInfoService;
import com.alibaba.fastjson.JSONObject;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -38,10 +55,8 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* 鍙告満娉ㄥ唽淇℃伅Service瀹炵幇
@@ -74,6 +89,24 @@
@Autowired
private CategoryMapper categoryMapper;
+
+ @Autowired
+ private OrdersMapper ordersMapper;
+
+ @Autowired
+ private RevenueMapper revenueMapper;
+
+ @Autowired
+ private OrdersDetailMapper ordersDetailMapper;
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+
+ @Autowired
+ private OrderLogMapper orderLogMapper;
+
+ @Autowired
+ private OperationConfigBiz operationConfigBiz;
@Override
public Integer create(DriverInfo driverInfo) {
@@ -139,71 +172,41 @@
@Override
public PageData<DriverInfo> findPage(PageWrap<DriverInfo> pageWrap) {
IPage<DriverInfo> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<DriverInfo> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<DriverInfo> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setDeleted(Constants.ZERO);
- if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(DriverInfo::getId, pageWrap.getModel().getId());
+
+ // 鍙告満濮撳悕/鎵嬫満鍙凤紙鍏抽敭瀛楁ā绯婃煡璇級
+ if (StringUtils.isNotBlank(pageWrap.getModel().getKeyword())) {
+ queryWrapper.and(w -> w
+ .like(DriverInfo::getName, pageWrap.getModel().getKeyword())
+ .or()
+ .like(DriverInfo::getTelephone, pageWrap.getModel().getKeyword()));
}
- if (pageWrap.getModel().getDeleted() != null) {
- queryWrapper.lambda().eq(DriverInfo::getDeleted, pageWrap.getModel().getDeleted());
+ // 杞︾墝鍙�
+ if (StringUtils.isNotBlank(pageWrap.getModel().getCarCode())) {
+ queryWrapper.like(DriverInfo::getCarCode, pageWrap.getModel().getCarCode());
}
- if (pageWrap.getModel().getCreateUser() != null) {
- queryWrapper.lambda().eq(DriverInfo::getCreateUser, pageWrap.getModel().getCreateUser());
- }
- if (pageWrap.getModel().getCreateTime() != null) {
- queryWrapper.lambda().ge(DriverInfo::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTime()));
- queryWrapper.lambda().le(DriverInfo::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTime()));
- }
- if (pageWrap.getModel().getUpdateUser() != null) {
- queryWrapper.lambda().eq(DriverInfo::getUpdateUser, pageWrap.getModel().getUpdateUser());
- }
- if (pageWrap.getModel().getUpdateTime() != null) {
- queryWrapper.lambda().ge(DriverInfo::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
- queryWrapper.lambda().le(DriverInfo::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
- }
- if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(DriverInfo::getRemark, pageWrap.getModel().getRemark());
- }
- if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().like(DriverInfo::getName, pageWrap.getModel().getName());
- }
- if (pageWrap.getModel().getTelephone() != null) {
- queryWrapper.lambda().like(DriverInfo::getTelephone, pageWrap.getModel().getTelephone());
- }
- if (pageWrap.getModel().getIdcard() != null) {
- queryWrapper.lambda().eq(DriverInfo::getIdcard, pageWrap.getModel().getIdcard());
- }
- if (pageWrap.getModel().getMaritalStatus() != null) {
- queryWrapper.lambda().eq(DriverInfo::getMaritalStatus, pageWrap.getModel().getMaritalStatus());
- }
- if (pageWrap.getModel().getCarType() != null) {
- queryWrapper.lambda().eq(DriverInfo::getCarType, pageWrap.getModel().getCarType());
- }
- if (pageWrap.getModel().getCarCode() != null) {
- queryWrapper.lambda().like(DriverInfo::getCarCode, pageWrap.getModel().getCarCode());
- }
- if (pageWrap.getModel().getCardStartDate() != null) {
- queryWrapper.lambda().ge(DriverInfo::getCardStartDate, Utils.Date.getStart(pageWrap.getModel().getCardStartDate()));
- queryWrapper.lambda().le(DriverInfo::getCardStartDate, Utils.Date.getEnd(pageWrap.getModel().getCardStartDate()));
- }
- if (pageWrap.getModel().getCardEndDate() != null) {
- queryWrapper.lambda().ge(DriverInfo::getCardEndDate, Utils.Date.getStart(pageWrap.getModel().getCardEndDate()));
- queryWrapper.lambda().le(DriverInfo::getCardEndDate, Utils.Date.getEnd(pageWrap.getModel().getCardEndDate()));
- }
+ // 鐘舵��
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(DriverInfo::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(DriverInfo::getStatus, pageWrap.getModel().getStatus());
}
- if (pageWrap.getModel().getAuditTime() != null) {
- queryWrapper.lambda().ge(DriverInfo::getAuditTime, Utils.Date.getStart(pageWrap.getModel().getAuditTime()));
- queryWrapper.lambda().le(DriverInfo::getAuditTime, Utils.Date.getEnd(pageWrap.getModel().getAuditTime()));
+ // 瀹℃壒鐘舵��
+ if (pageWrap.getModel().getAuditStatus() != null) {
+ queryWrapper.eq(DriverInfo::getAuditStatus, pageWrap.getModel().getAuditStatus());
}
- if (pageWrap.getModel().getAuditUser() != null) {
- queryWrapper.lambda().eq(DriverInfo::getAuditUser, pageWrap.getModel().getAuditUser());
+ // 鍒涘缓鏃ユ湡鑼冨洿
+ if (pageWrap.getModel().getCreateTimeStart() != null) {
+ queryWrapper.ge(DriverInfo::getCreateTime, Utils.Date.getStart(pageWrap.getModel().getCreateTimeStart()));
}
- if (pageWrap.getModel().getMemberId() != null) {
- queryWrapper.lambda().eq(DriverInfo::getMemberId, pageWrap.getModel().getMemberId());
+ if (pageWrap.getModel().getCreateTimeEnd() != null) {
+ queryWrapper.le(DriverInfo::getCreateTime, Utils.Date.getEnd(pageWrap.getModel().getCreateTimeEnd()));
}
+ // 瀛愭煡璇細浣欓
+ queryWrapper.selectAll(DriverInfo.class)
+ .select(" ( select ifnull(sum(r.OPT_TYPE * r.AMOUNT),0) from revenue r where r.MEMBER_TYPE = 1 and r.MEMBER_ID= t.id and r.VAILD_STATUS = 1 ) as memberAmount ")
+ .selectAs(Category::getName,DriverInfo::getCarTypeName)
+ .leftJoin(Category.class, Category::getId,DriverInfo::getCarType);
for (PageWrap.SortData sortData : pageWrap.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -211,7 +214,11 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- return PageData.from(driverInfoMapper.selectPage(page, queryWrapper));
+ PageData<DriverInfo> pageData = PageData.from(driverInfoMapper.selectPage(page, queryWrapper));
+ for (DriverInfo d : pageData.getRecords()) {
+ d.setGender(Constants.getGenderByIdCard(d.getIdcard()));
+ }
+ return pageData;
}
@Override
@@ -309,15 +316,12 @@
member.setCreateTime(now);
member.setUpdateTime(now);
member.setTelephone(telephone);
- member.setNickName(telephone);
+ member.setNickName(telephone.substring(0, 3) + "****" + telephone.substring(7));
member.setName(telephone);
member.setUserType(Constants.ONE);
member.setBusinessStatus(Constants.ZERO);
member.setPassword(secure.encryptPassword(defaultPassword, salt));
member.setSalt(salt);
- member.setWorkerIdentity(Constants.ZERO);
- member.setDriverIdentity(Constants.ZERO);
- member.setChefIdentity(Constants.ZERO);
member.setAmount(Constants.ZERO.longValue());
member.setTotalAmount(Constants.ZERO.longValue());
member.setStatus(Constants.ZERO);
@@ -329,7 +333,7 @@
member.setUseIdentity(Constants.ZERO);
memberMapper.insert(member);
- // 鍒涘缓鍙告満鍩虹淇℃伅锛坰tatus=0锛屾敞鍐岀姸鎬侊級
+ // 鍒涘缓鍙告満鍩虹淇℃伅
DriverInfo driverInfo = new DriverInfo();
driverInfo.setDeleted(Constants.ZERO);
driverInfo.setCreateTime(now);
@@ -337,6 +341,7 @@
driverInfo.setTelephone(telephone);
driverInfo.setMemberId(member.getId());
driverInfo.setStatus(Constants.ZERO);
+ driverInfo.setAuditStatus(null);
driverInfoMapper.insert(driverInfo);
}
@@ -408,10 +413,9 @@
if (Objects.isNull(driverInfo)) {
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- // 鐘舵�佹牎楠岋細status=0(娉ㄥ唽)鎴杝tatus=3(瀹℃壒椹冲洖)鍙彁浜よ璇�
- if (driverInfo.getStatus() != null
- && !Constants.equalsInteger(driverInfo.getStatus(), Constants.ZERO)
- && !Constants.equalsInteger(driverInfo.getStatus(), Constants.THREE)) {
+ // 鐘舵�佹牎楠岋細auditStatus=null(鏈彁浜�)鎴朼uditStatus=2(瀹℃壒椹冲洖)鍙彁浜よ璇�
+ if (driverInfo.getAuditStatus() != null
+ && !Constants.equalsInteger(driverInfo.getAuditStatus(), Constants.TWO)) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鐘舵�佷笉鍏佽鎻愪氦璁よ瘉");
}
// 鏍规嵁杞﹁締绫诲瀷鍒ゆ柇鏄惁闇�瑕侀┚椹惰瘉
@@ -458,7 +462,7 @@
.set(DriverInfo::getCardEndDate, request.getCardEndDate())
.set(DriverInfo::getIdcardImg, request.getIdcardImg())
.set(DriverInfo::getIdcardImgBack, request.getIdcardImgBack())
- .set(DriverInfo::getStatus, Constants.ONE)
+ .set(DriverInfo::getAuditStatus, Constants.ZERO)
.set(DriverInfo::getUpdateTime, now)
.set(DriverInfo::getAuditRemark, null)
.set(DriverInfo::getAuditTime, null)
@@ -533,35 +537,106 @@
if (Objects.isNull(driverInfo)) {
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- // 鍙湁鐘舵�佷负1(寰呭鎵�)涓斿凡濉啓璁よ瘉淇℃伅鎵嶈兘瀹℃壒
- if (!Constants.equalsInteger(driverInfo.getStatus(), Constants.ONE)
+ // 鍙湁瀹℃壒鐘舵�佷负0(寰呭鎵�)涓斿凡濉啓璁よ瘉淇℃伅鎵嶈兘瀹℃壒
+ if (!Constants.equalsInteger(driverInfo.getAuditStatus(), Constants.ZERO)
|| StringUtils.isBlank(driverInfo.getIdcard())) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "褰撳墠鐘舵�佷笉鍏佽瀹℃壒");
}
Date now = new Date();
- // 瀹℃壒缁撴灉锛歛uditDTO.auditStatus 0=閫氳繃鈫抎riverInfo.status=2锛�1=鎷掔粷鈫抎riverInfo.status=3
- Integer newStatus;
+ // 瀹℃壒缁撴灉锛歛uditDTO.auditStatus 0=閫氳繃鈫抋uditStatus=1锛�1=鎷掔粷鈫抋uditStatus=2
+ Integer newAuditStatus;
if (Constants.equalsInteger(auditDTO.getAuditStatus(), Constants.ZERO)) {
- newStatus = Constants.TWO; // 瀹℃壒閫氳繃
+ newAuditStatus = Constants.ONE; // 瀹℃壒閫氳繃
+ // 瀹℃壒閫氳繃鏃跺徃鏈哄畾绾т负蹇呭～
+ if (auditDTO.getDriverLevel() == null || auditDTO.getDriverLevel() < 1 || auditDTO.getDriverLevel() > 5) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀹℃壒閫氳繃鏃跺繀椤诲～鍐欏徃鏈哄畾绾�");
+ }
} else if (Constants.equalsInteger(auditDTO.getAuditStatus(), Constants.ONE)) {
- newStatus = Constants.THREE; // 瀹℃壒椹冲洖
+ newAuditStatus = Constants.TWO; // 瀹℃壒椹冲洖
} else {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "瀹℃壒鐘舵�佸弬鏁伴敊璇�");
}
- // 鏇存柊鍙告満鐘舵��
+ // 鏇存柊鍙告満瀹℃壒鐘舵��
driverInfoMapper.update(new UpdateWrapper<DriverInfo>().lambda()
- .set(DriverInfo::getStatus, newStatus)
+ .set(DriverInfo::getAuditStatus, newAuditStatus)
.set(DriverInfo::getAuditTime, now)
.set(DriverInfo::getAuditRemark, auditDTO.getAuditRemark())
.set(DriverInfo::getAuditUser, auditDTO.getAuditUser())
+ .set(auditDTO.getDriverLevel() != null, DriverInfo::getDriverLevel, auditDTO.getDriverLevel())
.set(DriverInfo::getUpdateTime, now)
.eq(DriverInfo::getId, auditDTO.getId()));
// 鏇存柊浼氬憳鍙告満璁よ瘉鐘舵�侊細閫氳繃=2锛岄┏鍥�=3
- Integer driverStatus = Constants.equalsInteger(newStatus, Constants.TWO) ? Constants.TWO : Constants.THREE;
+ Integer driverStatus = Constants.equalsInteger(newAuditStatus, Constants.ONE) ? Constants.TWO : Constants.THREE;
memberMapper.update(new UpdateWrapper<Member>().lambda()
.set(Member::getBusinessStatus, driverStatus)
.set(Member::getUpdateTime, now)
.eq(Member::getId, driverInfo.getMemberId()));
+ }
+
+ @Override
+ public DriverInfo getDetail(Integer id) {
+ DriverInfo driverInfo = driverInfoMapper.selectById(id);
+ if (Objects.isNull(driverInfo) || Constants.equalsInteger(driverInfo.getDeleted(), Constants.ONE)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ // 鎷兼帴鍥剧墖鍓嶇紑
+ String imgPrefix = "";
+ try {
+ imgPrefix = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.DRIVER_FILES).getCode();
+ } catch (Exception e) {
+ // 鏈厤缃椂蹇界暐
+ }
+ driverInfo.setImgPrefix(imgPrefix);
+ driverInfo.setGender(Constants.getGenderByIdCard(driverInfo.getIdcard()));
+ // 鏌ヨ杞﹁締绫诲瀷鍚嶇О鍜屾槸鍚﹂渶瑕侀┚椹惰瘉
+ if (driverInfo.getCarType() != null) {
+ Category category = categoryMapper.selectById(driverInfo.getCarType());
+ if (Objects.nonNull(category)) {
+ driverInfo.setCarTypeName(category.getName());
+ driverInfo.setNeedLicense(Constants.equalsInteger(Integer.valueOf(category.getOtherField()), Constants.ONE) ? Constants.ONE : Constants.ZERO);
+ }
+ }
+ // 鏌ヨ鐓х墖鍒楄〃锛歰bjType=6杞﹁締鐓х墖銆�7椹鹃┒璇佺収鐗囥��8鍏朵粬璧勬枡鐓х墖
+ List<Multifile> multifileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId, driverInfo.getId())
+ .in(Multifile::getObjType, 6, 7, 8)
+ .orderByAsc(Multifile::getSortnum));
+ if (!CollectionUtils.isEmpty(multifileList)) {
+ for (Multifile mf : multifileList) {
+ mf.setFileurlFull(imgPrefix + mf.getFileurl());
+ if (Constants.equalsInteger(mf.getObjType(), 6)) {
+ driverInfo.getCarImgList().add(mf);
+ } else if (Constants.equalsInteger(mf.getObjType(), 7)) {
+ driverInfo.getLicenseImgList().add(mf);
+ } else if (Constants.equalsInteger(mf.getObjType(), 8)) {
+ driverInfo.getOtherImgList().add(mf);
+ }
+ }
+ }
+ return driverInfo;
+ }
+
+ @Override
+ public void changeStatus(ChangeStatusDTO dto) {
+ if (dto.getId() == null) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "涓婚敭涓嶈兘涓虹┖");
+ }
+ if (dto.getStatus() == null || (dto.getStatus() != 0 && dto.getStatus() != 1)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "鐘舵�佸弬鏁伴敊璇紝0=鍚敤锛�1=绂佺敤");
+ }
+ DriverInfo driverInfo = driverInfoMapper.selectById(dto.getId());
+ if (Objects.isNull(driverInfo) || Constants.equalsInteger(driverInfo.getDeleted(), Constants.ONE)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ driverInfo.setStatus(dto.getStatus());
+ driverInfo.setUpdateTime(new Date());
+ driverInfoMapper.updateById(driverInfo);
+ // 鑱斿姩淇敼浼氬憳鐘舵�侊紙member涓婚敭涓巇river_info涓婚敭涓�鑷达級
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Member::getStatus, dto.getStatus())
+ .set(Member::getUpdateTime, new Date())
+ .eq(Member::getId, driverInfo.getId()));
}
/**
@@ -582,4 +657,612 @@
}
}
+ @Override
+ public void updateAcceptingStatus(Integer memberId, Integer status) {
+ if (!Constants.ZERO.equals(status) && !Constants.ONE.equals(status)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ DriverInfo driver = driverInfoMapper.selectOne(new QueryWrapper<DriverInfo>().lambda()
+ .eq(DriverInfo::getMemberId, memberId)
+ .eq(DriverInfo::getDeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (driver == null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍙告満淇℃伅涓嶅瓨鍦�");
+ }
+ if (!Constants.THREE.equals(driver.getAuditStatus())) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇峰厛瀹屾垚鎶奸噾鏀粯");
+ }
+ driverInfoMapper.update(new UpdateWrapper<DriverInfo>().lambda()
+ .set(DriverInfo::getAcceptingStatus, status)
+ .eq(DriverInfo::getId, driver.getId()));
+ }
+
+ @Override
+ public void updateLocation(Integer memberId, Double longitude, Double latitude) {
+ if (longitude == null || latitude == null) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "缁忕含搴︿笉鑳戒负绌�");
+ }
+ DriverInfo driver = driverInfoMapper.selectOne(new QueryWrapper<DriverInfo>().lambda()
+ .eq(DriverInfo::getMemberId, memberId)
+ .eq(DriverInfo::getDeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (driver == null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍙告満淇℃伅涓嶅瓨鍦�");
+ }
+ driverInfoMapper.update(new UpdateWrapper<DriverInfo>().lambda()
+ .set(DriverInfo::getLongitude, longitude)
+ .set(DriverInfo::getLatitude, latitude)
+ .eq(DriverInfo::getId, driver.getId()));
+ }
+
+ @Override
+ public DriverCenterVO getDriverCenterInfo(Integer memberId) {
+ DriverInfo driver = driverInfoMapper.selectOne(new QueryWrapper<DriverInfo>().lambda()
+ .eq(DriverInfo::getMemberId, memberId)
+ .eq(DriverInfo::getDeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (driver == null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍙告満淇℃伅涓嶅瓨鍦�");
+ }
+ DriverCenterVO vo = new DriverCenterVO();
+ vo.setName(driver.getName());
+ vo.setImgUrl(driver.getImgurl());
+ vo.setCarCode(driver.getCarCode());
+ vo.setScore(driver.getScore() != null ? driver.getScore().toPlainString() : "0");
+ vo.setBalance(driver.getBalance() != null ? driver.getBalance() : 0L);
+
+ // 澶村儚鍏ㄨ矾寰�
+ if (StringUtils.isNotBlank(driver.getImgurl())) {
+ String imgPrefix = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.MEMBER_FILES).getCode();
+ vo.setFullImgUrl(imgPrefix + driver.getImgurl());
+ }
+
+ // 浠婃棩棰勮浣ｉ噾锛歳evenue琛ㄤ腑浠婂ぉ鐨勬敹鍏ヨ褰曢噾棰濅箣鍜�
+ Date now = new Date();
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(now);
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ Date todayStart = cal.getTime();
+
+ QueryWrapper<Revenue> revenueWrapper = new QueryWrapper<>();
+ revenueWrapper.lambda()
+ .eq(Revenue::getMemberId, memberId)
+ .eq(Revenue::getMemberType, Constants.ONE)
+ .eq(Revenue::getOptType, Constants.ONE)
+ .eq(Revenue::getDeleted, Constants.ZERO)
+ .ge(Revenue::getCreateTime, todayStart);
+ revenueWrapper.select("IFNULL(SUM(AMOUNT),0) as amount");
+ Revenue sumResult = revenueMapper.selectOne(revenueWrapper);
+ vo.setTodayCommission(sumResult != null && sumResult.getAmount() != null ? sumResult.getAmount() : 0L);
+
+ // 浠婃棩鎺ュ崟鏁帮細浠婂ぉ瀹屾垚鐨勮鍗曟暟锛坅cceptDriver=鍙告満涓婚敭锛岀姸鎬�=宸插畬鎴愶級
+ Long todayOrderCount = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
+ .eq(Orders::getAcceptDriver, driver.getId())
+ .eq(Orders::getDeleted, Constants.ZERO)
+ .ge(Orders::getFinishTime, todayStart));
+ vo.setTodayOrderCount(todayOrderCount.intValue());
+
+ // 寰呭彇璐э紙宸叉帴鍗�=3锛�
+ Long waitPickCount = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
+ .eq(Orders::getAcceptDriver, driver.getId())
+ .eq(Orders::getDeleted, Constants.ZERO)
+ .eq(Orders::getStatus, Constants.OrderStatus.accepted.getStatus()));
+ vo.setWaitPickCount(waitPickCount.intValue());
+
+ // 寰呴厤閫侊紙娲鹃�佷腑=4锛�
+ Long waitDeliverCount = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
+ .eq(Orders::getAcceptDriver, driver.getId())
+ .eq(Orders::getDeleted, Constants.ZERO)
+ .eq(Orders::getStatus, Constants.OrderStatus.delivering.getStatus()));
+ vo.setWaitDeliverCount(waitDeliverCount.intValue());
+
+ return vo;
+ }
+
+ @Override
+ public PageData<DriverGrabOrderVO> grabOrderHall(Integer memberId, PageWrap<DriverGrabOrderDTO> pageWrap) {
+ DriverGrabOrderDTO dto = pageWrap.getModel();
+
+ // 1. 鑾峰彇鍙告満瀹氫綅
+ DriverInfo driver = driverInfoMapper.selectOne(new QueryWrapper<DriverInfo>().lambda()
+ .eq(DriverInfo::getMemberId, memberId)
+ .eq(DriverInfo::getDeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (driver == null || driver.getLatitude() == null || driver.getLongitude() == null) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鍙告満浣嶇疆淇℃伅缂哄け锛岃鍏堝紑鍚畾浣�");
+ }
+ // 鏍￠獙鍙告満宸叉敮浠樻娂閲�
+ if (!Constants.THREE.equals(driver.getAuditStatus())) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇峰厛瀹屾垚鎶奸噾鏀粯");
+ }
+ double driverLat = driver.getLatitude();
+ double driverLng = driver.getLongitude();
+
+ // 2. 棰勬煡鐗╁搧绛夌骇瀵瑰簲鐨勭墿鍝佸垎绫籌D
+ List<Integer> goodTypeIds = null;
+ if (dto != null && dto.getGradeId() != null) {
+ List<Category> cats = categoryMapper.selectList(new QueryWrapper<Category>().lambda()
+ .eq(Category::getDeleted, Constants.ZERO)
+ .eq(Category::getType, Constants.TWO)
+ .eq(Category::getRelationId, dto.getGradeId()));
+ if (cats.isEmpty()) {
+ return emptyPage(pageWrap);
+ }
+ goodTypeIds = cats.stream().map(Category::getId).collect(Collectors.toList());
+ }
+
+ // 3. Haversine SQL鍏紡锛氬徃鏈哄埌瀛樹欢闂ㄥ簵璺濈(km)锛屼娇鐢∣rders鑷甫鍧愭爣
+ String depositDist = "(6371 * acos(cos(radians(" + driverLat + ")) * cos(radians(t.DEPOSIT_LGT)) "
+ + "* cos(radians(t.DEPOSIT_LAT) - radians(" + driverLng + ")) "
+ + "+ sin(radians(" + driverLat + ")) * sin(radians(t.DEPOSIT_LGT))))";
+
+ // 4. 鏋勯�燤PJ鏌ヨ
+ IPage<Orders> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ MPJLambdaWrapper<Orders> wrapper = new MPJLambdaWrapper<>();
+ wrapper.selectAll(Orders.class)
+ // 瀛樹欢闂ㄥ簵
+ .select("s1.name", Orders::getDepositShopName)
+ .select("s1.address", Orders::getDepositShopAddress)
+ // 鍙栦欢闂ㄥ簵
+ .select("s2.name", Orders::getTakeShopName)
+ .select("s2.address", Orders::getTakeShopAddress)
+ .select("s2.link_phone as takeShopLinkPhone")
+ // 鐗╁搧绛夌骇璐甸噸鏍囪瘑
+ .select("c2.other_field as c2OtherField")
+ // JOIN
+ .leftJoin("shop_info s1 on s1.id = t.DEPOSIT_SHOP_ID and s1.DELETED = 0")
+ .leftJoin("shop_info s2 on s2.id = t.TAKE_SHOP_ID and s2.DELETED = 0")
+ .leftJoin("category c1 on c1.id = t.GOOD_TYPE and c1.DELETED = 0")
+ .leftJoin("category c2 on c2.id = c1.RELATION_ID and c2.DELETED = 0 and c2.TYPE = 3");
+
+ // 鏍稿績鏉′欢
+ wrapper.eq(Orders::getType, Constants.ONE)
+ .eq(Orders::getStatus, Constants.TWO)
+ .eq(Orders::getDeleted, Constants.ZERO);
+
+ // 鍙告満绾у埆 >= 璁㈠崟鐗╁搧绾у埆
+ if (driver.getDriverLevel() != null) {
+ wrapper.apply("t.GOOD_LEVEL <= {0}", driver.getDriverLevel());
+ }
+
+ // 鍔犳�� OR 鍦ㄩ厤閫佽寖鍥村唴
+ wrapper.and(w -> w
+ .eq(Orders::getIsUrgent, Constants.ONE)
+ .or()
+ .apply(depositDist + " <= s1.delivery_area"));
+
+ // 鐢ㄦ埛璺濈杩囨护
+ if (dto != null && dto.getDistance() != null && dto.getDistance() > 0) {
+ double maxKm = dto.getDistance() / 1000.0;
+ wrapper.apply(depositDist + " <= {0}", maxKm);
+ }
+
+ // 鐗╁搧绛夌骇杩囨护
+ if (goodTypeIds != null && !goodTypeIds.isEmpty()) {
+ wrapper.in(Orders::getGoodType, goodTypeIds);
+ }
+
+ // 鎺掑簭
+ Integer sortType = (dto != null) ? dto.getSortType() : null;
+ if (sortType != null && sortType == Constants.TWO) {
+ wrapper.last("ORDER BY " + depositDist + " ASC");
+ } else {
+ wrapper.orderByDesc(Orders::getCreateTime);
+ }
+
+ IPage<Orders> result = ordersMapper.selectJoinPage(page, Orders.class, wrapper);
+
+ // 5. 鎵归噺鏌ヨ鐗╁搧鏄庣粏
+ List<Integer> orderIds = result.getRecords().stream()
+ .map(Orders::getId).collect(Collectors.toList());
+ Map<Integer, List<OrdersDetail>> detailMap = new HashMap<>();
+ if (!orderIds.isEmpty()) {
+ List<OrdersDetail> allDetails = ordersDetailMapper.selectList(
+ new QueryWrapper<OrdersDetail>().lambda()
+ .in(OrdersDetail::getOrderId, orderIds));
+ for (OrdersDetail d : allDetails) {
+ detailMap.computeIfAbsent(d.getOrderId(), k -> new ArrayList<>()).add(d);
+ }
+ }
+
+ // 6. 鏋勫缓VO锛堜娇鐢ㄥ叡鐢ㄦ柟娉曪級
+ Date now = new Date();
+ List<DriverGrabOrderVO> voList = new ArrayList<>();
+ for (Orders order : result.getRecords()) {
+ voList.add(buildDriverOrderVO(order, driverLat, driverLng, true, now, detailMap));
+ }
+
+ // 7. 鎵嬪姩鍒嗛〉
+ PageData<DriverGrabOrderVO> pageData = new PageData<>(result.getCurrent(), result.getSize());
+ pageData.setTotal(result.getTotal());
+ pageData.setRecords(voList);
+ return pageData;
+ }
+
+ @Override
+ public List<DriverGrabOrderVO> activeOrders(Integer memberId, DriverActiveOrderDTO dto) {
+ if (dto == null || dto.getStatus() == null ||
+ (!Constants.equalsInteger(dto.getStatus(), Constants.THREE) && !Constants.equalsInteger(dto.getStatus(), Constants.FOUR))) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "璁㈠崟鐘舵�佸彧鑳戒负3(宸叉姠鍗�)鎴�4(娲鹃�佷腑)");
+ }
+
+ // 鑾峰彇鍙告満淇℃伅
+ DriverInfo driver = driverInfoMapper.selectOne(new QueryWrapper<DriverInfo>().lambda()
+ .eq(DriverInfo::getMemberId, memberId)
+ .eq(DriverInfo::getDeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (driver == null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍙告満淇℃伅涓嶅瓨鍦�");
+ }
+
+ boolean needDepositDist = Constants.equalsInteger(dto.getStatus(), Constants.THREE);
+ Double driverLat = driver.getLatitude();
+ Double driverLng = driver.getLongitude();
+
+ // MPJ鏌ヨ
+ MPJLambdaWrapper<Orders> wrapper = new MPJLambdaWrapper<>();
+ wrapper.selectAll(Orders.class)
+ .select("s1.name", Orders::getDepositShopName)
+ .select("s1.address", Orders::getDepositShopAddress)
+ .select("s2.name", Orders::getTakeShopName)
+ .select("s2.address", Orders::getTakeShopAddress)
+ .select("s2.link_phone as takeShopLinkPhone")
+ .select("c2.other_field as c2OtherField")
+ .leftJoin("shop_info s1 on s1.id = t.DEPOSIT_SHOP_ID and s1.DELETED = 0")
+ .leftJoin("shop_info s2 on s2.id = t.TAKE_SHOP_ID and s2.DELETED = 0")
+ .leftJoin("category c1 on c1.id = t.GOOD_TYPE and c1.DELETED = 0")
+ .leftJoin("category c2 on c2.id = c1.RELATION_ID and c2.DELETED = 0 and c2.TYPE = 3")
+ .eq(Orders::getAcceptDriver, driver.getId())
+ .eq(Orders::getType, Constants.ONE)
+ .eq(Orders::getStatus, dto.getStatus())
+ .eq(Orders::getDeleted, Constants.ZERO)
+ .orderByAsc(Orders::getAcceptTime);
+
+ List<Orders> ordersList = ordersMapper.selectJoinList(Orders.class, wrapper);
+
+ // 鎵归噺鏌ョ墿鍝佹槑缁�
+ List<Integer> orderIds = ordersList.stream().map(Orders::getId).collect(Collectors.toList());
+ Map<Integer, List<OrdersDetail>> detailMap = new HashMap<>();
+ if (!orderIds.isEmpty()) {
+ List<OrdersDetail> allDetails = ordersDetailMapper.selectList(
+ new QueryWrapper<OrdersDetail>().lambda()
+ .in(OrdersDetail::getOrderId, orderIds));
+ for (OrdersDetail d : allDetails) {
+ detailMap.computeIfAbsent(d.getOrderId(), k -> new ArrayList<>()).add(d);
+ }
+ }
+
+ // 鏋勫缓VO锛堜娇鐢ㄥ叡鐢ㄦ柟娉曪級
+ Date now = new Date();
+ List<DriverGrabOrderVO> voList = new ArrayList<>();
+ for (Orders order : ordersList) {
+ voList.add(buildDriverOrderVO(order, driverLat, driverLng, needDepositDist, now, detailMap));
+ }
+
+ return voList;
+ }
+
+ @Override
+ public DriverOrderDetailVO driverOrderDetail(Integer driverId, Integer orderId) {
+ // 鏌ヨ璁㈠崟锛圡PJ JOIN 闂ㄥ簵鍚嶇О+鍒嗙被锛岃窛绂昏绠椾娇鐢∣rders鑷甫鍧愭爣锛�
+ MPJLambdaWrapper<Orders> wrapper = new MPJLambdaWrapper<>();
+ wrapper.selectAll(Orders.class)
+ .select("s1.name", Orders::getDepositShopName)
+ .select("s1.address", Orders::getDepositShopAddress)
+ .select("s2.name", Orders::getTakeShopName)
+ .select("s2.address", Orders::getTakeShopAddress)
+ .select("s2.link_phone as takeShopLinkPhone")
+ .select("c2.other_field as c2OtherField")
+ .leftJoin("shop_info s1 on s1.id = t.DEPOSIT_SHOP_ID and s1.DELETED = 0")
+ .leftJoin("shop_info s2 on s2.id = t.TAKE_SHOP_ID and s2.DELETED = 0")
+ .leftJoin("category c1 on c1.id = t.GOOD_TYPE and c1.DELETED = 0")
+ .leftJoin("category c2 on c2.id = c1.RELATION_ID and c2.DELETED = 0 and c2.TYPE = 3")
+ .eq(Orders::getId, orderId)
+ .eq(Orders::getDeleted, Constants.ZERO);
+ Orders order = ordersMapper.selectJoinOne(Orders.class, wrapper);
+ if (order == null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "璁㈠崟涓嶅瓨鍦�");
+ }
+
+ // 鏉冮檺鏍￠獙锛氭姠鍗曞ぇ鍘呭彲瑙�(status=2, type=1) 鎴� 宸叉姠鍗�/娲鹃�佷腑(acceptDriver=driverId)
+ boolean canView = false;
+ if (Constants.equalsInteger(order.getStatus(), Constants.TWO) && Constants.equalsInteger(order.getType(), Constants.ONE)) {
+ canView = true;
+ }
+ if (driverId != null && driverId.equals(order.getAcceptDriver())) {
+ canView = true;
+ }
+ if (!canView) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏃犳潈鏌ョ湅璇ヨ鍗�");
+ }
+
+ // 鑾峰彇鍙告満浣嶇疆锛堢敤浜庤窛绂昏绠楋級
+ Double driverLat = null;
+ Double driverLng = null;
+ if (driverId != null) {
+ DriverInfo driver = driverInfoMapper.selectById(driverId);
+ if (driver != null) {
+ driverLat = driver.getLatitude();
+ driverLng = driver.getLongitude();
+ }
+ }
+
+ // 鐗╁搧鏄庣粏
+ List<OrdersDetail> details = ordersDetailMapper.selectList(
+ new QueryWrapper<OrdersDetail>().lambda()
+ .eq(OrdersDetail::getOrderId, orderId));
+ Map<Integer, List<OrdersDetail>> detailMap = new HashMap<>();
+ for (OrdersDetail d : details) {
+ detailMap.computeIfAbsent(d.getOrderId(), k -> new ArrayList<>()).add(d);
+ }
+
+ // 浣跨敤鍏辩敤鏂规硶鏋勫缓鍩虹VO瀛楁
+ Date now = new Date();
+ DriverGrabOrderVO base = buildDriverOrderVO(order, driverLat, driverLng, true, now, detailMap);
+
+ // 鏋勫缓璇︽儏VO
+ DriverOrderDetailVO vo = new DriverOrderDetailVO();
+ vo.setId(base.getId());
+ vo.setCode(base.getCode());
+ vo.setRemainMinutes(base.getRemainMinutes());
+ vo.setIsUrgent(base.getIsUrgent());
+ vo.setDepositShopName(base.getDepositShopName());
+ vo.setDepositShopAddress(base.getDepositShopAddress());
+ vo.setDepositDistance(base.getDepositDistance());
+ vo.setTakeName(base.getTakeName());
+ vo.setTakeDistance(base.getTakeDistance());
+ vo.setContactPhone(base.getContactPhone());
+ vo.setDriverFee(base.getDriverFee());
+ vo.setUrgentAmount(base.getUrgentAmount());
+ vo.setIsValuable(base.getIsValuable());
+
+ // 鐗╁搧鏄庣粏锛堣浆鎹㈢被鍨嬶級
+ List<DriverOrderDetailVO.OrderItem> detailItems = new ArrayList<>();
+ if (base.getItems() != null) {
+ for (DriverGrabOrderVO.OrderItem src : base.getItems()) {
+ DriverOrderDetailVO.OrderItem item = new DriverOrderDetailVO.OrderItem();
+ item.setName(src.getName());
+ item.setQuantity(src.getQuantity());
+ detailItems.add(item);
+ }
+ }
+ vo.setItems(detailItems);
+
+ // 璇︽儏鐗规湁瀛楁
+ vo.setStatus(order.getStatus());
+ vo.setStatusDesc(getStatusDesc(order.getStatus()));
+
+ // 瀹㈡埛淇℃伅
+ String customerInfo = "";
+ if (StringUtils.isNotBlank(order.getTakeUser())) {
+ customerInfo = order.getTakeUser();
+ }
+ if (StringUtils.isNotBlank(order.getTakePhone()) && order.getTakePhone().length() >= 4) {
+ customerInfo += "锛堟墜鏈哄熬鍙�" + order.getTakePhone().substring(order.getTakePhone().length() - 4) + "锛�";
+ }
+ vo.setCustomerInfo(customerInfo);
+
+ // 瀵艰埅缁忕含搴︼紙浣跨敤Orders鑷甫鍧愭爣锛�
+ if (Constants.equalsInteger(order.getStatus(), Constants.TWO)) {
+ if (order.getDepositLgt() != null && order.getDepositLat() != null) {
+ vo.setNavigateLat(order.getDepositLgt().doubleValue());
+ vo.setNavigateLng(order.getDepositLat().doubleValue());
+ }
+ } else {
+ if (order.getTakeLgt() != null && order.getTakeLat() != null) {
+ vo.setNavigateLat(order.getTakeLgt().doubleValue());
+ vo.setNavigateLng(order.getTakeLat().doubleValue());
+ }
+ }
+
+ // 涓嬪崟闄勪欢鍥剧墖
+ String imgPrefix = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.MEMBER_FILES).getCode();
+ vo.setOrderImages(getFileUrls(orderId, Constants.FileType.ORDER_FILE.getKey(), imgPrefix));
+
+ return vo;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void cancelOrder(Integer driverId, Integer orderId, String reason) {
+ // 1. 鏌ヨ鍙告満淇℃伅
+ DriverInfo driver = driverInfoMapper.selectById(driverId);
+ if (driver == null) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鍙告満淇℃伅涓嶅瓨鍦�");
+ }
+
+ // 2. 鏍￠獙璁㈠崟
+ Orders order = ordersMapper.selectById(orderId);
+ if (order == null || Constants.ONE.equals(order.getDeleted())) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "璁㈠崟涓嶅瓨鍦�");
+ }
+ if (!Constants.ONE.equals(order.getType())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "浠呭紓鍦板瘎瀛樿鍗曞彲鍙栨秷");
+ }
+ if (!Constants.TWO.equals(order.getStatus())) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "褰撳墠璁㈠崟鐘舵�佷笉鍏佽鍙栨秷");
+ }
+ if (!driverId.equals(order.getAcceptDriver())) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏃犳潈鎿嶄綔璇ヨ鍗�");
+ }
+
+ // 3. 姣忔棩鍙栨秷娆℃暟闄愬埗
+ String limitStr = operationConfigBiz.getConfig().getDriverDailyCancelLimit();
+ int limit = 3;
+ if (StringUtils.isNotBlank(limitStr)) {
+ try { limit = Integer.parseInt(limitStr); } catch (NumberFormatException ignored) {}
+ }
+ Calendar cal = Calendar.getInstance();
+ cal.set(Calendar.HOUR_OF_DAY, 0);
+ cal.set(Calendar.MINUTE, 0);
+ cal.set(Calendar.SECOND, 0);
+ cal.set(Calendar.MILLISECOND, 0);
+ Date todayStart = cal.getTime();
+ Long todayCancelCount = orderLogMapper.selectCount(new QueryWrapper<OrderLog>().lambda()
+ .eq(OrderLog::getOptUserId, driver.getMemberId())
+ .eq(OrderLog::getObjType, Constants.ORDER_LOG_CANCEL)
+ .eq(OrderLog::getOptUserType, Constants.ONE)
+ .ge(OrderLog::getCreateTime, todayStart));
+ if (todayCancelCount != null && todayCancelCount >= limit) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浠婃棩鍙栨秷娆℃暟宸茶揪涓婇檺");
+ }
+
+ // 4. 閲嶇疆璁㈠崟鍙告満瀛楁锛堜繚鎸乻tatus=2锛岄噴鏀惧洖鎶㈠崟澶у巺锛�
+ ordersMapper.update(new UpdateWrapper<Orders>().lambda()
+ .set(Orders::getAcceptDriver, null)
+ .set(Orders::getAcceptTime, null)
+ .set(Orders::getAcceptType, null)
+ .eq(Orders::getId, orderId));
+
+ // 5. 鍐欏叆鍙栨秷鏃ュ織
+ OrderLog log = new OrderLog();
+ log.setOrderId(orderId);
+ log.setTitle("鍙告満鍙栨秷璁㈠崟");
+ log.setLogInfo(StringUtils.isNotBlank(reason) ? reason : "鍙告満鍙栨秷鎺ュ崟");
+ log.setObjType(Constants.ORDER_LOG_CANCEL);
+ log.setOptUserId(driver.getMemberId());
+ log.setOptUserType(Constants.ONE);
+ log.setOrderStatus(order.getStatus());
+ log.setCreateTime(new Date());
+ log.setDeleted(Constants.ZERO);
+ orderLogMapper.insert(log);
+ }
+
+ private List<String> getFileUrls(Integer orderId, int objType, String prefix) {
+ List<Multifile> files = multifileMapper.selectList(
+ new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId, orderId)
+ .eq(Multifile::getObjType, objType)
+ .eq(Multifile::getIsdeleted, Constants.ZERO)
+ .orderByAsc(Multifile::getSortnum));
+ List<String> urls = new ArrayList<>();
+ if (files != null) {
+ for (Multifile f : files) {
+ if (StringUtils.isNotBlank(f.getFileurl())) {
+ urls.add(prefix + f.getFileurl());
+ }
+ }
+ }
+ return urls;
+ }
+
+ private String getStatusDesc(Integer status) {
+ if (status == null) return "";
+ switch (status) {
+ case 0: return "寰呮敮浠�";
+ case 1: return "寰呭瘎瀛�";
+ case 2: return "宸插瘎瀛�";
+ case 3: return "宸叉帴鍗�";
+ case 4: return "娲鹃�佷腑";
+ case 5: return "寰呭彇浠�";
+ case 7: return "宸插畬鎴�";
+ case 96: return "璁㈠崟鍏抽棴";
+ case 98: return "鍙栨秷涓�";
+ case 99: return "宸插彇娑�";
+ default: return "";
+ }
+ }
+
+ private String formatDistance(double km) {
+ if (km < 1) {
+ return Math.round(km * 1000) + "m";
+ }
+ return String.format("%.1fkm", km);
+ }
+
+ private double haversine(double lat1, double lng1, double lat2, double lng2) {
+ double R = 6371;
+ double dLat = Math.toRadians(lat2 - lat1);
+ double dLng = Math.toRadians(lng2 - lng1);
+ double a = Math.sin(dLat / 2) * Math.sin(dLat / 2)
+ + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))
+ * Math.sin(dLng / 2) * Math.sin(dLng / 2);
+ double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+ return R * c;
+ }
+
+ private <T> PageData<T> emptyPage(PageWrap<?> pageWrap) {
+ PageData<T> pd = new PageData<>(pageWrap.getPage(), pageWrap.getCapacity());
+ pd.setTotal(0);
+ pd.setRecords(new ArrayList<>());
+ return pd;
+ }
+
+ /**
+ * 鏋勫缓鍙告満绔鍗曞垪琛ㄥ叡鐢╒O锛堜娇鐢∣rders鑷甫鍧愭爣璁＄畻璺濈锛�
+ *
+ * @param order 璁㈠崟瀹炰綋锛圡PJ宸插～鍏卍epositShopName绛夊叧鑱斿瓧娈碉級
+ * @param driverLat 鍙告満绾害
+ * @param driverLng 鍙告満缁忓害
+ * @param needDepositDist 鏄惁闇�瑕佽绠楄窛瀛樹欢闂ㄥ簵璺濈
+ * @param now 褰撳墠鏃堕棿
+ * @param detailMap 璁㈠崟鐗╁搧鏄庣粏Map锛坥rderId 鈫� detailList锛�
+ * @return DriverGrabOrderVO
+ */
+ private DriverGrabOrderVO buildDriverOrderVO(Orders order, Double driverLat, Double driverLng,
+ boolean needDepositDist, Date now, Map<Integer, List<OrdersDetail>> detailMap) {
+ DriverGrabOrderVO vo = new DriverGrabOrderVO();
+ vo.setId(order.getId());
+ vo.setCode(order.getCode());
+
+ // 鍓╀綑鏃堕暱
+ if (order.getEstimatedDeliveryTime() != null) {
+ long diffMs = order.getEstimatedDeliveryTime().getTime() - now.getTime();
+ vo.setRemainMinutes(diffMs > 0 ? diffMs / (60 * 1000) : 0L);
+ } else {
+ vo.setRemainMinutes(0L);
+ }
+
+ vo.setIsUrgent(order.getIsUrgent());
+ vo.setDriverFee(order.getDriverFee());
+ vo.setUrgentAmount(order.getUrgentAmount());
+
+ // 瀛樹欢闂ㄥ簵锛堜娇鐢∣rders鑷甫鍧愭爣锛�
+ vo.setDepositShopName(order.getDepositShopName());
+ vo.setDepositShopAddress(order.getDepositShopAddress());
+ if (needDepositDist && driverLat != null && driverLng != null
+ && order.getDepositLgt() != null && order.getDepositLat() != null) {
+ double distKm = haversine(driverLat, driverLng,
+ order.getDepositLgt().doubleValue(), order.getDepositLat().doubleValue());
+ vo.setDepositDistance(formatDistance(distKm));
+ }
+
+ // 鍙栦欢淇℃伅 + 鑱旂郴鐢佃瘽锛堜娇鐢∣rders鑷甫鍧愭爣锛�
+ boolean hasTakeShop = order.getTakeShopId() != null && StringUtils.isNotBlank(order.getTakeShopName());
+ if (hasTakeShop) {
+ vo.setTakeName(order.getTakeShopName());
+ vo.setContactPhone(order.getTakeShopLinkPhone());
+ } else {
+ vo.setTakeName(order.getTakeLocation());
+ vo.setContactPhone(order.getTakePhone());
+ }
+ if (driverLat != null && driverLng != null
+ && order.getTakeLgt() != null && order.getTakeLat() != null) {
+ double takeDist = haversine(driverLat, driverLng,
+ order.getTakeLgt().doubleValue(), order.getTakeLat().doubleValue());
+ vo.setTakeDistance(formatDistance(takeDist));
+ }
+
+ // 璐甸噸鐗╁搧
+ vo.setIsValuable("1".equals(order.getC2OtherField()));
+
+ // 鐗╁搧鏄庣粏
+ List<OrdersDetail> details = detailMap.getOrDefault(order.getId(), Collections.emptyList());
+ List<DriverGrabOrderVO.OrderItem> items = new ArrayList<>();
+ for (OrdersDetail detail : details) {
+ DriverGrabOrderVO.OrderItem item = new DriverGrabOrderVO.OrderItem();
+ item.setName(detail.getLuggageName());
+ item.setQuantity(detail.getNum());
+ items.add(item);
+ }
+ vo.setItems(items);
+
+ return vo;
+ }
+
}
--
Gitblit v1.9.3