From 2fffce5db588f194160374d0d91fcf58e968ec72 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Mon, 24 Mar 2025 17:24:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E9=83=A8=E9=97=A8=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hard/api/dto/order/HardOrderSumAndCountDto.java | 2 +- .../service/impl/order/HardOrderTotalServiceImpl.java | 6 +++--- .../src/main/resources/mapper/order/HardOrderMapper.xml | 8 +++++--- .../com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java | 2 +- .../wallet/api/dto/WalletTransactionSumAndCountDto.java | 2 ++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java index e29580abb..893674189 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java @@ -8,7 +8,7 @@ import java.util.List; @Data public class HardOrderSumAndCountDto { - private List deptIds; + private List userDeptIds; private List orderStatusCodes; diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java index abff7e215..2c32201af 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java @@ -321,7 +321,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { // 查询订单支付流水 CompletableFuture> payFuture = CompletableFuture.supplyAsync(() -> { HardOrderSumAndCountDto payDto = new HardOrderSumAndCountDto(); - payDto.setDeptIds(deptIds); + payDto.setUserDeptIds(deptIds); payDto.setOrderStatusCodes(HardOrderStatusEnum.getPayPrice()); if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { payDto.setCreateTimeList(dto.getCreateTimeList()); @@ -334,7 +334,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { // 查询订单退款流水 CompletableFuture> refundFuture = CompletableFuture.supplyAsync(() -> { HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto(); - refundDto.setDeptIds(deptIds); + refundDto.setUserDeptIds(deptIds); refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPayErrorCodes()); if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { refundDto.setCreateTimeList(dto.getCreateTimeList()); @@ -347,7 +347,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { // 查看盈利流水 CompletableFuture> profitFuture = CompletableFuture.supplyAsync(() -> { HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto(); - refundDto.setDeptIds(deptIds); + refundDto.setUserDeptIds(deptIds); refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes()); if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { refundDto.setCreateTimeList(dto.getCreateTimeList()); diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index 951949bd5..aafd662a9 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -6,6 +6,7 @@ + @@ -42,6 +43,7 @@ select a.id, a.order_no, a.user_id, + a.user_dept_id, a.merchant_id, a.hard_id, a.dept_id, @@ -217,9 +219,9 @@ #{v} - - and a.dept_id in - + + and a.user_dept_id in + #{v} diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java index a7b225a54..f5ab38542 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/dto/DeptAllListDto.java @@ -5,7 +5,7 @@ import lombok.Data; import java.util.List; @Data -public class DeptAllListDto { +public class DeptAllListDto { private Long deptId; diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java index e4b837ea3..a99570c9a 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java @@ -21,6 +21,8 @@ public class WalletTransactionSumAndCountDto { private List deptIds; + private List userDeptIds; + private List bizTypes; private LocalDateTime[] createTimeList;