feat: 代码重构

hjl

2024-07-18 b9da8289051937fbbbd47bbda97414ad6c769a90

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChangeDispatchController.java

@@ -67,8 +67,18 @@
        wrapper = StringUtils.isNotBlank(workerName) ? wrapper.like(ChangeDispatch::getWorkerName, workerName) : wrapper;
        wrapper = StringUtils.isNotBlank(orderNumber) ? wrapper.like(ChangeDispatch::getOrderNumber, orderNumber) : wrapper;
        wrapper = StringUtils.isNotBlank(userName) ? wrapper.like(ChangeDispatch::getUserName, userName) : wrapper;
        return R.ok(wrapper.eq(ChangeDispatch::getIsDelete, 0)
                .orderByDesc(ChangeDispatch::getCreateTime).page(Page.of(pageNum, pageSize)));
        Page<ChangeDispatch> page = wrapper.eq(ChangeDispatch::getIsDelete, 0)
                .orderByDesc(ChangeDispatch::getCreateTime).page(Page.of(pageNum, pageSize));
        for (ChangeDispatch record : page.getRecords()) {
            String orderId = record.getOrderId();
            Order order = orderService.lambdaQuery()
                    .eq(Order::getId, orderId)
                    .eq(Order::getIsDelete, 0).one();
            if (null != order) {
                record.setOrderTime(order.getCreateTime());
            }
        }
        return R.ok(page);
    }

    /**
@@ -240,24 +250,15 @@
        if (null == order) {
            throw new GlobalException("订单不存在！");
        }
        // 原订单状态改为 1:待上门，已选择师傅
        order.setState(Constants.ONE);
        // 更改订单信息为再投单
        boolean orderUpdate = orderService.lambdaUpdate().set(Order::getIsReinvest, Constants.ONE)
        boolean orderUpdate = orderService.lambdaUpdate()
                .set(Order::getIsReinvest, Constants.ONE)
                .set(Order::getAcceptTime, new Date())
                .set(Order::getArriveTime, null)
                .set(Order::getCompleteTime, null)
                // 原订单状态改为 1:待上门，已选择师傅
                .set(Order::getState, Constants.ONE)
                .eq(Order::getId, order.getId()).update();
        // 生成新订单信息
//        Order newOrder = new Order();
//        BeanUtils.copyProperties(order, newOrder);
//        newOrder.setId(null);
//        newOrder.setServerId(workerId);
//        newOrder.setServerName(name);
//        newOrder.setServerPhone(phone);
//        newOrder.setState(Constants.ONE);
//        // 构建新订单
//        boolean save = orderService.save(newOrder);
        // 改派信息
        boolean update = changeDispatchService.lambdaUpdate().set(ChangeDispatch::getState, 1)
                .eq(ChangeDispatch::getId, changeId).eq(ChangeDispatch::getIsDelete, 0).update();