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工资"), + /** * 工资调整. */