hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet用户工资账户整改

Browse Source
This commit is contained in:
tianfeng 2025-11-18 17:40:35 +08:00
parent 6a4786e30c
commit 5027bc943d
26 changed files with 759 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rc-service/rc-inner-api/wallet-inner/wallet-inner-api/src/main/java/com/red/circle/wallet/inner/endpoint/salary/api/UserSalaryAccountClientApi.java
View File

@ -24,7 +24,7 @@ public interface UserSalaryAccountClientApi {
* 查询余额. * 查询余额.
*/ */
@GetMapping("/balance") @GetMapping("/balance")
ResultResponse<SalaryAccountBalanceDTO> getBalance(@RequestParam("userId") Long userId); ResultResponse<SalaryAccountBalanceDTO> getBalance(@RequestParam("userId") Long userId, @RequestParam("salaryType") String salaryType);
/** /**
* 发放工资. * 发放工资.
@ -33,10 +33,10 @@ public interface UserSalaryAccountClientApi {
ResultResponse<SalaryIssueResultDTO> issueSalary(@RequestBody SalaryIssueInnerCmd cmd); ResultResponse<SalaryIssueResultDTO> issueSalary(@RequestBody SalaryIssueInnerCmd cmd);
/** /**
* 提现. * 提现回退
*/ */
@PostMapping("/withdraw") @PostMapping("/withdraw-refund")
ResultResponse<Void> withdrawSalary(@RequestBody SalaryWithdrawInnerCmd cmd); ResultResponse<Void> withdrawRefund(@RequestBody SalaryWithdrawInnerCmd cmd);
/** /**
* 查询流水. * 查询流水.

18
rc-service/rc-service-console/console-application/src/main/java/com/red/circle/console/app/service/app/user/UserBankBalanceBackServiceImpl.java
View File

@ -28,9 +28,7 @@ import com.red.circle.framework.core.response.CommonErrorCode;
import com.red.circle.framework.core.response.ResponseErrorCode; import com.red.circle.framework.core.response.ResponseErrorCode;
import com.red.circle.other.inner.asserts.user.UserErrorCode; import com.red.circle.other.inner.asserts.user.UserErrorCode;
import com.red.circle.other.inner.endpoint.user.region.UserRegionClient; import com.red.circle.other.inner.endpoint.user.region.UserRegionClient;
import com.red.circle.other.inner.endpoint.user.user.SysUserProfileClient;
import com.red.circle.other.inner.endpoint.user.user.UserProfileClient; import com.red.circle.other.inner.endpoint.user.user.UserProfileClient;
import com.red.circle.other.inner.enums.team.TeamPolicyTypeEnum;
import com.red.circle.other.inner.model.cmd.user.UserRegionConfigMapCmd; import com.red.circle.other.inner.model.cmd.user.UserRegionConfigMapCmd;
import com.red.circle.other.inner.model.dto.user.UserProfileDTO; import com.red.circle.other.inner.model.dto.user.UserProfileDTO;
import com.red.circle.other.inner.model.dto.user.reigon.RegionConfigDTO; import com.red.circle.other.inner.model.dto.user.reigon.RegionConfigDTO;
@ -47,6 +45,7 @@ import com.red.circle.wallet.inner.endpoint.bank.UserBankCardClient;
import com.red.circle.wallet.inner.endpoint.bank.UserBankRunningWaterClient; import com.red.circle.wallet.inner.endpoint.bank.UserBankRunningWaterClient;
import com.red.circle.wallet.inner.endpoint.diamond.SalaryDiamondBalanceClient; import com.red.circle.wallet.inner.endpoint.diamond.SalaryDiamondBalanceClient;
import com.red.circle.wallet.inner.endpoint.diamond.SalaryDiamondRunningWaterClient; import com.red.circle.wallet.inner.endpoint.diamond.SalaryDiamondRunningWaterClient;
import com.red.circle.wallet.inner.endpoint.salary.UserSalaryAccountClient;
import com.red.circle.wallet.inner.error.BankErrorCode; import com.red.circle.wallet.inner.error.BankErrorCode;
import com.red.circle.wallet.inner.error.WalletErrorCode; import com.red.circle.wallet.inner.error.WalletErrorCode;
import com.red.circle.wallet.inner.model.cmd.*; import com.red.circle.wallet.inner.model.cmd.*;
@ -94,6 +93,7 @@ public class UserBankBalanceBackServiceImpl implements UserBankBalanceBackServic
private final IUserBaseInfoService userBaseInfoService; private final IUserBaseInfoService userBaseInfoService;
private final SysUserBankBalanceService userBankBalanceService; private final SysUserBankBalanceService userBankBalanceService;
private final SysUserBankRunningWaterService userBankRunningWaterService; private final SysUserBankRunningWaterService userBankRunningWaterService;
private final UserSalaryAccountClient userSalaryAccountClient;
@ -818,13 +818,17 @@ public class UserBankBalanceBackServiceImpl implements UserBankBalanceBackServic
) )
); );
// 如果是驳回则将金额还给用户银行卡账户且插入返还日志 if (WithdrawMoneyApprovalProcessStatus.NOT_PASS.equals(status)) {
if (Objects.isNull(apply.getAmountType())) {
saveUserBankBalance(param, apply);
} else if (Objects.equals(apply.getAmountType(), TeamPolicyTypeEnum.SALARY_DIAMOND.name())){
saveUserBankDiamondBalance(param, apply);
} }
// 如果是驳回则将金额还给用户银行卡账户且插入返还日志
// if (Objects.isNull(apply.getAmountType())) {
// saveUserBankBalance(param, apply);
// } else if (Objects.equals(apply.getAmountType(), TeamPolicyTypeEnum.SALARY_DIAMOND.name())){
// saveUserBankDiamondBalance(param, apply);
// }
} }
@Override @Override

7
rc-service/rc-service-wallet/wallet-adapter/src/main/java/com/red/circle/wallet/adapter/app/BankRestController.java
View File

@ -84,12 +84,7 @@ public class BankRestController extends BaseController {
} }
/** /**
* 提现. * 用户工资提现（扣除用户工资账户）
*
* @eo.name 提现.
* @eo.url /withdraw
* @eo.method post
* @eo.request-type json
*/ */
@PostMapping("/withdraw") @PostMapping("/withdraw")
public UserBankWithdrawResultCO withdraw(@RequestBody @Validated UserBankWithdrawCmd cmd) { public UserBankWithdrawResultCO withdraw(@RequestBody @Validated UserBankWithdrawCmd cmd) {

57
rc-service/rc-service-wallet/wallet-adapter/src/main/java/com/red/circle/wallet/adapter/app/SalaryAccountRestController.java
View File

@ -3,13 +3,10 @@ package com.red.circle.wallet.adapter.app;
import com.red.circle.common.business.dto.cmd.AppExtCommand; import com.red.circle.common.business.dto.cmd.AppExtCommand;
import com.red.circle.framework.dto.PageResult; import com.red.circle.framework.dto.PageResult;
import com.red.circle.framework.web.controller.BaseController; import com.red.circle.framework.web.controller.BaseController;
import com.red.circle.wallet.app.dto.clientobject.SalaryAccountBalanceCO; import com.red.circle.wallet.app.dto.clientobject.*;
import com.red.circle.wallet.app.dto.clientobject.SalaryIssueResultCO; import com.red.circle.wallet.app.dto.cmd.*;
import com.red.circle.wallet.app.dto.clientobject.SalaryRunningWaterCO;
import com.red.circle.wallet.app.dto.cmd.SalaryIssueCmd;
import com.red.circle.wallet.app.dto.cmd.SalaryRunningWaterQueryCmd;
import com.red.circle.wallet.app.dto.cmd.SalaryWithdrawCmd;
import com.red.circle.wallet.app.service.SalaryAccountService; import com.red.circle.wallet.app.service.SalaryAccountService;
import com.red.circle.wallet.domain.salary.SalaryType;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@ -31,30 +28,60 @@ public class SalaryAccountRestController extends BaseController {
/** /**
* 查询余额. * 查询余额.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @return 余额信息
*/ */
@GetMapping("/balance") @GetMapping("/balance")
public SalaryAccountBalanceCO getBalance(AppExtCommand cmd) { public SalaryAccountBalanceCO getBalance(AppExtCommand cmd, String salaryType) {
return salaryAccountService.getBalance(cmd.getReqUserId()); return salaryAccountService.getBalance(cmd.getReqUserId(), salaryType);
} }
/** /**
* 发放工资. * 发放工资.
*
* @param cmd 发放命令
* @return 发放结果
*/ */
@PostMapping("/issue") @PostMapping("/issue")
public SalaryIssueResultCO issueSalary(@RequestBody @Validated SalaryIssueCmd cmd) { public SalaryIssueResultCO issueSalary(@RequestBody @Validated SalaryIssueCmd cmd) {
return salaryAccountService.issueSalary(cmd); return salaryAccountService.issueSalary(cmd);
} }
/** /**
* 提现. * 转账到金币.
*/ *
@PostMapping("/withdraw") * @eo.name 转账到金币.
public void withdrawSalary(@RequestBody @Validated SalaryWithdrawCmd cmd) { * @eo.url /transferGold
salaryAccountService.withdrawSalary(cmd); * @eo.method post
} * @eo.request-type json
*/
@PostMapping("/transferGold")
public UserBankWithdrawResultCO transferGold(
@RequestBody @Validated SalaryWithdrawCmd cmd) {
return salaryAccountService.transferGold(cmd);
}
/**
* 兑换金币.
*
* @eo.name 兑换金币.
* @eo.url /exchange/gold
* @eo.method post
* @eo.request-type json
*/
@PostMapping("/exchange/gold")
public UserBankExchangeGoldResultCO exchangeGold(
@RequestBody @Validated SalaryWithdrawCmd cmd) {
return salaryAccountService.exchangeGold(cmd);
}
/** /**
* 查询流水. * 查询流水.
*
* @param cmd 查询命令
* @return 流水列表
*/ */
@GetMapping("/running-water") @GetMapping("/running-water")
public PageResult<SalaryRunningWaterCO> queryRunningWater(@Validated SalaryRunningWaterQueryCmd cmd) { public PageResult<SalaryRunningWaterCO> queryRunningWater(@Validated SalaryRunningWaterQueryCmd cmd) {

68
rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/bank/UserBankWithdrawCmdExe.java
View File

@ -19,20 +19,20 @@ import com.red.circle.tool.core.text.StringUtils;
import com.red.circle.tool.core.tuple.PennyAmount; import com.red.circle.tool.core.tuple.PennyAmount;
import com.red.circle.wallet.app.dto.clientobject.UserBankWithdrawResultCO; import com.red.circle.wallet.app.dto.clientobject.UserBankWithdrawResultCO;
import com.red.circle.wallet.app.dto.cmd.UserBankWithdrawCmd; import com.red.circle.wallet.app.dto.cmd.UserBankWithdrawCmd;
import com.red.circle.wallet.domain.gateway.SalaryAccountGateway;
import com.red.circle.wallet.domain.salary.SalaryEvent;
import com.red.circle.wallet.domain.salary.SalaryReceipt;
import com.red.circle.wallet.domain.salary.SalaryReceiptRes;
import com.red.circle.wallet.domain.salary.SalaryType;
import com.red.circle.wallet.infra.database.cache.service.WalletBankCacheService; import com.red.circle.wallet.infra.database.cache.service.WalletBankCacheService;
import com.red.circle.wallet.infra.database.mongo.dto.UserBankWithdrawMoneyApprovalProcess; import com.red.circle.wallet.infra.database.mongo.dto.UserBankWithdrawMoneyApprovalProcess;
import com.red.circle.wallet.infra.database.mongo.dto.WithdrawMoneyApprovalProcessStatus; import com.red.circle.wallet.infra.database.mongo.dto.WithdrawMoneyApprovalProcessStatus;
import com.red.circle.wallet.infra.database.mongo.entity.bank.UserBankCard; import com.red.circle.wallet.infra.database.mongo.entity.bank.UserBankCard;
import com.red.circle.wallet.infra.database.mongo.entity.bank.UserBankRunningWater;
import com.red.circle.wallet.infra.database.mongo.entity.bank.UserBankWithdrawMoneyApply; import com.red.circle.wallet.infra.database.mongo.entity.bank.UserBankWithdrawMoneyApply;
import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankBalanceService;
import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankCardService; import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankCardService;
import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankRunningWaterService;
import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankWithdrawMoneyApplyService; import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankWithdrawMoneyApplyService;
import com.red.circle.wallet.inner.error.BankErrorCode; import com.red.circle.wallet.inner.error.BankErrorCode;
import com.red.circle.wallet.inner.error.WalletErrorCode; import com.red.circle.wallet.inner.error.WalletErrorCode;
import com.red.circle.wallet.inner.model.dto.BankBalanceDTO;
import com.red.circle.wallet.inner.model.enums.UserBankWaterEvent;
import com.red.circle.wallet.inner.model.enums.WithdrawMethod; import com.red.circle.wallet.inner.model.enums.WithdrawMethod;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.math.RoundingMode; import java.math.RoundingMode;
@ -53,35 +53,43 @@ public class UserBankWithdrawCmdExe {
private final RedisService redisService; private final RedisService redisService;
private final RegionConfigClient regionConfigClient; private final RegionConfigClient regionConfigClient;
private final UserBankCardService userBankCardService; private final UserBankCardService userBankCardService;
private final UserBankBalanceService userBankBalanceService;
private final WalletBankCacheService walletBankCacheService; private final WalletBankCacheService walletBankCacheService;
private final RegionAssistConfigClient regionAssistConfigClient; private final RegionAssistConfigClient regionAssistConfigClient;
private final UserBankRunningWaterService userBankRunningWaterService;
private final UserBankWithdrawMoneyApplyService userBankWithdrawMoneyApplyService; private final UserBankWithdrawMoneyApplyService userBankWithdrawMoneyApplyService;
private final SalaryAccountGateway salaryAccountGateway;
public UserBankWithdrawResultCO execute(UserBankWithdrawCmd cmd) { public UserBankWithdrawResultCO execute(UserBankWithdrawCmd cmd) {
ResponseAssert.isTrue(ResponseErrorCode.REQUEST_PARAMETER_ERROR, ResponseAssert.isTrue(ResponseErrorCode.REQUEST_PARAMETER_ERROR, ArithmeticUtils.gtZero(cmd.getAmount()));
ArithmeticUtils.gtZero(cmd.getAmount()));
//
// ResponseAssert.isFalse(CommonErrorCode.MSG_REPEAT_PROCESSING,
// walletBankCacheService.checkMonthWithdrawal(cmd.requiredReqUserId()));
// 上锁 // 上锁
String key = "UBWithdraw:" + cmd.requiredReqUserId(); String key = "UBWithdraw:" + cmd.requiredReqUserId();
ResponseAssert.isTrue(CommonErrorCode.REQUEST_LIMITING, redisService.lock(key, 60)); ResponseAssert.isTrue(CommonErrorCode.REQUEST_LIMITING, redisService.lock(key, 60));
BankBalanceDTO balance = userBankBalanceService.getBalance(cmd.requiredReqUserId()); SalaryType salaryType = SalaryType.BD_SALARY;
ResponseAssert.isTrue(WalletErrorCode.INSUFFICIENT_BALANCE, PennyAmount availableBalance = salaryAccountGateway.getAvailableBalance(cmd.getReqUserId(), salaryType);
ArithmeticUtils.gte(balance.getAccurateBalance(), cmd.getAmount())); BigDecimal balance = availableBalance.getDollarAmount();
// 3. 校验提现金额
ResponseAssert.isTrue(WalletErrorCode.INSUFFICIENT_BALANCE, ArithmeticUtils.gte(balance, cmd.getAmount()));
UserBankCard bankCard = userBankCardService.getById(cmd.getAcceptBankCardId()); UserBankCard bankCard = userBankCardService.getById(cmd.getAcceptBankCardId());
ResponseAssert.notNull(BankErrorCode.BANK_CARD_NOT_FOUND, bankCard); ResponseAssert.notNull(BankErrorCode.BANK_CARD_NOT_FOUND, bankCard);
// 扣钱 // 扣钱
BankBalanceDTO decrUserBankBalanceDTO = userBankBalanceService.decr(cmd.requiredReqUserId(), SalaryReceipt receipt = new SalaryReceipt()
PennyAmount.ofDollar(cmd.getAmount())); .setReceiptType(ReceiptType.EXPENDITURE)
ResponseAssert.notNull(WalletErrorCode.INSUFFICIENT_BALANCE, decrUserBankBalanceDTO); .setUserId(cmd.getReqUserId())
.setSysOrigin(cmd.getReqSysOrigin().getOrigin())
.setSalaryType(salaryType)
.setSalaryEvent(SalaryEvent.WITHDRAW)
.setAmount(PennyAmount.ofDollar(cmd.getAmount()))
.setTrackId(IdWorkerUtils.getIdStr())
.setEventDesc("提现")
.setOpUserType(OpUserType.APP)
.setOpUserId(cmd.getReqUserId());
SalaryReceiptRes salaryReceiptRes = salaryAccountGateway.changeBalance(receipt);
ResponseAssert.notNull(WalletErrorCode.INSUFFICIENT_BALANCE, salaryReceiptRes);
Long bankRunWaterId = IdWorkerUtils.getId(); Long bankRunWaterId = IdWorkerUtils.getId();
Long applyId = IdWorkerUtils.getId(); Long applyId = IdWorkerUtils.getId();
@ -90,28 +98,6 @@ public class UserBankWithdrawCmdExe {
Long serviceCharge = getAssistDiamondConfig(cmd.requiredReqUserId()); Long serviceCharge = getAssistDiamondConfig(cmd.requiredReqUserId());
BigDecimal actualAmount = getActualAmount(cmd.getAmount(), serviceCharge); BigDecimal actualAmount = getActualAmount(cmd.getAmount(), serviceCharge);
// 银行卡流水
userBankRunningWaterService.add(
new UserBankRunningWater()
.setId(bankRunWaterId)
.setUserId(cmd.requiredReqUserId())
.setSysOrigin(cmd.requireReqSysOrigin())
.setType(ReceiptType.EXPENDITURE.getType())
.setAmount(cmd.getAmount())
.setServiceCharge(serviceCharge)
.setActualAmount(actualAmount)
.setEvent(UserBankWaterEvent.WITHDRAW.name())
.setEventDescribe(UserBankWaterEvent.WITHDRAW.getDescribe())
.setRemark("Cash withdrawal")
.setTrackId(applyId.toString())
.setBalance(decrUserBankBalanceDTO.getAccurateBalance())
.setCreateTime(TimestampUtils.now())
.setUpdateTime(TimestampUtils.now())
.setCreateUser(cmd.requiredReqUserId())
.setCreateUserOrigin(OpUserType.APP.getType())
);
// 申请详情 // 申请详情
userBankWithdrawMoneyApplyService.add( userBankWithdrawMoneyApplyService.add(
new UserBankWithdrawMoneyApply() new UserBankWithdrawMoneyApply()
@ -142,7 +128,7 @@ public class UserBankWithdrawCmdExe {
walletBankCacheService.setMonthWithdrawal(cmd.requiredReqUserId()); walletBankCacheService.setMonthWithdrawal(cmd.requiredReqUserId());
redisService.unlock(key); redisService.unlock(key);
return new UserBankWithdrawResultCO() return new UserBankWithdrawResultCO()
.setBankBalance(decrUserBankBalanceDTO.getAccurateBalance()) .setBankBalance(salaryReceiptRes.getAvailableBalance().getDollarAmount())
.setWithdrawAmount(Objects.toString(cmd.getAmount())); .setWithdrawAmount(Objects.toString(cmd.getAmount()));
} }

223
rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/SalaryExchangeGoldCmdExe.java Normal file
View File

@ -0,0 +1,223 @@
package com.red.circle.wallet.app.command.salary;
import com.red.circle.common.business.core.enums.OpUserType;
import com.red.circle.common.business.core.enums.ReceiptType;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.framework.core.asserts.ResponseAssert;
import com.red.circle.framework.core.response.CommonErrorCode;
import com.red.circle.framework.core.response.ResponseErrorCode;
import com.red.circle.framework.dto.ResultResponse;
import com.red.circle.order.inner.endpoint.UserFreightRechargeRecordClient;
import com.red.circle.order.inner.endpoint.UserRechargeCountClient;
import com.red.circle.order.inner.model.enums.MonthlyRechargeType;
import com.red.circle.other.inner.endpoint.team.target.UserBillDiamondBalanceClient;
import com.red.circle.other.inner.endpoint.user.region.UserRegionClient;
import com.red.circle.other.inner.endpoint.user.user.UserSvipClient;
import com.red.circle.other.inner.model.dto.agency.agency.BillDiamondBalanceDTO;
import com.red.circle.other.inner.model.dto.user.SysExchangeGoldTipDTO;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.num.ArithmeticUtils;
import com.red.circle.tool.core.sequence.IdWorkerUtils;
import com.red.circle.tool.core.tuple.PennyAmount;
import com.red.circle.wallet.app.convertor.SalaryAccountConvertor;
import com.red.circle.wallet.app.dto.clientobject.UserBankExchangeGoldResultCO;
import com.red.circle.wallet.app.dto.cmd.SalaryWithdrawCmd;
import com.red.circle.wallet.app.dto.cmd.UserBankExchangeGoldCmd;
import com.red.circle.wallet.app.dto.cmd.UserBillExchangeGoldCmd;
import com.red.circle.wallet.app.service.SalaryAccountService;
import com.red.circle.wallet.domain.gateway.SalaryAccountGateway;
import com.red.circle.wallet.domain.gateway.WalletGoldGateway;
import com.red.circle.wallet.domain.salary.SalaryReceipt;
import com.red.circle.wallet.domain.salary.SalaryReceiptRes;
import com.red.circle.wallet.domain.salary.SalaryType;
import com.red.circle.wallet.domain.wallet.WalletReceipt;
import com.red.circle.wallet.infra.database.mongo.entity.bank.UserBankRunningWater;
import com.red.circle.wallet.infra.database.mongo.entity.bank.UserBankWithdrawGoldApply;
import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankBalanceService;
import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankRunningWaterService;
import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankWithdrawGoldApplyService;
import com.red.circle.wallet.infra.database.rds.entity.diamond.SalaryDiamondBalance;
import com.red.circle.wallet.infra.database.rds.entity.diamond.SalaryDiamondRunningWater;
import com.red.circle.wallet.infra.database.rds.entity.freight.FreightBalanceRunningWater;
import com.red.circle.wallet.infra.database.rds.service.diamond.SalaryDiamondBalanceService;
import com.red.circle.wallet.infra.database.rds.service.diamond.SalaryDiamondRunningWaterService;
import com.red.circle.wallet.infra.database.rds.service.freight.FreightBalanceRunningWaterService;
import com.red.circle.wallet.infra.database.rds.service.freight.FreightBalanceService;
import com.red.circle.wallet.inner.error.WalletErrorCode;
import com.red.circle.wallet.inner.model.dto.BankBalanceDTO;
import com.red.circle.wallet.inner.model.enums.FreightBalanceOrigin;
import com.red.circle.wallet.inner.model.enums.GoldOrigin;
import com.red.circle.wallet.inner.model.enums.GoldWithdrawAcceptAccount;
import com.red.circle.wallet.inner.model.enums.UserBankWaterEvent;
import lombok.RequiredArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 用户工资余额兑换金币.
*/
@Component
@RequiredArgsConstructor
public class SalaryExchangeGoldCmdExe {
private static final Logger log = LoggerFactory.getLogger(SalaryExchangeGoldCmdExe.class);
private final RedisService redisService;
private final UserRegionClient userRegionClient;
private final WalletGoldGateway walletGoldGateway;
private final FreightBalanceService freightBalanceService;
private final UserFreightRechargeRecordClient userFreightRechargeRecordClient;
private final UserBankWithdrawGoldApplyService userBankWithdrawGoldApplyService;
private final FreightBalanceRunningWaterService freightBalanceRunningWaterService;
private final UserRechargeCountClient userRechargeCountClient;
private final SalaryAccountGateway salaryAccountGateway;
private final SalaryAccountConvertor salaryAccountConvertor;
public UserBankExchangeGoldResultCO execute(SalaryWithdrawCmd cmd) {
ResponseAssert.isTrue(ResponseErrorCode.REQUEST_PARAMETER_ERROR,
ArithmeticUtils.gtZero(cmd.getAmount()));
String key = "USEGold:" + cmd.getReqUserId();
ResponseAssert.isTrue(CommonErrorCode.REQUEST_LIMITING, redisService.lock(key, 60));
BigDecimal balance = salaryAccountGateway.getAvailableBalance(cmd.getReqUserId(), SalaryType.BD_SALARY).getDollarAmount();
ResponseAssert.isFalse(WalletErrorCode.INSUFFICIENT_BALANCE,
!ArithmeticUtils.gte(balance, cmd.getAmount()));
boolean freight = freightBalanceService.existsBalance(cmd.getReqUserId());
// 获得区域兑换比例金币比例
Double goldRatio = getExchangeGoldRatio(cmd);
// 扣钱
SalaryReceipt receipt = salaryAccountConvertor.toExchangeReceipt(cmd);
SalaryReceiptRes salaryReceiptRes = salaryAccountGateway.changeBalance(receipt);
ResponseAssert.notNull(WalletErrorCode.INSUFFICIENT_BALANCE, salaryReceiptRes);
BigDecimal goldQuantity = BigDecimal.valueOf(goldRatio).multiply(cmd.getAmount()).setScale(0, RoundingMode.DOWN);
Long bankRunWaterId = IdWorkerUtils.getId();
Long applyId = IdWorkerUtils.getId();
// 申请详情
userBankWithdrawGoldApplyService.add(
new UserBankWithdrawGoldApply()
.setId(applyId)
.setSysOrigin(cmd.getReqSysOrigin().getOrigin())
.setAcceptAccount((freight
? GoldWithdrawAcceptAccount.FREIGHT
: GoldWithdrawAcceptAccount.GOLD).name())
.setAcceptUserId(cmd.getReqUserId())
.setSubmitUserId(cmd.getReqUserId())
.setAmount(cmd.getAmount())
.setGoldQuantity(goldQuantity.stripTrailingZeros().toPlainString())
.setExchangeRate(Objects.toString(goldRatio))
.setCreateTime(TimestampUtils.now())
.setUpdateTime(TimestampUtils.now())
.setCreateUser(cmd.getReqUserId())
.setUpdateUser(cmd.getReqUserId())
.setCreateUserOrigin(OpUserType.APP.getType())
.setUpdateUserOrigin(OpUserType.APP.getType())
);
sendGold(cmd, freight, goldQuantity, bankRunWaterId, "银行卡兑换");
// 记录充值金额
rechargeRecord(cmd);
userRechargeCountClient.count( cmd.getReqUserId(),
cmd.getAmount(),
MonthlyRechargeType.SHIPPING_AGENT
);
redisService.unlock(key);
return new UserBankExchangeGoldResultCO()
.setBankBalance(salaryReceiptRes.getAvailableBalance().getDollarAmount())
.setExchangeGold(Objects.toString(goldRatio));
}
private void rechargeRecord(SalaryWithdrawCmd cmd) {
userFreightRechargeRecordClient.inrNowMonthAmount(
cmd.getReqUserId(),
cmd.getAmount()
);
}
/**
* 获得1$兑换多少金币比例， 基于区域+用户输入的美元.
*
* @return 1美元可获得的金币数量.
*/
private Double getExchangeGoldRatio(SalaryWithdrawCmd cmd) {
boolean freight = freightBalanceService.existsBalance(cmd.getReqUserId());
List<SysExchangeGoldTipDTO> exchangeGolds = ResponseAssert.requiredSuccess(
userRegionClient
.listRegionExchangeGoldTip(cmd.getReqUserId(), freight)
);
ResponseAssert.notEmpty(CommonErrorCode.CONFIGURATION_ERROR, exchangeGolds);
exchangeGolds = exchangeGolds.stream().filter(gold ->
cmd.getAmount().compareTo(BigDecimal.valueOf(gold.getStart())) >= 0 &&
cmd.getAmount().compareTo(BigDecimal.valueOf(gold.getEnd())) <= 0)
.collect(Collectors.toList());
ResponseAssert.notEmpty(CommonErrorCode.CONFIGURATION_ERROR, exchangeGolds);
SysExchangeGoldTipDTO exchangeGold = exchangeGolds.get(0);
ResponseAssert.notNull(CommonErrorCode.CONFIGURATION_ERROR, exchangeGold);
ResponseAssert.isFalse(CommonErrorCode.CONFIGURATION_ERROR,
Objects.isNull(exchangeGold.getValue()) || exchangeGold.getValue() <= 0);
return exchangeGold.getValue();
}
private void sendGold(SalaryWithdrawCmd cmd, boolean freight, BigDecimal goldQuantity,
Long bankRunWaterId, String remark) {
if (freight) {
// 货运代理入账
ResponseAssert.isTrue(CommonErrorCode.OPERATING_FAILURE,
freightBalanceService
.incrCandyBalance(SysOriginPlatformEnum.valueOf(cmd.getReqSysOrigin().getOrigin()),
cmd.getReqUserId(), goldQuantity));
// 插入流水
BigDecimal freightBalance = freightBalanceService.getAvailableBalance(
cmd.getReqUserId());
freightBalanceRunningWaterService.save(new FreightBalanceRunningWater()
.setSysOrigin(cmd.getReqSysOrigin().getOrigin())
.setUserId(cmd.getReqUserId())
.setAcceptUserId(cmd.getReqUserId())
.setType(ReceiptType.INCOME.getType())
.setQuantity(goldQuantity)
.setUsdQuantity(cmd.getAmount())
.setBalance(freightBalance)
.setOrigin(FreightBalanceOrigin.PURCHASE.name())
.setRemark(remark)
.withCreateUser(cmd.getReqUserId()));
return;
}
// 金币入账
walletGoldGateway.changeBalance(new WalletReceipt()
.setReqTraceId(cmd.getReqTraceId())
.setReceiptType(ReceiptType.INCOME)
.setUserId(cmd.getReqUserId())
.setSysOrigin(cmd.getReqSysOrigin().getOrigin())
.setEventType(Objects.toString(GoldOrigin.BANK_GOLD_COIN_EXCHANGE))
.setEventDesc(GoldOrigin.BANK_GOLD_COIN_EXCHANGE.getDesc())
.setEventId(Objects.toString(bankRunWaterId))
.setAmount(PennyAmount.ofDollar(goldQuantity.longValue()))
.setOpUserType(OpUserType.APP)
.setCreateTime(cmd.getReqTime())
);
}
}

176
rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/SalaryTransferGoldCmdExe.java Normal file
View File

@ -0,0 +1,176 @@
package com.red.circle.wallet.app.command.salary;
import com.red.circle.common.business.core.enums.OpUserType;
import com.red.circle.common.business.core.enums.ReceiptType;
import com.red.circle.common.business.core.enums.SysOriginPlatformEnum;
import com.red.circle.component.redis.service.RedisService;
import com.red.circle.framework.core.asserts.ResponseAssert;
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.UserRegionClient;
import com.red.circle.other.inner.model.dto.user.SysExchangeGoldTipDTO;
import com.red.circle.tool.core.date.TimestampUtils;
import com.red.circle.tool.core.num.ArithmeticUtils;
import com.red.circle.tool.core.sequence.IdWorkerUtils;
import com.red.circle.tool.core.tuple.PennyAmount;
import com.red.circle.wallet.app.convertor.SalaryAccountConvertor;
import com.red.circle.wallet.app.dto.clientobject.UserBankWithdrawResultCO;
import com.red.circle.wallet.app.dto.cmd.SalaryWithdrawCmd;
import com.red.circle.wallet.app.dto.cmd.UserBankWithdrawTransferCmd;
import com.red.circle.wallet.domain.gateway.SalaryAccountGateway;
import com.red.circle.wallet.domain.gateway.WalletGoldGateway;
import com.red.circle.wallet.domain.salary.SalaryReceipt;
import com.red.circle.wallet.domain.salary.SalaryReceiptRes;
import com.red.circle.wallet.domain.salary.SalaryType;
import com.red.circle.wallet.domain.wallet.WalletReceipt;
import com.red.circle.wallet.infra.database.mongo.entity.bank.UserBankRunningWater;
import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankBalanceService;
import com.red.circle.wallet.infra.database.mongo.service.bank.UserBankRunningWaterService;
import com.red.circle.wallet.infra.database.rds.entity.freight.FreightBalanceRunningWater;
import com.red.circle.wallet.infra.database.rds.service.freight.FreightBalanceRunningWaterService;
import com.red.circle.wallet.infra.database.rds.service.freight.FreightBalanceService;
import com.red.circle.wallet.inner.error.WalletErrorCode;
import com.red.circle.wallet.inner.model.dto.BankBalanceDTO;
import com.red.circle.wallet.inner.model.enums.FreightBalanceOrigin;
import com.red.circle.wallet.inner.model.enums.GoldOrigin;
import com.red.circle.wallet.inner.model.enums.UserBankWaterEvent;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 用户工资转账到金币命令执行器
*
* @author system
*/
@Component
@RequiredArgsConstructor
public class SalaryTransferGoldCmdExe {
private final RedisService redisService;
private final UserBankBalanceService userBankBalanceService;
private final UserBankRunningWaterService userBankRunningWaterService;
private final WalletGoldGateway walletGoldGateway;
private final FreightBalanceService freightBalanceService;
private final UserRegionClient userRegionClient;
private final FreightBalanceRunningWaterService freightBalanceRunningWaterService;
private final SalaryAccountGateway salaryAccountGateway;
private final SalaryAccountConvertor salaryAccountConvertor;
/**
* 执行转账到金币操作
*
* @param cmd 转账命令
* @return 转账结果
*/
public UserBankWithdrawResultCO execute(SalaryWithdrawCmd cmd) {
ResponseAssert.isTrue(ResponseErrorCode.REQUEST_PARAMETER_ERROR,
ArithmeticUtils.gtZero(cmd.getAmount()));
boolean freight = freightBalanceService.existsBalance(cmd.getAcceptUserId());
ResponseAssert.isTrue(WalletErrorCode.TARGET_USER_NOT_RECHARGE_AGENCY, freight);
ResponseAssert.isTrue(WalletErrorCode.NOT_TRANSFER_YOURSELF, !Objects.equals(cmd.getAcceptUserId(), cmd.requiredReqUserId()));
// 上锁
String key = "USTransferGold:" + cmd.requiredReqUserId();
ResponseAssert.isTrue(CommonErrorCode.REQUEST_LIMITING, redisService.lock(key, 60));
BigDecimal balance = salaryAccountGateway.getAvailableBalance(cmd.getReqUserId(), SalaryType.BD_SALARY).getDollarAmount();
ResponseAssert.isTrue(WalletErrorCode.INSUFFICIENT_BALANCE,
ArithmeticUtils.gte(balance, cmd.getAmount()));
// 获得区域兑换比例金币比例
Double goldRatio = getExchangeGoldRatio(cmd);
// 扣钱
SalaryReceipt receipt = salaryAccountConvertor.toTransferReceipt(cmd);
SalaryReceiptRes salaryReceiptRes = salaryAccountGateway.changeBalance(receipt);
ResponseAssert.notNull(WalletErrorCode.INSUFFICIENT_BALANCE, salaryReceiptRes);
Long bankRunWaterId = IdWorkerUtils.getId();
BigDecimal goldQuantity = BigDecimal.valueOf(goldRatio).multiply(cmd.getAmount()).setScale(0, RoundingMode.DOWN);
// 发送金额
sendGold(cmd, freight, goldQuantity, bankRunWaterId, "转账金币");
redisService.unlock(key);
return new UserBankWithdrawResultCO()
.setBankBalance(salaryReceiptRes.getAvailableBalance().getDollarAmount())
.setWithdrawAmount(Objects.toString(cmd.getAmount()));
}
private void sendGold(SalaryWithdrawCmd cmd, boolean freight, BigDecimal goldQuantity,
Long bankRunWaterId, String remark) {
if (freight) {
// 货运代理入账
ResponseAssert.isTrue(CommonErrorCode.OPERATING_FAILURE,
freightBalanceService
.incrCandyBalance(SysOriginPlatformEnum.valueOf(cmd.getReqSysOrigin().getOrigin()),
cmd.getAcceptUserId(), goldQuantity));
// 插入流水
BigDecimal freightBalance = freightBalanceService.getAvailableBalance(cmd.getAcceptUserId());
freightBalanceRunningWaterService.save(new FreightBalanceRunningWater()
.setSysOrigin(cmd.getReqSysOrigin().getOrigin())
.setUserId(cmd.getReqUserId())
.setAcceptUserId(cmd.getAcceptUserId())
.setType(ReceiptType.INCOME.getType())
.setQuantity(goldQuantity)
.setUsdQuantity(cmd.getAmount())
.setBalance(freightBalance)
.setOrigin(FreightBalanceOrigin.PURCHASE.name())
.setRemark(remark)
.withCreateUser(cmd.getReqUserId()));
return;
}
// 金币入账
walletGoldGateway.changeBalance(new WalletReceipt()
.setReqTraceId(cmd.getReqTraceId())
.setReceiptType(ReceiptType.INCOME)
.setUserId(cmd.getAcceptUserId())
.setSysOrigin(cmd.getReqSysOrigin().getOrigin())
.setEventType(Objects.toString(GoldOrigin.BANK_GOLD_COIN_TRANSFER))
.setEventDesc(GoldOrigin.BANK_GOLD_COIN_TRANSFER.getDesc())
.setEventId(Objects.toString(bankRunWaterId))
.setAmount(PennyAmount.ofDollar(goldQuantity.longValue()))
.setOpUserType(OpUserType.APP)
.setCreateTime(cmd.getReqTime())
);
}
/**
* 获得1$兑换多少金币比例， 基于区域+用户输入的美元.
*
* @return 1美元可获得的金币数量.
*/
private Double getExchangeGoldRatio(SalaryWithdrawCmd cmd) {
Long acceptUserId = cmd.getAcceptUserId();
boolean freight = freightBalanceService.existsBalance(acceptUserId);
List<SysExchangeGoldTipDTO> exchangeGolds = ResponseAssert.requiredSuccess(
userRegionClient.listRegionExchangeGoldTip(acceptUserId, freight));
ResponseAssert.notEmpty(CommonErrorCode.CONFIGURATION_ERROR, exchangeGolds);
exchangeGolds = exchangeGolds.stream().filter(gold ->
cmd.getAmount().compareTo(BigDecimal.valueOf(gold.getStart())) >= 0 &&
cmd.getAmount().compareTo(BigDecimal.valueOf(gold.getEnd())) <= 0)
.collect(Collectors.toList());
ResponseAssert.notEmpty(CommonErrorCode.CONFIGURATION_ERROR, exchangeGolds);
SysExchangeGoldTipDTO exchangeGold = exchangeGolds.get(0);
ResponseAssert.notNull(CommonErrorCode.CONFIGURATION_ERROR, exchangeGold);
ResponseAssert.isFalse(CommonErrorCode.CONFIGURATION_ERROR,
Objects.isNull(exchangeGold.getValue()) || exchangeGold.getValue() <= 0);
return exchangeGold.getValue();
}
}

8
rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/SalaryWithdrawCmdExe.java → rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/SalaryWithdrawRefundCmdExe.java
View File

@ -3,7 +3,6 @@ package com.red.circle.wallet.app.command.salary;
import com.red.circle.wallet.app.convertor.SalaryAccountConvertor; import com.red.circle.wallet.app.convertor.SalaryAccountConvertor;
import com.red.circle.wallet.app.dto.cmd.SalaryWithdrawCmd; import com.red.circle.wallet.app.dto.cmd.SalaryWithdrawCmd;
import com.red.circle.wallet.domain.gateway.SalaryAccountGateway; import com.red.circle.wallet.domain.gateway.SalaryAccountGateway;
import com.red.circle.wallet.domain.salary.SalaryReceipt;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -12,13 +11,14 @@ import org.springframework.stereotype.Component;
*/ */
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
public class SalaryWithdrawCmdExe { public class SalaryWithdrawRefundCmdExe {
private final SalaryAccountGateway salaryAccountGateway; private final SalaryAccountGateway salaryAccountGateway;
private final SalaryAccountConvertor salaryAccountConvertor; private final SalaryAccountConvertor salaryAccountConvertor;
public void execute(SalaryWithdrawCmd cmd) { public void execute(SalaryWithdrawCmd cmd) {
SalaryReceipt receipt = salaryAccountConvertor.toWithdrawReceipt(cmd); // 提现回退
salaryAccountGateway.changeBalance(receipt);
} }
} }

10
rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/salary/query/SalaryAccountBalanceQryExe.java
View File

@ -1,9 +1,8 @@
package com.red.circle.wallet.app.command.salary.query; package com.red.circle.wallet.app.command.salary.query;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.red.circle.wallet.app.convertor.SalaryAccountConvertor; import com.red.circle.wallet.app.convertor.SalaryAccountConvertor;
import com.red.circle.wallet.app.dto.clientobject.SalaryAccountBalanceCO; import com.red.circle.wallet.app.dto.clientobject.SalaryAccountBalanceCO;
import com.red.circle.wallet.domain.salary.SalaryType;
import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance; import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance;
import com.red.circle.wallet.infra.database.rds.service.salary.SalaryAccountBalanceService; import com.red.circle.wallet.infra.database.rds.service.salary.SalaryAccountBalanceService;
import java.math.BigDecimal; import java.math.BigDecimal;
@ -21,15 +20,14 @@ public class SalaryAccountBalanceQryExe {
private final SalaryAccountBalanceService salaryAccountBalanceService; private final SalaryAccountBalanceService salaryAccountBalanceService;
private final SalaryAccountConvertor salaryAccountConvertor; private final SalaryAccountConvertor salaryAccountConvertor;
public SalaryAccountBalanceCO execute(Long userId) { public SalaryAccountBalanceCO execute(Long userId, SalaryType salaryType) {
LambdaQueryWrapper<SalaryAccountBalance> eq = Wrappers.lambdaQuery(SalaryAccountBalance.class) SalaryAccountBalance balance = salaryAccountBalanceService.getByUserIdAndType(userId, salaryType);
.eq(SalaryAccountBalance::getUserId, userId);
SalaryAccountBalance balance = salaryAccountBalanceService.getOne(eq);
if (Objects.isNull(balance)) { if (Objects.isNull(balance)) {
// 账户不存在，返回空余额 // 账户不存在，返回空余额
SalaryAccountBalanceCO co = new SalaryAccountBalanceCO(); SalaryAccountBalanceCO co = new SalaryAccountBalanceCO();
co.setUserId(userId); co.setUserId(userId);
co.setSalaryType(salaryType.getCode());
co.setEarnPoints(BigDecimal.ZERO); co.setEarnPoints(BigDecimal.ZERO);
co.setConsumptionPoints(BigDecimal.ZERO); co.setConsumptionPoints(BigDecimal.ZERO);
co.setBalance(BigDecimal.ZERO); co.setBalance(BigDecimal.ZERO);

65
rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/convertor/SalaryAccountConvertor.java
View File

@ -2,7 +2,7 @@ package com.red.circle.wallet.app.convertor;
import com.red.circle.common.business.core.enums.OpUserType; import com.red.circle.common.business.core.enums.OpUserType;
import com.red.circle.common.business.core.enums.ReceiptType; import com.red.circle.common.business.core.enums.ReceiptType;
import com.red.circle.tool.core.date.ZonedDateTimeAsiaRiyadhUtils; import com.red.circle.tool.core.sequence.IdWorkerUtils;
import com.red.circle.tool.core.tuple.PennyAmount; import com.red.circle.tool.core.tuple.PennyAmount;
import com.red.circle.wallet.app.dto.clientobject.SalaryAccountBalanceCO; import com.red.circle.wallet.app.dto.clientobject.SalaryAccountBalanceCO;
import com.red.circle.wallet.app.dto.clientobject.SalaryIssueResultCO; import com.red.circle.wallet.app.dto.clientobject.SalaryIssueResultCO;
@ -16,9 +16,8 @@ import com.red.circle.wallet.domain.salary.SalaryType;
import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance; import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance;
import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountRunningWater; import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountRunningWater;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.ZoneId;
import java.util.Objects; import java.util.Objects;
import com.red.circle.wallet.infra.util.TimeConvertUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
@ -49,29 +48,61 @@ public class SalaryAccountConvertor {
public SalaryReceipt toWithdrawReceipt(SalaryWithdrawCmd cmd) { public SalaryReceipt toWithdrawReceipt(SalaryWithdrawCmd cmd) {
SalaryReceipt receipt = new SalaryReceipt() SalaryReceipt receipt = new SalaryReceipt()
.setReceiptType(ReceiptType.EXPENDITURE) .setReceiptType(ReceiptType.EXPENDITURE)
.setUserId(cmd.getUserId()) .setUserId(cmd.getReqUserId())
.setSysOrigin(cmd.getReqSysOrigin().getOrigin()) .setSysOrigin(cmd.getReqSysOrigin().getOrigin())
.setSalaryType(SalaryType.BD_SALARY) .setSalaryType(SalaryType.of(cmd.getSalaryType()))
.setSalaryEvent(SalaryEvent.WITHDRAW) .setSalaryEvent(SalaryEvent.WITHDRAW)
.setAmount(PennyAmount.ofDollar(cmd.getAmount())) .setAmount(PennyAmount.ofDollar(cmd.getAmount()))
.setTrackId(cmd.getTrackId()) .setTrackId(IdWorkerUtils.getIdStr())
.setEventDesc("提现") .setEventDesc("提现")
.setRemark(cmd.getRemark()) .setRemark(cmd.getRemark())
.setOpUserType(OpUserType.APP) .setOpUserType(OpUserType.APP)
.setOpUserId(cmd.getReqUserId()); .setOpUserId(cmd.getReqUserId());
if (Objects.nonNull(cmd.getServiceCharge()) && cmd.getServiceCharge() > 0) { // if (Objects.nonNull(cmd.getServiceCharge()) && cmd.getServiceCharge() > 0) {
receipt.setServiceCharge(cmd.getServiceCharge()); // receipt.setServiceCharge(cmd.getServiceCharge());
BigDecimal chargeRate = new BigDecimal(cmd.getServiceCharge()).divide(new BigDecimal("1000")); // BigDecimal chargeRate = new BigDecimal(cmd.getServiceCharge()).divide(new BigDecimal("1000"));
BigDecimal actualAmount = cmd.getAmount().multiply(BigDecimal.ONE.subtract(chargeRate)); // BigDecimal actualAmount = cmd.getAmount().multiply(BigDecimal.ONE.subtract(chargeRate));
receipt.setActualAmount(PennyAmount.ofDollar(actualAmount)); // receipt.setActualAmount(PennyAmount.ofDollar(actualAmount));
} else { // } else {
receipt.setActualAmount(PennyAmount.ofDollar(cmd.getAmount())); // receipt.setActualAmount(PennyAmount.ofDollar(cmd.getAmount()));
} // }
return receipt; return receipt;
} }
public SalaryReceipt toExchangeReceipt(SalaryWithdrawCmd cmd) {
SalaryReceipt receipt = new SalaryReceipt()
.setReceiptType(ReceiptType.EXPENDITURE)
.setUserId(cmd.getReqUserId())
.setSysOrigin(cmd.getReqSysOrigin().getOrigin())
.setSalaryType(SalaryType.of(cmd.getSalaryType()))
.setSalaryEvent(SalaryEvent.SALARY_EXCHANGE)
.setAmount(PennyAmount.ofDollar(cmd.getAmount()))
.setTrackId(IdWorkerUtils.getIdStr())
.setEventDesc(SalaryEvent.SALARY_EXCHANGE.getDesc())
.setRemark(cmd.getRemark())
.setOpUserType(OpUserType.APP)
.setOpUserId(cmd.getReqUserId());
return receipt;
}
public SalaryReceipt toTransferReceipt(SalaryWithdrawCmd cmd) {
SalaryReceipt receipt = new SalaryReceipt()
.setReceiptType(ReceiptType.EXPENDITURE)
.setUserId(cmd.getReqUserId())
.setSysOrigin(cmd.getReqSysOrigin().getOrigin())
.setSalaryType(SalaryType.of(cmd.getSalaryType()))
.setSalaryEvent(SalaryEvent.SALARY_TRANSFER)
.setAmount(PennyAmount.ofDollar(cmd.getAmount()))
.setTrackId(IdWorkerUtils.getIdStr())
.setEventDesc(SalaryEvent.SALARY_TRANSFER.getDesc())
.setRemark(cmd.getRemark())
.setOpUserType(OpUserType.APP)
.setOpUserId(cmd.getReqUserId());
return receipt;
}
public SalaryIssueResultCO toIssueResultCO(SalaryReceiptRes res) { public SalaryIssueResultCO toIssueResultCO(SalaryReceiptRes res) {
SalaryIssueResultCO co = new SalaryIssueResultCO(); SalaryIssueResultCO co = new SalaryIssueResultCO();
co.setRecordId(res.getRecordId()); co.setRecordId(res.getRecordId());
@ -87,6 +118,7 @@ public class SalaryAccountConvertor {
} }
SalaryAccountBalanceCO co = new SalaryAccountBalanceCO(); SalaryAccountBalanceCO co = new SalaryAccountBalanceCO();
co.setUserId(entity.getUserId()); co.setUserId(entity.getUserId());
co.setSalaryType(entity.getSalaryType());
co.setEarnPoints(entity.getEarnPoints()); co.setEarnPoints(entity.getEarnPoints());
co.setConsumptionPoints(entity.getConsumptionPoints()); co.setConsumptionPoints(entity.getConsumptionPoints());
co.setBalance(entity.getBalance()); co.setBalance(entity.getBalance());
@ -121,7 +153,10 @@ public class SalaryAccountConvertor {
co.setBdId(entity.getBdId()); co.setBdId(entity.getBdId());
co.setAgentId(entity.getAgentId()); co.setAgentId(entity.getAgentId());
co.setRemark(entity.getRemark()); co.setRemark(entity.getRemark());
co.setCreatedAt(TimeConvertUtils.toLocalDateTime(entity.getCreateTime())); if (Objects.nonNull(entity.getCreateTime())) {
co.setCreatedAt(entity.getCreateTime().toInstant()
.atZone(ZoneId.systemDefault()).toLocalDateTime());
}
return co; return co;
} }
} }

35
rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/service/SalaryAccountServiceImpl.java
View File

@ -1,16 +1,15 @@
package com.red.circle.wallet.app.service; package com.red.circle.wallet.app.service;
import com.red.circle.framework.dto.PageResult; import com.red.circle.framework.dto.PageResult;
import com.red.circle.wallet.app.command.salary.SalaryExchangeGoldCmdExe;
import com.red.circle.wallet.app.command.salary.SalaryIssueCmdExe; import com.red.circle.wallet.app.command.salary.SalaryIssueCmdExe;
import com.red.circle.wallet.app.command.salary.SalaryWithdrawCmdExe; import com.red.circle.wallet.app.command.salary.SalaryTransferGoldCmdExe;
import com.red.circle.wallet.app.command.salary.SalaryWithdrawRefundCmdExe;
import com.red.circle.wallet.app.command.salary.query.SalaryAccountBalanceQryExe; import com.red.circle.wallet.app.command.salary.query.SalaryAccountBalanceQryExe;
import com.red.circle.wallet.app.command.salary.query.SalaryRunningWaterQryExe; import com.red.circle.wallet.app.command.salary.query.SalaryRunningWaterQryExe;
import com.red.circle.wallet.app.dto.clientobject.SalaryAccountBalanceCO; import com.red.circle.wallet.app.dto.clientobject.*;
import com.red.circle.wallet.app.dto.clientobject.SalaryIssueResultCO; import com.red.circle.wallet.app.dto.cmd.*;
import com.red.circle.wallet.app.dto.clientobject.SalaryRunningWaterCO; import com.red.circle.wallet.domain.salary.SalaryType;
import com.red.circle.wallet.app.dto.cmd.SalaryIssueCmd;
import com.red.circle.wallet.app.dto.cmd.SalaryRunningWaterQueryCmd;
import com.red.circle.wallet.app.dto.cmd.SalaryWithdrawCmd;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -24,11 +23,13 @@ public class SalaryAccountServiceImpl implements SalaryAccountService {
private final SalaryAccountBalanceQryExe salaryAccountBalanceQryExe; private final SalaryAccountBalanceQryExe salaryAccountBalanceQryExe;
private final SalaryRunningWaterQryExe salaryRunningWaterQryExe; private final SalaryRunningWaterQryExe salaryRunningWaterQryExe;
private final SalaryIssueCmdExe salaryIssueCmdExe; private final SalaryIssueCmdExe salaryIssueCmdExe;
private final SalaryWithdrawCmdExe salaryWithdrawCmdExe; private final SalaryWithdrawRefundCmdExe salaryWithdrawRefundCmdExe;
private final SalaryExchangeGoldCmdExe salaryExchangeGoldCmdExe;
private final SalaryTransferGoldCmdExe salaryTransferGoldCmdExe;
@Override @Override
public SalaryAccountBalanceCO getBalance(Long userId) { public SalaryAccountBalanceCO getBalance(Long userId, String salaryType) {
return salaryAccountBalanceQryExe.execute(userId); return salaryAccountBalanceQryExe.execute(userId, SalaryType.of(salaryType));
} }
@Override @Override
@ -37,12 +38,22 @@ public class SalaryAccountServiceImpl implements SalaryAccountService {
} }
@Override @Override
public void withdrawSalary(SalaryWithdrawCmd cmd) { public void withdrawRefund(SalaryWithdrawCmd cmd) {
salaryWithdrawCmdExe.execute(cmd); salaryWithdrawRefundCmdExe.execute(cmd);
} }
@Override @Override
public PageResult<SalaryRunningWaterCO> queryRunningWater(SalaryRunningWaterQueryCmd cmd) { public PageResult<SalaryRunningWaterCO> queryRunningWater(SalaryRunningWaterQueryCmd cmd) {
return salaryRunningWaterQryExe.execute(cmd); return salaryRunningWaterQryExe.execute(cmd);
} }
@Override
public UserBankWithdrawResultCO transferGold(SalaryWithdrawCmd cmd) {
return salaryTransferGoldCmdExe.execute(cmd);
}
@Override
public UserBankExchangeGoldResultCO exchangeGold(SalaryWithdrawCmd cmd) {
return salaryExchangeGoldCmdExe.execute(cmd);
}
} }

5
rc-service/rc-service-wallet/wallet-client/src/main/java/com/red/circle/wallet/app/dto/clientobject/SalaryAccountBalanceCO.java
View File

@ -15,6 +15,11 @@ public class SalaryAccountBalanceCO {
*/ */
private Long userId; private Long userId;
/**
* 工资类型.
*/
private String salaryType;
/** /**
* 累计收入. * 累计收入.
*/ */

17
rc-service/rc-service-wallet/wallet-client/src/main/java/com/red/circle/wallet/app/dto/cmd/SalaryWithdrawCmd.java
View File

@ -16,10 +16,10 @@ import lombok.EqualsAndHashCode;
public class SalaryWithdrawCmd extends AppExtCommand { public class SalaryWithdrawCmd extends AppExtCommand {
/** /**
* 用户ID. * 工资类型.
*/ */
@NotNull(message = "userId required.") @NotBlank(message = "salaryType required.")
private Long userId; private String salaryType;
/** /**
* 提现金额. * 提现金额.
@ -28,16 +28,15 @@ public class SalaryWithdrawCmd extends AppExtCommand {
@DecimalMin(value = "0.01", message = "amount must > 0") @DecimalMin(value = "0.01", message = "amount must > 0")
private BigDecimal amount; private BigDecimal amount;
/** /**
* 业务单号. * 接收用户(Transfer 使用)
*/ */
@NotBlank(message = "trackId required.") private Long acceptUserId;
private String trackId;
/** /**
* 手续费比例（千分比）. * 手续费比例（千分比）.
*/ */
private Long serviceCharge; // private Long serviceCharge;
/** /**
* 备注. * 备注.

30
rc-service/rc-service-wallet/wallet-client/src/main/java/com/red/circle/wallet/app/service/SalaryAccountService.java
View File

@ -1,12 +1,8 @@
package com.red.circle.wallet.app.service; package com.red.circle.wallet.app.service;
import com.red.circle.framework.dto.PageResult; import com.red.circle.framework.dto.PageResult;
import com.red.circle.wallet.app.dto.clientobject.SalaryAccountBalanceCO; import com.red.circle.wallet.app.dto.clientobject.*;
import com.red.circle.wallet.app.dto.clientobject.SalaryIssueResultCO; import com.red.circle.wallet.app.dto.cmd.*;
import com.red.circle.wallet.app.dto.clientobject.SalaryRunningWaterCO;
import com.red.circle.wallet.app.dto.cmd.SalaryIssueCmd;
import com.red.circle.wallet.app.dto.cmd.SalaryRunningWaterQueryCmd;
import com.red.circle.wallet.app.dto.cmd.SalaryWithdrawCmd;
/** /**
* 工资账户服务. * 工资账户服务.
@ -15,21 +11,37 @@ public interface SalaryAccountService {
/** /**
* 查询余额. * 查询余额.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @return 余额信息
*/ */
SalaryAccountBalanceCO getBalance(Long userId); SalaryAccountBalanceCO getBalance(Long userId, String salaryType);
/** /**
* 发放工资. * 发放工资.
*
* @param cmd 发放命令
* @return 发放结果
*/ */
SalaryIssueResultCO issueSalary(SalaryIssueCmd cmd); SalaryIssueResultCO issueSalary(SalaryIssueCmd cmd);
/** /**
* 提现. * 提现回退
*
* @param cmd 提现命令
*/ */
void withdrawSalary(SalaryWithdrawCmd cmd); void withdrawRefund(SalaryWithdrawCmd cmd);
/** /**
* 查询流水. * 查询流水.
*
* @param cmd 查询命令
* @return 流水列表
*/ */
PageResult<SalaryRunningWaterCO> queryRunningWater(SalaryRunningWaterQueryCmd cmd); PageResult<SalaryRunningWaterCO> queryRunningWater(SalaryRunningWaterQueryCmd cmd);
UserBankWithdrawResultCO transferGold(SalaryWithdrawCmd cmd);
UserBankExchangeGoldResultCO exchangeGold(SalaryWithdrawCmd cmd);
} }

7
rc-service/rc-service-wallet/wallet-domain/src/main/java/com/red/circle/wallet/domain/gateway/SalaryAccountGateway.java
View File

@ -3,6 +3,7 @@ package com.red.circle.wallet.domain.gateway;
import com.red.circle.tool.core.tuple.PennyAmount; import com.red.circle.tool.core.tuple.PennyAmount;
import com.red.circle.wallet.domain.salary.SalaryReceipt; import com.red.circle.wallet.domain.salary.SalaryReceipt;
import com.red.circle.wallet.domain.salary.SalaryReceiptRes; import com.red.circle.wallet.domain.salary.SalaryReceiptRes;
import com.red.circle.wallet.domain.salary.SalaryType;
/** /**
* 工资账户 Gateway. * 工资账户 Gateway.
@ -13,17 +14,19 @@ public interface SalaryAccountGateway {
* 查询余额. * 查询余额.
* *
* @param userId 用户ID * @param userId 用户ID
* @param salaryType 工资类型
* @return 余额 * @return 余额
*/ */
PennyAmount getBalance(Long userId); PennyAmount getBalance(Long userId, SalaryType salaryType);
/** /**
* 查询可用余额. * 查询可用余额.
* *
* @param userId 用户ID * @param userId 用户ID
* @param salaryType 工资类型
* @return 可用余额 * @return 可用余额
*/ */
PennyAmount getAvailableBalance(Long userId); PennyAmount getAvailableBalance(Long userId, SalaryType salaryType);
/** /**
* 变更余额. * 变更余额.

12
rc-service/rc-service-wallet/wallet-domain/src/main/java/com/red/circle/wallet/domain/salary/SalaryEvent.java
View File

@ -25,7 +25,17 @@ public enum SalaryEvent {
*/ */
WITHDRAW("WITHDRAW", "提现"), WITHDRAW("WITHDRAW", "提现"),
/** /**
* 兑换
*/
SALARY_EXCHANGE("SALARY_EXCHANGE", "工资兑换"),
/**
* 兑换
*/
SALARY_TRANSFER("SALARY_TRANSFER", "工资转账"),
/**
* 提现退回. * 提现退回.
*/ */
WITHDRAW_REFUND("WITHDRAW_REFUND", "提现退回"), WITHDRAW_REFUND("WITHDRAW_REFUND", "提现退回"),

40
rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/dao/salary/SalaryAccountBalanceDAO.java
View File

@ -1,35 +1,57 @@
package com.red.circle.wallet.infra.database.rds.dao.salary; package com.red.circle.wallet.infra.database.rds.dao.salary;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.red.circle.framework.mybatis.dao.BaseDAO; import com.red.circle.framework.mybatis.dao.BaseDAO;
import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance; import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
/** /**
* 工资账户余额 Mapper. * 工资账户余额 DAO.
*/ */
public interface SalaryAccountBalanceDAO extends BaseDAO<SalaryAccountBalance> { public interface SalaryAccountBalanceDAO extends BaseDAO<SalaryAccountBalance> {
/** /**
* 增加收入（累计）. * 增加收入（累计）.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @param amount 金额（分）
* @return 影响行数
*/ */
int incrIncome(@Param("userId") Long userId, @Param("amount") Long amount); int incrIncome(@Param("userId") Long userId, @Param("salaryType") String salaryType,
@Param("amount") Long amount);
/** /**
* 增加支出（累计）. * 增加支出（累计）.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @param amount 金额（分）
* @return 影响行数
*/ */
int incrExpenditure(@Param("userId") Long userId, @Param("amount") Long amount); int incrExpenditure(@Param("userId") Long userId, @Param("salaryType") String salaryType,
@Param("amount") Long amount);
/** /**
* 冻结金额. * 冻结金额.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @param amount 金额（分）
* @param version 版本号
* @return 影响行数
*/ */
int freezeAmount(@Param("userId") Long userId, @Param("amount") Long amount, int freezeAmount(@Param("userId") Long userId, @Param("salaryType") String salaryType,
@Param("version") Integer version); @Param("amount") Long amount, @Param("version") Integer version);
/** /**
* 解冻金额. * 解冻金额.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @param amount 金额（分）
* @param version 版本号
* @return 影响行数
*/ */
int unfreezeAmount(@Param("userId") Long userId, @Param("amount") Long amount, int unfreezeAmount(@Param("userId") Long userId, @Param("salaryType") String salaryType,
@Param("version") Integer version); @Param("amount") Long amount, @Param("version") Integer version);
} }

2
rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/entity/salary/SalaryAccountBalance.java
View File

@ -35,6 +35,8 @@ public class SalaryAccountBalance {
@TableField("user_id") @TableField("user_id")
private Long userId; private Long userId;
private String salaryType;
/** /**
* 系统来源. * 系统来源.
*/ */

58
rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/salary/SalaryAccountBalanceService.java
View File

@ -1,6 +1,7 @@
package com.red.circle.wallet.infra.database.rds.service.salary; package com.red.circle.wallet.infra.database.rds.service.salary;
import com.red.circle.framework.mybatis.service.BaseService; import com.red.circle.framework.mybatis.service.BaseService;
import com.red.circle.wallet.domain.salary.SalaryType;
import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance; import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance;
/** /**
@ -10,36 +11,79 @@ public interface SalaryAccountBalanceService extends BaseService<SalaryAccountBa
/** /**
* 初始化账户. * 初始化账户.
*
* @param sysOrigin 系统来源
* @param userId 用户ID
* @param salaryType 工资类型
*/ */
void init(String sysOrigin, Long userId); void init(String sysOrigin, Long userId, SalaryType salaryType);
/** /**
* 查询余额（分）. * 查询余额（分）.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @return 余额（分）
*/ */
Long getBalance(Long userId); Long getBalance(Long userId, SalaryType salaryType);
/** /**
* 查询可用余额（分）. * 查询可用余额（分）.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @return 可用余额（分）
*/ */
Long getAvailableBalance(Long userId); Long getAvailableBalance(Long userId, SalaryType salaryType);
/** /**
* 增加收入. * 增加收入.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @param amount 金额（分）
* @return 是否成功
*/ */
boolean incrIncome(Long userId, Long amount); boolean incrIncome(Long userId, SalaryType salaryType, Long amount);
/** /**
* 增加支出. * 增加支出.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @param amount 金额（分）
* @return 是否成功
*/ */
boolean incrExpenditure(Long userId, Long amount); boolean incrExpenditure(Long userId, SalaryType salaryType, Long amount);
/** /**
* 冻结金额. * 冻结金额.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @param amount 金额（分）
* @param version 版本号
* @return 是否成功
*/ */
boolean freezeAmount(Long userId, Long amount, Integer version); boolean freezeAmount(Long userId, SalaryType salaryType, Long amount, Integer version);
/** /**
* 解冻金额. * 解冻金额.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @param amount 金额（分）
* @param version 版本号
* @return 是否成功
*/ */
boolean unfreezeAmount(Long userId, Long amount, Integer version); boolean unfreezeAmount(Long userId, SalaryType salaryType, Long amount, Integer version);
/**
* 根据用户ID和工资类型查询账户.
*
* @param userId 用户ID
* @param salaryType 工资类型
* @return 账户信息
*/
SalaryAccountBalance getByUserIdAndType(Long userId, SalaryType salaryType);
} }

43
rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/salary/impl/SalaryAccountBalanceServiceImpl.java
View File

@ -2,9 +2,9 @@ package com.red.circle.wallet.infra.database.rds.service.salary.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.red.circle.framework.mybatis.service.impl.BaseServiceImpl; import com.red.circle.framework.mybatis.service.impl.BaseServiceImpl;
import com.red.circle.tool.core.sequence.IdWorkerUtils; import com.red.circle.tool.core.sequence.IdWorkerUtils;
import com.red.circle.wallet.domain.salary.SalaryType;
import com.red.circle.wallet.infra.database.rds.dao.salary.SalaryAccountBalanceDAO; import com.red.circle.wallet.infra.database.rds.dao.salary.SalaryAccountBalanceDAO;
import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance; import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance;
import com.red.circle.wallet.infra.database.rds.service.salary.SalaryAccountBalanceService; import com.red.circle.wallet.infra.database.rds.service.salary.SalaryAccountBalanceService;
@ -22,13 +22,14 @@ public class SalaryAccountBalanceServiceImpl
extends BaseServiceImpl<SalaryAccountBalanceDAO, SalaryAccountBalance> extends BaseServiceImpl<SalaryAccountBalanceDAO, SalaryAccountBalance>
implements SalaryAccountBalanceService { implements SalaryAccountBalanceService {
private final SalaryAccountBalanceDAO salaryAccountBalanceDAO; private final SalaryAccountBalanceDAO salaryAccountBalanceDAO;
@Override @Override
public void init(String sysOrigin, Long userId) { public void init(String sysOrigin, Long userId, SalaryType salaryType) {
SalaryAccountBalance balance = new SalaryAccountBalance() SalaryAccountBalance balance = new SalaryAccountBalance()
.setId(IdWorkerUtils.getId()) .setId(IdWorkerUtils.getId())
.setUserId(userId) .setUserId(userId)
.setSalaryType(salaryType.getCode())
.setSysOrigin(sysOrigin) .setSysOrigin(sysOrigin)
.setEarnPoints(BigDecimal.ZERO) .setEarnPoints(BigDecimal.ZERO)
.setConsumptionPoints(BigDecimal.ZERO) .setConsumptionPoints(BigDecimal.ZERO)
@ -40,10 +41,8 @@ public class SalaryAccountBalanceServiceImpl
} }
@Override @Override
public Long getBalance(Long userId) { public Long getBalance(Long userId, SalaryType salaryType) {
LambdaQueryWrapper<SalaryAccountBalance> eq = Wrappers.lambdaQuery(SalaryAccountBalance.class) SalaryAccountBalance balance = getByUserIdAndType(userId, salaryType);
.eq(SalaryAccountBalance::getUserId, userId);
SalaryAccountBalance balance = getOne(eq);
if (Objects.isNull(balance)) { if (Objects.isNull(balance)) {
return 0L; return 0L;
} }
@ -51,10 +50,8 @@ public class SalaryAccountBalanceServiceImpl
} }
@Override @Override
public Long getAvailableBalance(Long userId) { public Long getAvailableBalance(Long userId, SalaryType salaryType) {
LambdaQueryWrapper<SalaryAccountBalance> eq = Wrappers.lambdaQuery(SalaryAccountBalance.class) SalaryAccountBalance balance = getByUserIdAndType(userId, salaryType);
.eq(SalaryAccountBalance::getUserId, userId);
SalaryAccountBalance balance = getOne(eq);
if (Objects.isNull(balance)) { if (Objects.isNull(balance)) {
return 0L; return 0L;
} }
@ -62,22 +59,30 @@ public class SalaryAccountBalanceServiceImpl
} }
@Override @Override
public boolean incrIncome(Long userId, Long amount) { public boolean incrIncome(Long userId, SalaryType salaryType, Long amount) {
return salaryAccountBalanceDAO.incrIncome(userId, amount) > 0; return salaryAccountBalanceDAO.incrIncome(userId, salaryType.getCode(), amount) > 0;
} }
@Override @Override
public boolean incrExpenditure(Long userId, Long amount) { public boolean incrExpenditure(Long userId, SalaryType salaryType, Long amount) {
return salaryAccountBalanceDAO.incrExpenditure(userId, amount) > 0; return salaryAccountBalanceDAO.incrExpenditure(userId, salaryType.getCode(), amount) > 0;
} }
@Override @Override
public boolean freezeAmount(Long userId, Long amount, Integer version) { public boolean freezeAmount(Long userId, SalaryType salaryType, Long amount, Integer version) {
return salaryAccountBalanceDAO.freezeAmount(userId, amount, version) > 0; return salaryAccountBalanceDAO.freezeAmount(userId, salaryType.getCode(), amount, version) > 0;
} }
@Override @Override
public boolean unfreezeAmount(Long userId, Long amount, Integer version) { public boolean unfreezeAmount(Long userId, SalaryType salaryType, Long amount, Integer version) {
return salaryAccountBalanceDAO.unfreezeAmount(userId, amount, version) > 0; return salaryAccountBalanceDAO.unfreezeAmount(userId, salaryType.getCode(), amount, version) > 0;
}
@Override
public SalaryAccountBalance getByUserIdAndType(Long userId, SalaryType salaryType) {
LambdaQueryWrapper<SalaryAccountBalance> wrapper = Wrappers.lambdaQuery(SalaryAccountBalance.class)
.eq(SalaryAccountBalance::getUserId, userId)
.eq(SalaryAccountBalance::getSalaryType, salaryType.getCode());
return getOne(wrapper);
} }
} }

39
rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/gateway/SalaryAccountGatewayImpl.java
View File

@ -11,6 +11,7 @@ import com.red.circle.tool.core.tuple.PennyAmount;
import com.red.circle.wallet.domain.gateway.SalaryAccountGateway; import com.red.circle.wallet.domain.gateway.SalaryAccountGateway;
import com.red.circle.wallet.domain.salary.SalaryReceipt; import com.red.circle.wallet.domain.salary.SalaryReceipt;
import com.red.circle.wallet.domain.salary.SalaryReceiptRes; import com.red.circle.wallet.domain.salary.SalaryReceiptRes;
import com.red.circle.wallet.domain.salary.SalaryType;
import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance; import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountBalance;
import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountRunningWater; import com.red.circle.wallet.infra.database.rds.entity.salary.SalaryAccountRunningWater;
import com.red.circle.wallet.infra.database.rds.service.salary.SalaryAccountBalanceService; import com.red.circle.wallet.infra.database.rds.service.salary.SalaryAccountBalanceService;
@ -37,13 +38,13 @@ public class SalaryAccountGatewayImpl implements SalaryAccountGateway {
private final SalaryAccountRunningWaterService salaryAccountRunningWaterService; private final SalaryAccountRunningWaterService salaryAccountRunningWaterService;
@Override @Override
public PennyAmount getBalance(Long userId) { public PennyAmount getBalance(Long userId, SalaryType salaryType) {
return PennyAmount.ofPenny(salaryAccountBalanceService.getBalance(userId)); return PennyAmount.ofPenny(salaryAccountBalanceService.getBalance(userId, salaryType));
} }
@Override @Override
public PennyAmount getAvailableBalance(Long userId) { public PennyAmount getAvailableBalance(Long userId, SalaryType salaryType) {
return PennyAmount.ofPenny(salaryAccountBalanceService.getAvailableBalance(userId)); return PennyAmount.ofPenny(salaryAccountBalanceService.getAvailableBalance(userId, salaryType));
} }
@Override @Override
@ -54,14 +55,14 @@ public class SalaryAccountGatewayImpl implements SalaryAccountGateway {
} }
// 检查账户是否存在，不存在则初始化 // 检查账户是否存在，不存在则初始化
LambdaQueryWrapper<SalaryAccountBalance> eq = Wrappers.<SalaryAccountBalance>lambdaQuery() SalaryAccountBalance balance = salaryAccountBalanceService.getByUserIdAndType(
.eq(SalaryAccountBalance::getUserId, receipt.getUserId()); receipt.getUserId(), receipt.getSalaryType());
SalaryAccountBalance balance = salaryAccountBalanceService.getOne(eq);
if (Objects.isNull(balance)) { if (Objects.isNull(balance)) {
salaryAccountBalanceService.init(receipt.getSysOrigin(), receipt.getUserId()); salaryAccountBalanceService.init(receipt.getSysOrigin(), receipt.getUserId(),
balance = salaryAccountBalanceService.getOne(new LambdaQueryWrapper<>(SalaryAccountBalance.class) receipt.getSalaryType());
.eq(SalaryAccountBalance::getUserId, receipt.getUserId())); balance = salaryAccountBalanceService.getByUserIdAndType(
receipt.getUserId(), receipt.getSalaryType());
} }
// 更新余额 // 更新余额
@ -69,11 +70,13 @@ public class SalaryAccountGatewayImpl implements SalaryAccountGateway {
if (receipt.getReceiptType() == ReceiptType.INCOME) { if (receipt.getReceiptType() == ReceiptType.INCOME) {
updateSuccess = salaryAccountBalanceService.incrIncome( updateSuccess = salaryAccountBalanceService.incrIncome(
receipt.getUserId(), receipt.getUserId(),
receipt.getSalaryType(),
receipt.getAmount().getPennyAmount() receipt.getAmount().getPennyAmount()
); );
} else { } else {
updateSuccess = salaryAccountBalanceService.incrExpenditure( updateSuccess = salaryAccountBalanceService.incrExpenditure(
receipt.getUserId(), receipt.getUserId(),
receipt.getSalaryType(),
receipt.getAmount().getPennyAmount() receipt.getAmount().getPennyAmount()
); );
} }
@ -81,8 +84,10 @@ public class SalaryAccountGatewayImpl implements SalaryAccountGateway {
ResponseAssert.isTrue(WalletErrorCode.INSUFFICIENT_BALANCE, updateSuccess); ResponseAssert.isTrue(WalletErrorCode.INSUFFICIENT_BALANCE, updateSuccess);
// 查询更新后的余额 // 查询更新后的余额
Long newBalance = salaryAccountBalanceService.getBalance(receipt.getUserId()); Long newBalance = salaryAccountBalanceService.getBalance(receipt.getUserId(),
Long newAvailableBalance = salaryAccountBalanceService.getAvailableBalance(receipt.getUserId()); receipt.getSalaryType());
Long newAvailableBalance = salaryAccountBalanceService.getAvailableBalance(receipt.getUserId(),
receipt.getSalaryType());
// 插入流水记录 // 插入流水记录
Long recordId = IdWorkerUtils.getId(); Long recordId = IdWorkerUtils.getId();
@ -92,9 +97,9 @@ public class SalaryAccountGatewayImpl implements SalaryAccountGateway {
salaryAccountRunningWaterService.save(runningWater); salaryAccountRunningWaterService.save(runningWater);
} catch (DuplicateKeyException e) { } catch (DuplicateKeyException e) {
// 幂等性：trackId重复，查询已有记录 // 幂等性：trackId重复，查询已有记录
SalaryAccountRunningWater existingWater = salaryAccountRunningWaterService.getOne( LambdaQueryWrapper<SalaryAccountRunningWater> eq = Wrappers.lambdaQuery(SalaryAccountRunningWater.class)
new LambdaQueryWrapper<>(SalaryAccountRunningWater.class) .eq(SalaryAccountRunningWater::getTrackId, receipt.getTrackId());
.eq(SalaryAccountRunningWater::getTrackId, receipt.getTrackId())); SalaryAccountRunningWater existingWater = salaryAccountRunningWaterService.getOne(eq);
if (Objects.nonNull(existingWater)) { if (Objects.nonNull(existingWater)) {
return SalaryReceiptRes.of( return SalaryReceiptRes.of(
existingWater.getId(), existingWater.getId(),

4
rc-service/rc-service-wallet/wallet-infrastructure/src/main/resources/dao/salary/SalaryAccountBalanceDAO.xml
View File

@ -8,6 +8,7 @@
balance = balance + #{amount} / 100, balance = balance + #{amount} / 100,
available_balance = available_balance + #{amount} / 100 available_balance = available_balance + #{amount} / 100
WHERE user_id = #{userId} WHERE user_id = #{userId}
AND salary_type = #{salaryType}
</update> </update>
<update id="incrExpenditure"> <update id="incrExpenditure">
@ -16,6 +17,7 @@
balance = balance - #{amount} / 100, balance = balance - #{amount} / 100,
available_balance = available_balance - #{amount} / 100 available_balance = available_balance - #{amount} / 100
WHERE user_id = #{userId} WHERE user_id = #{userId}
AND salary_type = #{salaryType}
AND available_balance >= #{amount} / 100 AND available_balance >= #{amount} / 100
</update> </update>
@ -25,6 +27,7 @@
available_balance = available_balance - #{amount} / 100, available_balance = available_balance - #{amount} / 100,
version = version + 1 version = version + 1
WHERE user_id = #{userId} WHERE user_id = #{userId}
AND salary_type = #{salaryType}
AND version = #{version} AND version = #{version}
AND available_balance >= #{amount} / 100 AND available_balance >= #{amount} / 100
</update> </update>
@ -35,6 +38,7 @@
available_balance = available_balance + #{amount} / 100, available_balance = available_balance + #{amount} / 100,
version = version + 1 version = version + 1
WHERE user_id = #{userId} WHERE user_id = #{userId}
AND salary_type = #{salaryType}
AND version = #{version} AND version = #{version}
AND frozen_amount >= #{amount} / 100 AND frozen_amount >= #{amount} / 100
</update> </update>

3
rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/convertor/SalaryAccountInnerConvertor.java
View File

@ -50,10 +50,7 @@ public class SalaryAccountInnerConvertor {
return null; return null;
} }
SalaryWithdrawCmd cmd = new SalaryWithdrawCmd(); SalaryWithdrawCmd cmd = new SalaryWithdrawCmd();
cmd.setUserId(innerCmd.getUserId());
cmd.setAmount(innerCmd.getAmount()); cmd.setAmount(innerCmd.getAmount());
cmd.setTrackId(innerCmd.getTrackId());
cmd.setServiceCharge(innerCmd.getServiceCharge());
cmd.setRemark(innerCmd.getRemark()); cmd.setRemark(innerCmd.getRemark());
// 设置请求来源信息 // 设置请求来源信息

8
rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/endpoint/salary/UserSalaryAccountClientEndpoint.java
View File

@ -28,8 +28,8 @@ public class UserSalaryAccountClientEndpoint implements UserSalaryAccountClientA
private final UserSalaryAccountClientService userSalaryAccountClientService; private final UserSalaryAccountClientService userSalaryAccountClientService;
@Override @Override
public ResultResponse<SalaryAccountBalanceDTO> getBalance(Long userId) { public ResultResponse<SalaryAccountBalanceDTO> getBalance(Long userId, String salaryType) {
return ResultResponse.success(userSalaryAccountClientService.getBalance(userId)); return ResultResponse.success(userSalaryAccountClientService.getBalance(userId, salaryType));
} }
@Override @Override
@ -38,8 +38,8 @@ public class UserSalaryAccountClientEndpoint implements UserSalaryAccountClientA
} }
@Override @Override
public ResultResponse<Void> withdrawSalary(SalaryWithdrawInnerCmd cmd) { public ResultResponse<Void> withdrawRefund(SalaryWithdrawInnerCmd cmd) {
userSalaryAccountClientService.withdrawSalary(cmd); userSalaryAccountClientService.withdrawRefund(cmd);
return ResultResponse.success(); return ResultResponse.success();
} }

4
rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/service/salary/UserSalaryAccountClientService.java
View File

@ -16,7 +16,7 @@ public interface UserSalaryAccountClientService {
/** /**
* 查询余额. * 查询余额.
*/ */
SalaryAccountBalanceDTO getBalance(Long userId); SalaryAccountBalanceDTO getBalance(Long userId, String salaryType);
/** /**
* 发放工资. * 发放工资.
@ -26,7 +26,7 @@ public interface UserSalaryAccountClientService {
/** /**
* 提现. * 提现.
*/ */
void withdrawSalary(SalaryWithdrawInnerCmd cmd); void withdrawRefund(SalaryWithdrawInnerCmd cmd);
/** /**
* 查询流水. * 查询流水.

8
rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/service/salary/impl/UserSalaryAccountClientServiceImpl.java
View File

@ -33,8 +33,8 @@ public class UserSalaryAccountClientServiceImpl implements UserSalaryAccountClie
private final SalaryAccountInnerConvertor salaryAccountInnerConvertor; private final SalaryAccountInnerConvertor salaryAccountInnerConvertor;
@Override @Override
public SalaryAccountBalanceDTO getBalance(Long userId) { public SalaryAccountBalanceDTO getBalance(Long userId, String salaryType) {
SalaryAccountBalanceCO co = salaryAccountService.getBalance(userId); SalaryAccountBalanceCO co = salaryAccountService.getBalance(userId, salaryType);
return salaryAccountInnerConvertor.toBalanceDTO(co); return salaryAccountInnerConvertor.toBalanceDTO(co);
} }
@ -46,9 +46,9 @@ public class UserSalaryAccountClientServiceImpl implements UserSalaryAccountClie
} }
@Override @Override
public void withdrawSalary(SalaryWithdrawInnerCmd innerCmd) { public void withdrawRefund(SalaryWithdrawInnerCmd innerCmd) {
SalaryWithdrawCmd cmd = salaryAccountInnerConvertor.toWithdrawCmd(innerCmd); SalaryWithdrawCmd cmd = salaryAccountInnerConvertor.toWithdrawCmd(innerCmd);
salaryAccountService.withdrawSalary(cmd); salaryAccountService.withdrawRefund(cmd);
} }
@Override @Override