Pu Zhibing
2025-03-26 cbf2486983b77a27af9968bbb362cb8d43789115
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -317,13 +317,17 @@
        Long userid = tokenService.getLoginUser().getUserid();
        SysUser sysUser = sysUserClient.getSysUser(userid).getData();
        List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
                .ne(Order::getOrderStatus, 5)
                .eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
        LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<Order>()
                .in(Order::getOrderStatus, Arrays.asList(1, 2, 3, 4, 7, 8))
                .eq(Order::getPayStatus, 2)
                .eq(Order::getDelFlag, 0)
                .between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
                .orderByAsc(Order::getCreateTime));
                .orderByAsc(Order::getCreateTime);
        if(sysUser.getRoleType() == 2){
            //门店只拥有服务订单和自提商品订单
            wrapper.eq(Order::getShopId, sysUser.getObjectId()).eq(Order::getOrderType, 1).or().eq(Order::getOrderType, 2).eq(Order::getDistributionMode, 1);
        }
        List<Order> orderList = orderService.list(wrapper);
        Map<String, List<Order>> map = orderList.stream()
                .collect(Collectors.groupingBy(
                        item -> item.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
@@ -555,7 +559,6 @@
     */
    @GetMapping("/exportExpress")
    public void exportExpress(HttpServletResponse response, OrderPageList orderPage) {
        //搜索条件,用户姓名
        if (StringUtils.isNotEmpty(orderPage.getUserName())) {
            List<AppUser> data = appUserClient.getAppUserByNameNoFilter(orderPage.getUserName()).getData();
@@ -678,7 +681,21 @@
                .eq(Order::getPayStatus, 2));
        return R.ok(count);
    }
    /**
     * 查询给定用户在给定门店核销的订单
     * @param shopId
     * @param appUserId
     * @return
     */
    @PostMapping("/getOrderByAppUserIdsAndWriteOffShop")
    public R<List<Order>> getOrderByAppUserIdsAndWriteOffShop(@RequestParam("shopId") Integer shopId, @RequestParam("appUserId") Set<Long> appUserId){
        List<Order> list = orderService.getOrderByAppUserIdsAndWriteOffShop(shopId, appUserId);
        return R.ok(list);
    }
}