24282 3 долоо хоног өмнө
parent
commit
1f9ba96569

+ 6 - 0
hx-account/src/main/java/com/fjhx/account/entity/exchange/dto/ExchangeSettlementDto.java

@@ -5,6 +5,7 @@ import com.fjhx.account.entity.exchange.po.ExchangeSettlementDetail;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -22,4 +23,9 @@ public class ExchangeSettlementDto extends ExchangeSettlement {
      */
     List<ExchangeSettlementDetail> exchangeSettlementDetailList;
 
+    /**
+     * 交易时间
+     */
+    private Date transactionTime;
+
 }

+ 1 - 1
hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -610,7 +610,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
     @Override
     public void exchangeSettlement(ExchangeSettlementDto dto) {
         //交易时间
-        Date transactionTime = new Date();
+        Date transactionTime = ObjectUtil.defaultIfNull(dto.getTransactionTime(), new Date());
 
         //保存结汇相关信息
         exchangeSettlementService.save(dto);