bug修改

无关风月

19 小时以前 7cab5bda99ca42188bc15b2dae7d1fa4d1833fd9

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.constant.Constants;
@@ -48,6 +49,7 @@
import java.util.stream.Collectors;
import javax.annotation.Resource;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -106,6 +108,10 @@
        return R.ok(orderService.queryPage(orderQueryRequest));
    }

    @PostMapping(value = "/queryPage1")
    public R<List<String>> queryPage1(@RequestBody OrderQueryRequest orderQueryRequest) {
        return R.ok(orderService.queryPage1(orderQueryRequest));
    }
    /**
     * 订单列表
     */
@@ -142,7 +148,7 @@
     */
    @ApiOperation(value = "订单列表-增加发送短信次数", tags = {"后台-订单管理"})
    @PostMapping(value = "/msgCount")
    public R<?> messageCount(@RequestParam("orderId") String orderId) {
    public R messageCount(@RequestParam("orderId") String orderId) {
        orderService.messageCount(orderId);
        return R.ok();
    }
@@ -275,6 +281,12 @@
        return R.ok(collect);
    }

    @PostMapping(value = "/queryIdsBycodeAndSite")
    public R<List<Integer>> queryIdsBycodeAndSite(@RequestParam("cityList")  List<String> cityList,@RequestParam("siteIds")List<String> siteIds) {
        List<Integer> collect = orderService.lambdaQuery().eq(BaseEntity::getIsDelete,0).in(!siteIds.isEmpty(),Order::getSiteId,siteIds).in(Order::getCityCode, cityList).list().stream().map(Order::getUserId).collect(Collectors.toList());
        return R.ok(collect);
    }


    /**
     * 更改订单信息
@@ -302,6 +314,8 @@
            order.setServerPhone(phone);
            orderService.updateById(order);
        }
//        List<ChangeDispatch> list = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, orderId).list();
//        changeDispatchService.removeBatchByIds(list);
        return R.ok(order);
    }

@@ -378,7 +392,7 @@


        Order order = orderService.getById(orderRequest.getOrderId());
        if (order.getState()!=6) {
//        if (order.getState()!=6) {
            if ((!Objects.equals(order.getServerId(), orderRequest.getServerId())) || (!Objects.equals(order.getTime(), orderRequest.getTime()))) {
                order.setState(1);
                order.setArriveTime(null);
@@ -387,8 +401,12 @@
                        .eq(Order::getId, order.getId()
                        ).set(Order::getArriveTime, null).update();

                //删除改派管理的订单
//                List<ChangeDispatch> list = changeDispatchService.lambdaQuery().eq(ChangeDispatch::getOrderId, order.getId()).list();
//                changeDispatchService.removeBatchByIds(list);

            }
        }
//        }

        order.setId(orderRequest.getOrderId());
        order.setCity(orderRequest.getCity());
@@ -432,6 +450,22 @@
        order.setProvinceCode(orderRequest.getProvinceCode());
        order.setAreaCode(orderRequest.getAreaCode());
        return R.ok(orderService.updateById(order));
    }

    /**
     * 批量修改订单时间
     * @param ids 站点多条id拼接
     */
    @ApiOperation(value = "订单列表-批量修改订单时间", tags = {"后台-订单管理[2.0]"})
    @GetMapping(value = "/batchUpdateTime")
    public R<Boolean> batchUpdateTime(@RequestParam("ids") String ids, @RequestParam("time") String time) {
        List<String> idList = Arrays.stream(ids.split(",")).collect(Collectors.toList());
        List<Order> list = orderService.lambdaQuery().in(Order::getId, idList).list();
        if (!CollectionUtils.isEmpty(list)) {
            list.forEach(data -> data.setTime(time));
            orderService.updateBatchById(list);
        }
        return R.ok();
    }


