修改bug

Pu Zhibing

2025-01-20 05a6a23dbbd47031a41830e168c8318567ee0b5f

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

@@ -235,7 +235,15 @@

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

@@ -302,6 +316,7 @@
        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())
                .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));
@@ -326,14 +341,14 @@
            for (Order order : value) {
                if (order.getOrderType().equals(1)) {
                    serviceTotal++;
                    serviceTotalMoney = serviceTotalMoney.add(order.getPaymentAmount());
                    serviceTotalMoney = serviceTotalMoney.add(order.getTotalAmount());
                    total++;
                    totalMoney = totalMoney.add(order.getPaymentAmount());
                }else if (order.getOrderType().equals(2) && 1 == order.getDistributionMode()){
                    totalMoney = totalMoney.add(order.getTotalAmount());
                }else if (order.getOrderType().equals(2)){
                    singleTotal++;
                    singleTotalMoney = singleTotalMoney.add(order.getPaymentAmount());
                    singleTotalMoney = singleTotalMoney.add(order.getTotalAmount());
                    total++;
                    totalMoney = totalMoney.add(order.getPaymentAmount());
                    totalMoney = totalMoney.add(order.getTotalAmount());
                }
            }
            orderStatisticsDetail.setDate(key);