From 4a8aacc59c7a3f972ede1cd1f375977dc3ba23aa Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 20 五月 2026 23:10:10 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/impl/DriverInfoServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 64a3ac6..509cf69 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
@@ -246,7 +246,6 @@
IPage<DriverInfo> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<DriverInfo> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
- pageWrap.getModel().setDeleted(Constants.ZERO);
// 鍙告満濮撳悕/鎵嬫満鍙凤紙鍏抽敭瀛楁ā绯婃煡璇級
if (StringUtils.isNotBlank(pageWrap.getModel().getKeyword())) {
@@ -282,7 +281,8 @@
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);
+ .leftJoin(Category.class, Category::getId,DriverInfo::getCarType)
+ .eq(DriverInfo::getDeleted, Constants.ZERO);
queryWrapper.orderByDesc(DriverInfo::getId);
PageData<DriverInfo> pageData = PageData.from(driverInfoMapper.selectPage(page, queryWrapper));
for (DriverInfo d : pageData.getRecords()) {
@@ -560,8 +560,13 @@
driverInfoMapper.insert(newChange);
saveDriverAttachments(newChange.getId(), request, now);
// 鏍囪鍘嗗彶鐨勫彉鏇寸増鏈负鍒犻櫎
-
-
+ driverInfoMapper.update(new UpdateWrapper<DriverInfo>().lambda()
+ .set(DriverInfo::getDeleted, Constants.ONE)
+ .set(DriverInfo::getUpdateTime, now)
+ .eq(DriverInfo::getMemberId, memberId)
+ .eq(DriverInfo::getVersionType, Constants.ONE)
+ .eq(DriverInfo::getDeleted, Constants.ZERO)
+ .ne(DriverInfo::getId, newChange.getId()));
} else {
// auditStatus=0/2锛氱洿鎺ユ洿鏂板彉鏇寸増鏈�
@@ -1881,6 +1886,9 @@
if (!driverId.equals(order.getAcceptDriver())) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏃犳潈鎿嶄綔璇ヨ鍗�");
}
+ if (Constants.equalsInteger(order.getExceptionStatus(), Constants.ONE)) {
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), "寮傚父璁㈠崟鏃犳硶杩涜纭閫佽揪");
+ }
// 3. 淇濆瓨閫佽揪鍥剧墖
Date now = new Date();
@@ -2271,7 +2279,13 @@
.eq(status != null, Orders::getStatus, status)
.eq(Orders::getDeleted, Constants.ZERO)
.orderByDesc(Orders::getAcceptTime);
-
+ // 鍏抽敭璇嶆悳绱細鏀朵欢浜�/鏀朵欢浜虹數璇濇ā绯娿�佽鍗曞彿绮惧噯
+ if (StringUtils.isNotBlank(model.getKeyword())) {
+ String kw = model.getKeyword().trim();
+ wrapper.and(w -> w.like(Orders::getTakeUser, kw)
+ .or().like(Orders::getTakePhone, kw)
+ .or().like(Orders::getCode, kw));
+ }
IPage<Orders> orderPage = ordersMapper.selectJoinPage(p, Orders.class, wrapper);
List<DriverGrabOrderVO> voList = new ArrayList<>();
--
Gitblit v1.9.3