玫瑰

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

@@ -16,5 +16,6 @@ public class UserConsumeVirtualAccountDto {
 
     private VirtualAccountTradeTypeEnum tradeType;
 
-
+    private String remark;
+    
 }

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

@@ -17,4 +17,6 @@ public class UserConsumeVirtualAccountDto {
     @NotNull
     private VirtualAccountTradeTypeEnum tradeType;
 
+    private String remark;
+
 }

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

@@ -92,7 +92,7 @@ public class VirtualAccountApplicationService {
                 //余额充足  创建消费订单+扣除余额
                 Order order = handleOrder(dto.getUserId(), productSpec, 1);
                 //虚拟账户处理
-                virtualAccountAggregate.handleConsumeData(virtualAccount, order.getSettlementAmount().intValue(), dto.getTradeType());
+                virtualAccountAggregate.handleConsumeData(virtualAccount, order.getSettlementAmount().intValue(), dto.getTradeType(), dto.getRemark());
                 //保存
                 consumeVirtualAccountDomainService.handle(virtualAccount, order);
                 vo.setSuccess(true);
@@ -165,7 +165,7 @@ public class VirtualAccountApplicationService {
         //余额充足  创建消费订单+扣除余额
         Order order = handleOrder(fromUserId, productSpec, quantity);
         //虚拟账户处理
-        virtualAccountAggregate.handleConsumeData(virtualAccount, order.getSettlementAmount().intValue(), VirtualAccountTradeTypeEnum.GIFT);
+        virtualAccountAggregate.handleConsumeData(virtualAccount, order.getSettlementAmount().intValue(), VirtualAccountTradeTypeEnum.GIFT, "礼物");
 
         //收益信息
         RevenueReward revenueReward = revenueRewardQueryService.queryByUserId(toUserId);
@@ -229,7 +229,7 @@ public class VirtualAccountApplicationService {
         //余额充足  创建消费订单+扣除余额
         Order order = handleOrder(fromUserId, productSpec, quantity);
         //虚拟账户处理
-        virtualAccountAggregate.handleConsumeData(virtualAccount, order.getSettlementAmount().intValue(), VirtualAccountTradeTypeEnum.GIFT);
+        virtualAccountAggregate.handleConsumeData(virtualAccount, order.getSettlementAmount().intValue(), VirtualAccountTradeTypeEnum.GIFT, "礼物");
 
         //收益信息
         RevenueReward toRevenueReward = revenueRewardQueryService.queryByUserId(toUserId);
@@ -294,7 +294,7 @@ public class VirtualAccountApplicationService {
         //余额充足  创建消费订单+扣除余额
         Order order = handleOrder(fromUserId, productSpec, quantity);
         //虚拟账户处理
-        virtualAccountAggregate.handleConsumeData(virtualAccount, order.getSettlementAmount().intValue(), VirtualAccountTradeTypeEnum.GIFT);
+        virtualAccountAggregate.handleConsumeData(virtualAccount, order.getSettlementAmount().intValue(), VirtualAccountTradeTypeEnum.GIFT, "礼物");
 
         //收益信息
         RevenueReward revenueReward = revenueRewardQueryService.queryByUserId(toUserId);

dating-agency-mall-server/src/main/java/com/qniao/dam/domain/aggregate/virtualaccount/VirtualAccountAggregate.java

@@ -34,7 +34,8 @@ public class VirtualAccountAggregate {
 
     public void handleConsumeData(VirtualAccount virtualAccount,
                                   Integer tradeBalance,
-                                  VirtualAccountTradeTypeEnum tradeType) {
+                                  VirtualAccountTradeTypeEnum tradeType,
+                                  String remark) {
         Integer originalBalance = virtualAccount.getBalance();
         virtualAccount.setBalance(originalBalance - tradeBalance);
         VirtualAccountRecord record = new VirtualAccountRecord();
@@ -42,6 +43,7 @@ public class VirtualAccountAggregate {
         record.setTradeBalance(-tradeBalance);
         record.setOriginalBalance(originalBalance);
         record.setCurrentBalance(virtualAccount.getBalance());
+        record.setRemark(remark);
         virtualAccount.setRecordList(Collections.singletonList(record));
     }