diff --git a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserBankBalanceBackServiceImpl.java b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserBankBalanceBackServiceImpl.java index 0ea1b174..5658fac1 100644 --- a/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserBankBalanceBackServiceImpl.java +++ b/rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserBankBalanceBackServiceImpl.java @@ -909,7 +909,7 @@ public class UserBankBalanceBackServiceImpl implements UserBankBalanceBackServic withdrawInnerCmd.setOpUserId(param.getUpdateUser()); withdrawInnerCmd.setSysOrigin(apply.getSysOrigin()); withdrawInnerCmd.setRemark(param.getRemark()); - withdrawInnerCmd.setSalaryType("BD_SALARY"); + withdrawInnerCmd.setSalaryType(apply.getAmountType()); withdrawInnerCmd.setAmount(apply.getAmount()); userSalaryAccountClient.withdrawRefund(withdrawInnerCmd); diff --git a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/bank/UserBankWithdrawCmdExe.java b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/bank/UserBankWithdrawCmdExe.java index c1d2fd63..fe836caa 100644 --- a/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/bank/UserBankWithdrawCmdExe.java +++ b/rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/bank/UserBankWithdrawCmdExe.java @@ -8,6 +8,7 @@ import com.red.circle.framework.core.response.CommonErrorCode; import com.red.circle.framework.core.response.ResponseErrorCode; import com.red.circle.other.inner.endpoint.user.region.RegionAssistConfigClient; import com.red.circle.other.inner.endpoint.user.region.RegionConfigClient; +import com.red.circle.other.inner.enums.team.TeamPolicyTypeEnum; import com.red.circle.other.inner.enums.user.RegionAssistTypeEnum; import com.red.circle.other.inner.model.dto.user.reigon.RegionConfigDTO; import com.red.circle.tool.core.date.TimestampUtils; @@ -108,6 +109,7 @@ public class UserBankWithdrawCmdExe { .setBankCardId(bankCard.getId()) .setBankCardType(bankCard.getCardType()) .setAmount(cmd.getAmount()) + .setAmountType(salaryType.getCode()) .setApprovalProcesses(List.of( new UserBankWithdrawMoneyApprovalProcess() .setStatus(WithdrawMoneyApprovalProcessStatus.SUBMIT.name())