From b3280cf2a3530c71fd8648d7d84f473a8873f322 Mon Sep 17 00:00:00 2001 From: tianfeng <769204422@qq.com> Date: Tue, 16 Dec 2025 17:44:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E6=96=B0=E5=A2=9Eadmin=5Fsal?= =?UTF-8?q?ary=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/service/app/user/UserBankBalanceBackServiceImpl.java | 2 +- .../circle/wallet/app/command/bank/UserBankWithdrawCmdExe.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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())