From 2aa0a9bca62b4af544173a67203f9c6b4a991862 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 26 Jun 2025 14:22:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E5=8D=95=E4=BD=8D=EF=BC=8C=E8=B7=A8?= =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 17 ++++++--- .../WalletInvoiceStatusCheckEnum.java | 35 +++++++++++++++++++ .../WalletRechargeInvoiceStatusEnum.java | 2 +- .../recharge/WalletRechargeInvoiceEntity.java | 6 ++++ .../WalletRechargeInvoiceController.java | 4 +-- .../wallet/mapper/WalletForeignMapper.java | 1 + .../wallet/mapper/WalletStrideMapper.java | 1 + .../service/WalletRechargeInvoiceService.java | 5 +++ .../WalletRechargeInvoiceServiceImpl.java | 12 +++++++ 9 files changed, 75 insertions(+), 8 deletions(-) create mode 100644 pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletInvoiceStatusCheckEnum.java diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml index 33a15cab9..01e7c9341 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml @@ -89,12 +89,19 @@ zy: # callback-recognition-url: /third/third-ks/callback/recognition # callback-sku-url: /third/third-ks/callback/sku lb: - base-url: https://elss-sit.nbcb.com.cn - # base-url: https://elss-sit.nbcb.com.cn/h5/thirdApp - app-id: 7da62b1a9ade473c917f573c5748081e - app-secret: 8ffI6b+OKTmdVAt9Qo+2F/HQQMdt/d8GFia0zlJOt9I= + # 测试环境 + # base-url: https://elss-sit.nbcb.com.cn + # app-id: 7da62b1a9ade473c917f573c5748081e + # app-secret: 8ffI6b+OKTmdVAt9Qo+2F/HQQMdt/d8GFia0zlJOt9I= + # company-number: 202504673472 + # sm4-key: S67157e8aQs2tFSX + + # 正式环境 + base-url: https://elss.nbcb.com.cn + app-id: 528e3ca76ec34f5c9b3255ba18aee774 + app-secret: tIhDZDXWhtP6bvd0J9Q0zjIZxSkmyX+uUc87xnDTgfc= company-number: 202504673472 - sm4-key: S67157e8aQs2tFSX + sm4-key: 63P839eg0uxE5aoG sms: diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletInvoiceStatusCheckEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletInvoiceStatusCheckEnum.java new file mode 100644 index 000000000..d2db17c81 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletInvoiceStatusCheckEnum.java @@ -0,0 +1,35 @@ +package com.bsd.pjcloud.wallet.api.constant; + +import cn.hutool.core.util.ObjectUtil; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import java.util.Arrays; + +/** + * 发票审核状态 + */ +@Getter +@AllArgsConstructor +public enum WalletInvoiceStatusCheckEnum { + UNCHECK("1", "未审核"), + FOREIGN("2", "审核成功"), + REFUND("3", "撤回"), + ; + private final String code; + + private final String desc; + + + public static WalletInvoiceStatusCheckEnum descOf(String description) { + return Arrays.stream(WalletInvoiceStatusCheckEnum.values()) + .filter(v -> ObjectUtil.equal(v.getDesc(), description)) + .findFirst().get(); + } + + public static WalletInvoiceStatusCheckEnum codeOf(String code) { + return Arrays.stream(WalletInvoiceStatusCheckEnum.values()) + .filter(v -> ObjectUtil.equal(v.getCode(), code)) + .findFirst().get(); + } +} diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRechargeInvoiceStatusEnum.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRechargeInvoiceStatusEnum.java index ae6548b24..943e10f07 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRechargeInvoiceStatusEnum.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/constant/WalletRechargeInvoiceStatusEnum.java @@ -29,7 +29,7 @@ public enum WalletRechargeInvoiceStatusEnum { .findFirst().get(); } - public static WalletRechargeInvoiceStatusEnum codeOf(String code) { + public static WalletRechargeInvoiceStatusEnum codeOf(String code) { return Arrays.stream(WalletRechargeInvoiceStatusEnum.values()) .filter(v -> ObjectUtil.equal(v.getCode(), code)) .findFirst().get(); diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeInvoiceEntity.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeInvoiceEntity.java index 5f40881e6..4d0fefd53 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeInvoiceEntity.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/entity/recharge/WalletRechargeInvoiceEntity.java @@ -99,6 +99,12 @@ public class WalletRechargeInvoiceEntity extends Model wrapper = new MPJLambdaWrapper() .selectAll(WalletForeignEntity.class) .eqIfExists(WalletForeignEntity::getProcessStatus, dto.getProcessStatus()) + .eqIfExists(WalletForeignEntity::getUserId, dto.getUserId()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletForeignEntity::getDeptId, dto.getDeptIds()) .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletForeignEntity::getUserId, dto.getUserIds()) .ne(!dto.getIsFindUsed(), WalletForeignEntity::getCount, WalletForeignEntity::getUseCount) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletStrideMapper.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletStrideMapper.java index 097909fac..5697fed3d 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletStrideMapper.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/WalletStrideMapper.java @@ -22,6 +22,7 @@ public interface WalletStrideMapper extends PjcloudBaseMapper wrapper = new MPJLambdaWrapper() .selectAll(WalletStrideEntity.class) .eqIfExists(WalletStrideEntity::getProcessStatus, dto.getProcessStatus()) + .eqIfExists(WalletStrideEntity::getUserId, dto.getUserId()) .in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletStrideEntity::getDeptId, dto.getDeptIds()) .in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletStrideEntity::getUserId, dto.getUserIds()) .ne(!dto.getIsFindUsed(), WalletForeignEntity::getCount, WalletForeignEntity::getUseCount) diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeInvoiceService.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeInvoiceService.java index c87133ce2..e8451e46d 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeInvoiceService.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/WalletRechargeInvoiceService.java @@ -43,6 +43,11 @@ public interface WalletRechargeInvoiceService extends IService