红娘订单

dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/walletaccount/valueobj/WalletAccountRecord.java

@@ -32,9 +32,13 @@ public class WalletAccountRecord extends ValueObject<WalletAccountRecord> {
     @ApiModelProperty("当前金额")
     private BigDecimal currentBalance;
 
+    @ApiModelProperty("关联ID")
+    private Long associateId;
+
     @ApiModelProperty("备注")
     private String remark;
 
+
     public static WalletAccountRecord build(TradeTypeEnum tradeType,
                                             BigDecimal tradeAmount,
                                             Boolean isIncome,

dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/walletaccount/WalletAccountApplicationService.java

@@ -19,12 +19,13 @@ public class WalletAccountApplicationService {
     @Resource
     private WalletAccountAggregate walletAccountAggregate;
 
-    public void confirmWithdraw(Long walletAccountId, BigDecimal withdrawAmount) {
+    public void confirmWithdraw(Long walletAccountId, BigDecimal withdrawAmount, Long associateId) {
         WalletAccount walletAccount = walletAccountDao.selectById(walletAccountId);
         BigDecimal originalBalance = walletAccount.getTotalBalance();
         walletAccount.setFrozenBalance(walletAccount.getFrozenBalance().subtract(withdrawAmount));
         walletAccount.setTotalBalance(walletAccount.getAvailableBalance().add(walletAccount.getFrozenBalance()));
         WalletAccountRecord walletAccountRecord = WalletAccountRecord.build(TradeTypeEnum.WITHDRAW, withdrawAmount, false, originalBalance, walletAccount.getTotalBalance());
+        walletAccountRecord.setAssociateId(associateId);
         walletAccount.setRecordList(Collections.singletonList(walletAccountRecord));
         walletAccountAggregate.save(walletAccount);
     }

dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/withdrawaudit/WithdrawAuditEventHandler.java

@@ -40,7 +40,7 @@ public class WithdrawAuditEventHandler extends BaseApplicationService {
         try {
             WithdrawAudit withdrawAudit = withdrawAuditDao.selectById(event.getId());
             if (withdrawAudit.getRemitStatus()) {
-                walletAccountApplicationService.confirmWithdraw(withdrawAudit.getWalletAccountId(), withdrawAudit.getWithdrawAmount());
+                walletAccountApplicationService.confirmWithdraw(withdrawAudit.getWalletAccountId(), withdrawAudit.getWithdrawAmount(),withdrawAudit.getId());
             }
         } catch (Exception e) {
             log.error("提现申请审核事件处理异常", e);

dating-agency-mall-server/src/main/java/com/qniao/dam/domain/service/revenuereward/AcquireRevenueRewardDomainService.java

@@ -1,5 +1,6 @@
 package com.qniao.dam.domain.service.revenuereward;
 
+import cn.hutool.core.collection.CollUtil;
 import com.qniao.dam.domain.aggregate.revenuereward.RevenueRewardAggregate;
 import com.qniao.dam.domain.aggregate.revenuereward.entity.RevenueReward;
 import com.qniao.dam.domain.aggregate.walletaccount.WalletAccountAggregate;
@@ -20,6 +21,9 @@ public class AcquireRevenueRewardDomainService {
     @Transactional(rollbackFor = Exception.class)
     public void handle(RevenueReward revenueReward, WalletAccount walletAccount) {
         revenueRewardAggregate.save(revenueReward);
+        walletAccount.getRecordList().forEach(record -> {
+            record.setAssociateId(revenueReward.getRecordList().get(0).getId());
+        });
         walletAccountAggregate.save(walletAccount);
     }
 }