二手家电回收
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
无关风月
45 分钟以前 b5ead35c1d955f2a0e2e10da79254860d0ba95e9 
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChangeDispatchController.java


@@ -1,15 +1,15 @@


package com.ruoyi.order.controller;






import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.ruoyi.common.core.constant.Constants;


import com.ruoyi.common.core.domain.BaseEntity;


import com.ruoyi.common.core.domain.R;


import com.ruoyi.common.core.exception.GlobalException;


import com.ruoyi.common.core.utils.StringUtils;


import com.ruoyi.common.security.annotation.RequiresPermissions;


import com.ruoyi.order.entity.ChangeDispatch;


import com.ruoyi.order.entity.Order;


import com.ruoyi.order.request.ChangeDispatchRequest;


import com.ruoyi.order.service.ChangeDispatchService;


import com.ruoyi.order.service.OrderService;


import io.swagger.annotations.Api;


@@ -19,6 +19,7 @@


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import java.time.LocalDateTime;


import java.util.Arrays;


import java.util.Date;


import java.util.List;


@@ -45,38 +46,28 @@


    /**


     * 订单改派分页列表


     *


     * @param pageNum  页码


     * @param pageSize 每页显示条数


     * @param request 查询参数


     */


    @RequiresPermissions("reassignment_apply")


    @ApiOperation(value = "订单改派分页查询列表", tags = {"后台-系统设置-订单改派管理"})


    @GetMapping(value = "/page")


    @PostMapping(value = "/page")


    @ApiImplicitParams({


            @ApiImplicitParam(value = "师傅名称", name = "workerName", dataType = "String"),


            @ApiImplicitParam(value = "预约人姓名", name = "reservationName", dataType = "String"),


            @ApiImplicitParam(value = "订单编号", name = "orderNumber", dataType = "String"),


            @ApiImplicitParam(value = "下单用户名称", name = "userName", dataType = "String"),


            @ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),


            @ApiImplicitParam(value = "每页条数", name = "pageSize", dataType = "Integer", required = true)


    })


    public R<Page<ChangeDispatch>> queryPageList(@RequestParam(value = "workerName", required = false) String workerName,


                                                 @RequestParam(value = "orderNumber", required = false) String orderNumber,


                                                 @RequestParam(value = "userName", required = false) String userName,


                                                 @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,


                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {


        LambdaQueryChainWrapper<ChangeDispatch> wrapper = changeDispatchService.lambdaQuery();


        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;


        Page<ChangeDispatch> page = wrapper.eq(ChangeDispatch::getIsDelete, 0)


                .orderByDesc(ChangeDispatch::getCreateTime).page(Page.of(pageNum, pageSize));


    public R<Page<ChangeDispatch>> queryPageList(@RequestBody ChangeDispatchRequest request) {


        Page<ChangeDispatch> page = changeDispatchService.queryPageList(request, Page.of(request.getPageNum(),


                request.getPageSize()));


        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());


            }


            Order byId = orderService.getById(record.getOrderId());


//            if (byId!=null){


//                record.setType(byId.getType());


//


//            }


        }


        return R.ok(page);


    }


@@ -202,7 +193,16 @@


                .eq(Order::getId, changeDispatch.getOrderId())


                .eq(Order::getIsDelete, 0).one();


        order.setState(Constants.ONE);


        Integer serverId = order.getServerId();


        return R.ok(update && orderService.updateById(order));


    }




    @GetMapping(value = "/changeReason")


    public void changeReason(@RequestParam("id")String id,@RequestParam("reason") String reason) {


        ChangeDispatch one = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, id).orderByDesc(BaseEntity::getCreateTime).last("limit 1").one();


        one.setState(1);


//        one.setApplyReason(reason);


        changeDispatchService.updateById(one);


    }




    /**


@@ -255,9 +255,9 @@


                .set(Order::getIsReinvest, Constants.ONE)


                .set(Order::getAcceptTime, new Date())


                .set(Order::getArriveTime, null)


                .set(Order::getCompleteTime, null)


                .set(Order::getCompleteTime, null).set(Order::getAcceptTime, LocalDateTime.now())


                // 原订单状态改为 1:待上门，已选择师傅


                .set(Order::getState, Constants.ONE)


                .set(Order::getState, Constants.ONE).set(Order::getServerId, workerId).set(Order::getServerName, name).set(Order::getServerPhone, phone)


                .eq(Order::getId, order.getId()).update();


        // 改派信息


        boolean update = changeDispatchService.lambdaUpdate().set(ChangeDispatch::getState, 1)