From 49056d4563fb2ea429c2837f89dbaf14956b2a08 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 28 Feb 2025 16:23:35 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=BE=E5=A4=87=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E7=AE=97=E4=B8=8A=E9=80=80=E6=AC=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hard/api/constant/order/HardOrderStatusEnum.java | 8 ++++++++ .../service/impl/order/HardOrderTotalServiceImpl.java | 2 +- .../thirdparty/service/impl/zy/ZyStrideServiceImpl.java | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java index fdf1d8a4c..7f3596b26 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java @@ -30,6 +30,14 @@ public enum HardOrderStatusEnum { ); } + public static List getPayPrice() { + return List.of( + HardOrderStatusEnum.PAY.type, + HardOrderStatusEnum.CANCEL.type, + HardOrderStatusEnum.REFUND.type + ); + } + public static List getPayErrorCodes() { return List.of( HardOrderStatusEnum.REFUND.type 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 4d2c6dd28..93acc7c1e 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 @@ -218,7 +218,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { CompletableFuture> payFuture = CompletableFuture.supplyAsync(() -> { HardOrderSumAndCountDto payDto = new HardOrderSumAndCountDto(); payDto.setDeptIds(deptIds); - payDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes()); + payDto.setOrderStatusCodes(HardOrderStatusEnum.getPayPrice()); if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { payDto.setCreateTimeList(dto.getCreateTimeList()); } diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/zy/ZyStrideServiceImpl.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/zy/ZyStrideServiceImpl.java index 09b9d2cc2..7b0280c95 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/zy/ZyStrideServiceImpl.java +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/service/impl/zy/ZyStrideServiceImpl.java @@ -11,4 +11,5 @@ import org.springframework.validation.annotation.Validated; @Slf4j @RequiredArgsConstructor public class ZyStrideServiceImpl implements ZyStrideService { + }