修改bug

Pu Zhibing

2025-01-20 05a6a23dbbd47031a41830e168c8318567ee0b5f

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

@@ -237,9 +237,12 @@
    public R<List<Order>> byUserId(@RequestParam("appUserId") Long appUserId,@RequestParam("shopId") Integer shopId){
        List<Order> list = orderService.lambdaQuery()
                .eq(Order::getAppUserId, appUserId)
                .eq(Order::getShopId, shopId)
                .eq(null != shopId && -1 != shopId, Order::getShopId, shopId)
                .eq(Order::getDistributionMode, 1)
                .ne(Order::getOrderStatus,5).list();
                .eq(Order::getPayStatus, 2)
                .isNull(Order::getRefundStatus)
                .eq(Order::getDelFlag, 0)
                .notIn(Order::getOrderStatus, 5, 6).list();
        return R.ok(list);
    }
    @PostMapping("/byShopId")
@@ -251,7 +254,10 @@
        List<Order> list = orderService.lambdaQuery().isNotNull(Order::getEndTime)
                .eq(null != shopId && -1 != shopId, Order::getShopId, shopId)
                .eq(Order::getAppUserId, appUserId)
                .in(Order::getOrderStatus, 4, 7, 8).list();
                .eq(Order::getPayStatus, 2)
                .isNull(Order::getRefundStatus)
                .eq(Order::getDelFlag, 0)
                .notIn(Order::getOrderStatus, 5, 6).list();
        return R.ok(list);
    }