@@ -484,7 +518,7 @@
    })
    public R<Page<OrderCountVO>> orderCount(@RequestBody OrderCountDataRequest request) {
        return R.ok(orderService.orderCount(request.getWorkerName(), request.getWorkerPhone(), request.getCityList(),
                Page.of(request.getPageNum(), request.getPageSize())));
                Page.of(request.getPageNum(), request.getPageSize()),request.getSiteIds()));
    }

    /**
@@ -498,6 +532,14 @@
                .eq(Order::getUserId, userId)
                .eq(Order::getIsDelete, Constants.ZERO).list();
        return R.ok(!list.isEmpty());
    }

    @GetMapping(value = "/updateArrivalTime")
    public R<Boolean> updateArrivalTime(@RequestParam("orderId")String orderId,@RequestParam("arriveTime")String arriveTime) {
        Order byId = orderService.getById(orderId);
        byId.setTime(arriveTime);
        orderService.updateById(byId);
        return R.ok();
    }

    /**
@@ -564,9 +606,12 @@
    @GetMapping(value = "/orderList1")
    public R<Page<Order>> orderList1(@RequestParam("userId") Integer userId, @RequestParam("cityList") List<String> cityList,
                                    @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                     @RequestParam("siteIds") List<String> siteIds
    ) {
        Page<Order> page = orderService.lambdaQuery().eq(Order::getUserId, userId)
                .eq(Order::getIsDelete, 0).in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
                .eq(Order::getIsDelete, 0)
                .in(!cityList.isEmpty(),Order::getCityCode, cityList).page(Page.of(pageNum, pageSize));
        return R.ok(page);
    }

@@ -578,9 +623,9 @@
    })
    public R<Page<Order>> workOrderList(@RequestParam("workId") Integer workId,
                                    @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,@RequestParam("siteIds") String [] siteIds) {
        Page<Order> page = orderService.lambdaQuery().eq(Order::getServerId, workId)
                .eq(Order::getIsDelete, 0).page(Page.of(pageNum, pageSize));
                .in(siteIds.length>0,Order::getSiteId, siteIds).eq(Order::getIsDelete, 0).page(Page.of(pageNum, pageSize));
        return R.ok(page);
    }

@@ -605,10 +650,10 @@
     */
    @ApiOperation(value = "师傅端-订单列表", tags = {"师傅端"})
    @GetMapping(value = "/orderListWorker")
    public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,
    public R<Page<Order>> orderListWorker(@RequestParam("userId") Integer userId, @RequestParam("state") Integer state,@RequestParam("searchValues") String searchValues,
                                          @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
        return R.ok(orderService.orderListWorker(userId, state, pageNum, pageSize));
        return R.ok(orderService.orderListWorker(userId, state, searchValues,pageNum, pageSize));
    }

    /**
@@ -710,6 +755,7 @@
        order.setCompleteTime(new Date());
        order.setState(Constants.THREE);
        order.setFake(orderSubmitRequest.getFake());
        order.setRemark(orderSubmitRequest.getRemark());
        boolean update = orderService.updateById(order);
        // 服务记录
        ServeRecord serveRecord = new ServeRecord();
@@ -763,7 +809,7 @@

        QueryWrapper<Order> wrapper = new QueryWrapper<>();
        wrapper.eq("server_id", workerId)
                .in("state", 1, 2)
                .in("state", 1, 2,7)
                .eq("is_delete", Constants.ZERO)
                .eq("DATE(time)", todayStr)  // 添加这一行来筛选当天的订单
                .orderByAsc("CASE WHEN topSort IS NULL THEN 1 ELSE 0 END")
@@ -837,4 +883,46 @@
        return R.ok(orderService.placeOrder(userOrderRequest));
    }

    /**
     * 师傅端-打电话
     */
    @ApiOperation(value = "打电话", tags = {"师傅端-打电话[2.0]"})
    @GetMapping(value = "/call")
    public R<String> call(@RequestParam("orderId") String orderId) {
        Order order = orderService.getById(orderId);
        if(Objects.isNull(order)){
            return R.fail("订单不存在");
        }
        if(order.getState() == 7){
            order.setState(1);
            orderService.updateById(order);
        }
        return R.ok();
    }
    /**
     * 领取补贴金
     */
    @GetMapping(value = "/receiving")
    public R<String> receiving(@RequestParam("orderId")String orderId, @RequestParam("recycleSubsidy")BigDecimal recycleSubsidy) {
        Order order = orderService.getById(orderId);
        if(Objects.isNull(order)){
            return R.fail("订单不存在");
        }
        order.setSubsidy(recycleSubsidy);
        order.setOrderMoney(order.getOrderMoney().add(recycleSubsidy));
        orderService.updateById(order);
        return R.ok();
    }

    /**
     * 领取补贴金
     */
    @GetMapping(value = "/getTodayOrderData")
    public R<List<Order>> getTodayOrderData() {
        List<Order> orders = orderService.list(Wrappers.lambdaQuery(Order.class)
                .eq(Order::getTime, LocalDate.now())
                .eq(Order::getIsDelete, 0));
        return R.ok(orders);
    }

}