From 2ddd75f4af2f72128edcc04d28ec023f6bb0b711 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Wed, 19 Nov 2025 15:18:07 +0800 Subject: [PATCH] =?UTF-8?q?BD=E5=B7=A5=E8=B5=84=E5=85=A5=E8=B4=A6=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../red/circle/wallet/app/convertor/SalaryAccountConvertor.java | 2 +- .../java/com/red/circle/wallet/app/dto/cmd/SalaryIssueCmd.java | 2 ++ .../java/com/red/circle/wallet/domain/salary/SalaryEvent.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/convertor/SalaryAccountConvertor.java b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/convertor/SalaryAccountConvertor.java index 70c2797d..380fb930 100644 --- a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/convertor/SalaryAccountConvertor.java +++ b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/convertor/SalaryAccountConvertor.java @@ -33,7 +33,7 @@ public class SalaryAccountConvertor { .setAcceptUserId(cmd.getUserId()) .setSysOrigin(cmd.getReqSysOrigin().getOrigin()) .setSalaryType(SalaryType.of(cmd.getSalaryType())) - .setSalaryEvent(SalaryEvent.SALARY_BD) + .setSalaryEvent(SalaryEvent.of(cmd.getSalaryEvent())) .setAmount(PennyAmount.ofDollar(cmd.getAmount())) .setTrackId(cmd.getTrackId()) .setBillBelong(cmd.getBillBelong()) diff --git a/rc-service/rc-service-wallet/wallet-client/src/main/java/com/red/circle/wallet/app/dto/cmd/SalaryIssueCmd.java b/rc-service/rc-service-wallet/wallet-client/src/main/java/com/red/circle/wallet/app/dto/cmd/SalaryIssueCmd.java index b5e40531..72ea8fd0 100644 --- a/rc-service/rc-service-wallet/wallet-client/src/main/java/com/red/circle/wallet/app/dto/cmd/SalaryIssueCmd.java +++ b/rc-service/rc-service-wallet/wallet-client/src/main/java/com/red/circle/wallet/app/dto/cmd/SalaryIssueCmd.java @@ -27,6 +27,8 @@ public class SalaryIssueCmd extends AppExtCommand { @NotBlank(message = "salaryType required.") private String salaryType; + private String salaryEvent; + /** * 发放金额. */ diff --git a/rc-service/rc-service-wallet/wallet-domain/src/main/java/com/red/circle/wallet/domain/salary/SalaryEvent.java b/rc-service/rc-service-wallet/wallet-domain/src/main/java/com/red/circle/wallet/domain/salary/SalaryEvent.java index 9f57d361..69742ffe 100644 --- a/rc-service/rc-service-wallet/wallet-domain/src/main/java/com/red/circle/wallet/domain/salary/SalaryEvent.java +++ b/rc-service/rc-service-wallet/wallet-domain/src/main/java/com/red/circle/wallet/domain/salary/SalaryEvent.java @@ -12,6 +12,8 @@ public enum SalaryEvent { SALARY_BD("SALARY_BD", "BD工资"), + SALARY_BD_LEADER("SALARY_BD_LEADER", "BD_LEADER工资"), + /** * 工资调整. */