玫瑰

dating-agency-mall-sdk/src/main/java/com/qniao/dam/application/request/SettleOneOnOneRtcBySdkDto.java

@@ -14,6 +14,8 @@ public class SettleOneOnOneRtcBySdkDto {
 
     private Long profitUserId;
 
+    private Boolean hasProfit;
+
     private Integer consumeBalance;
 
     private Integer consumeCount;

dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/virtualaccount/user/request/SettleOneOnOneRtcDto.java

@@ -12,6 +12,8 @@ public class SettleOneOnOneRtcDto {
 
     private Long profitUserId;
 
+    private Boolean hasProfit;
+
     private Integer consumeBalance;
 
     private Integer consumeCount;

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/virtualaccount/VirtualAccountApplicationService.java

@@ -376,7 +376,7 @@ public class VirtualAccountApplicationService extends BaseApplicationService {
         WalletAccountRecord walletAccountRecord = WalletAccountRecord.build(TradeTypeEnum.LINK_MIC_REWARD, revenue, true, originalBalance, walletAccount.getTotalBalance());
         walletAccount.setRecordList(Collections.singletonList(walletAccountRecord));
 
-        acquireRevenueRewardDomainService.handle(revenueReward,walletAccount);
+        acquireRevenueRewardDomainService.handle(revenueReward, walletAccount);
     }
 
     /**
@@ -481,12 +481,15 @@ public class VirtualAccountApplicationService extends BaseApplicationService {
                     virtualAccountAggregate.handleFrozenData(virtualAccount, dto.getConsumeBalance(), VirtualAccountTradeTypeEnum.ONE_ON_ONE_VIDEO, "与" + profitMarriageInformation.getNickName() + "1V1视频");
                 }
 
-                WalletAccount walletAccount = walletAccountQueryService.queryByType(dto.getProfitUserId(), IdentityTypeEnum.INDIVIDUAL);
-                BigDecimal income = BigDecimal.valueOf(1.5).multiply(BigDecimal.valueOf(dto.getConsumeCount()));
-                if (RtcChannelTypeEnum.ONE_ON_ONE_VOICE.equals(dto.getRtcChannelType())) {
-                    walletAccountAggregate.handleIncomeData(walletAccount, income, TradeTypeEnum.ONE_ON_ONE_VOICE, "与" + payerMarriageInformation.getNickName() + "1V1语音");
-                } else {
-                    walletAccountAggregate.handleIncomeData(walletAccount, income, TradeTypeEnum.ONE_ON_ONE_VIDEO, "与" + payerMarriageInformation.getNickName() + "1V1视频");
+                WalletAccount walletAccount = null;
+                if (dto.getHasProfit()) {
+                    walletAccount = walletAccountQueryService.queryByType(dto.getProfitUserId(), IdentityTypeEnum.INDIVIDUAL);
+                    BigDecimal income = BigDecimal.valueOf(1.5).multiply(BigDecimal.valueOf(dto.getConsumeCount()));
+                    if (RtcChannelTypeEnum.ONE_ON_ONE_VOICE.equals(dto.getRtcChannelType())) {
+                        walletAccountAggregate.handleIncomeData(walletAccount, income, TradeTypeEnum.ONE_ON_ONE_VOICE, "与" + payerMarriageInformation.getNickName() + "1V1语音");
+                    } else {
+                        walletAccountAggregate.handleIncomeData(walletAccount, income, TradeTypeEnum.ONE_ON_ONE_VIDEO, "与" + payerMarriageInformation.getNickName() + "1V1视频");
+                    }
                 }
                 settleOneOnOneRtcDomainService.handle(virtualAccount, walletAccount);
                 vo.setFlag(true);

dating-agency-mall-server/src/main/java/com/qniao/dam/domain/service/virtualaccount/SettleOneOnOneRtcDomainService.java

@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Objects;
 
 @Service
 public class SettleOneOnOneRtcDomainService {
@@ -21,6 +22,8 @@ public class SettleOneOnOneRtcDomainService {
     public void handle(VirtualAccount virtualAccount,
                        WalletAccount walletAccount) {
         virtualAccountAggregate.edit(virtualAccount);
-        walletAccountAggregate.save(walletAccount);
+        if (Objects.nonNull(walletAccount)) {
+            walletAccountAggregate.save(walletAccount);
+        }
     }
 }