| | |
|---|
| | | 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())) { |
|---|
| | |
|---|
| | | 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()) { |
|---|
| | |
|---|
| | | 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：直接更新变更版本 |
|---|
| | |
|---|
| | | 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(); |
|---|
| | |
|---|
| | | .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<>(); |
|---|
