结汇需求修改

hx-account/src/main/java/com/fjhx/account/entity/exchange/dto/ExchangeSettlementRecordsDto.java → hx-account/src/main/java/com/fjhx/account/entity/exchange/dto/ExchangeSettlementDetailDto.java

@@ -1,6 +1,6 @@
 package com.fjhx.account.entity.exchange.dto;
 
-import com.fjhx.account.entity.exchange.po.ExchangeSettlementRecords;
+import com.fjhx.account.entity.exchange.po.ExchangeSettlementDetail;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,6 +12,6 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class ExchangeSettlementRecordsDto extends ExchangeSettlementRecords {
+public class ExchangeSettlementDetailDto extends ExchangeSettlementDetail {
 
 }

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

@@ -1,7 +1,7 @@
 package com.fjhx.account.entity.exchange.dto;
 
 import com.fjhx.account.entity.exchange.po.ExchangeSettlement;
-import com.fjhx.account.entity.exchange.po.ExchangeSettlementRecords;
+import com.fjhx.account.entity.exchange.po.ExchangeSettlementDetail;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -20,6 +20,6 @@ public class ExchangeSettlementDto extends ExchangeSettlement {
     /**
      * 结汇记录列表
      */
-    List<ExchangeSettlementRecords> exchangeSettlementRecordsList;
+    List<ExchangeSettlementDetail> exchangeSettlementDetailList;
 
 }

hx-account/src/main/java/com/fjhx/account/entity/exchange/po/ExchangeSettlementRecords.java → hx-account/src/main/java/com/fjhx/account/entity/exchange/po/ExchangeSettlementDetail.java

@@ -17,8 +17,8 @@ import java.math.BigDecimal;
  */
 @Getter
 @Setter
-@TableName("exchange_settlement_records")
-public class ExchangeSettlementRecords extends BasePo {
+@TableName("exchange_settlement_detail")
+public class ExchangeSettlementDetail extends BasePo {
 
     /**
      * 结汇id

hx-account/src/main/java/com/fjhx/account/entity/exchange/vo/ExchangeSettlementRecordsVo.java → hx-account/src/main/java/com/fjhx/account/entity/exchange/vo/ExchangeSettlementDetailVo.java

@@ -1,6 +1,6 @@
 package com.fjhx.account.entity.exchange.vo;
 
-import com.fjhx.account.entity.exchange.po.ExchangeSettlementRecords;
+import com.fjhx.account.entity.exchange.po.ExchangeSettlementDetail;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,6 +12,6 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class ExchangeSettlementRecordsVo extends ExchangeSettlementRecords {
+public class ExchangeSettlementDetailVo extends ExchangeSettlementDetail {
 
 }

hx-account/src/main/java/com/fjhx/account/mapper/exchange/ExchangeSettlementRecordsMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.account.mapper.exchange;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fjhx.account.entity.exchange.po.ExchangeSettlementRecords;
+import com.fjhx.account.entity.exchange.po.ExchangeSettlementDetail;
 
 
 /**
@@ -12,6 +12,6 @@ import com.fjhx.account.entity.exchange.po.ExchangeSettlementRecords;
  * @author
  * @since 2023-10-24
  */
-public interface ExchangeSettlementRecordsMapper extends BaseMapper<ExchangeSettlementRecords> {
+public interface ExchangeSettlementRecordsMapper extends BaseMapper<ExchangeSettlementDetail> {
 
 }

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

@@ -18,7 +18,7 @@ import com.fjhx.account.entity.account.po.AccountRemainder;
 import com.fjhx.account.entity.account.po.AccountRunningWater;
 import com.fjhx.account.entity.account.vo.AccountRunningWaterVo;
 import com.fjhx.account.entity.exchange.dto.ExchangeSettlementDto;
-import com.fjhx.account.entity.exchange.po.ExchangeSettlementRecords;
+import com.fjhx.account.entity.exchange.po.ExchangeSettlementDetail;
 import com.fjhx.account.entity.tax.po.TaxRefundDetails;
 import com.fjhx.account.entity.transaction.po.Transaction;
 import com.fjhx.account.entity.transaction.po.TransactionDepartment;
@@ -610,10 +610,10 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
 
         //保存结汇相关信息
         exchangeSettlementService.save(dto);
-        List<ExchangeSettlementRecords> exchangeSettlementRecordsList = dto.getExchangeSettlementRecordsList();
-        Assert.notEmpty(exchangeSettlementRecordsList, "关联合同不能为空");
-        exchangeSettlementRecordsList.forEach(item -> item.setExchangeSettlementId(dto.getId()));
-        exchangeSettlementRecordsService.saveBatch(exchangeSettlementRecordsList);
+        List<ExchangeSettlementDetail> exchangeSettlementDetailList = dto.getExchangeSettlementDetailList();
+        Assert.notEmpty(exchangeSettlementDetailList, "关联合同不能为空");
+        exchangeSettlementDetailList.forEach(item -> item.setExchangeSettlementId(dto.getId()));
+        exchangeSettlementRecordsService.saveBatch(exchangeSettlementDetailList);
 
         //生成转出流水
         AccountRunningWater outAccountRunningWater = new AccountRunningWater();
@@ -664,7 +664,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         this.save(inAccountRunningWater);
         //修改合同为已结汇
         DynamicDataSourceContextHolder.push(SourceConstant.SALE);
-        List<Long> contractIds = exchangeSettlementRecordsList.stream().map(ExchangeSettlementRecords::getContractId).collect(Collectors.toList());
+        List<Long> contractIds = exchangeSettlementDetailList.stream().map(ExchangeSettlementDetail::getContractId).collect(Collectors.toList());
         baseMapper.exchangeSettlementByContractId(contractIds, 1);
         DynamicDataSourceContextHolder.poll();
     }

hx-account/src/main/java/com/fjhx/account/service/exchange/ExchangeSettlementRecordsService.java

@@ -1,6 +1,6 @@
 package com.fjhx.account.service.exchange;
 
-import com.fjhx.account.entity.exchange.po.ExchangeSettlementRecords;
+import com.fjhx.account.entity.exchange.po.ExchangeSettlementDetail;
 import com.ruoyi.common.core.service.BaseService;
 
 
@@ -12,6 +12,6 @@ import com.ruoyi.common.core.service.BaseService;
  * @author
  * @since 2023-10-24
  */
-public interface ExchangeSettlementRecordsService extends BaseService<ExchangeSettlementRecords> {
+public interface ExchangeSettlementRecordsService extends BaseService<ExchangeSettlementDetail> {
 
 }

hx-account/src/main/java/com/fjhx/account/service/exchange/impl/ExchangeSettlementRecordsServiceImpl.java

@@ -1,7 +1,7 @@
 package com.fjhx.account.service.exchange.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.account.entity.exchange.po.ExchangeSettlementRecords;
+import com.fjhx.account.entity.exchange.po.ExchangeSettlementDetail;
 import com.fjhx.account.mapper.exchange.ExchangeSettlementRecordsMapper;
 import com.fjhx.account.service.exchange.ExchangeSettlementRecordsService;
 import org.springframework.stereotype.Service;
@@ -16,6 +16,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-10-24
  */
 @Service
-public class ExchangeSettlementRecordsServiceImpl extends ServiceImpl<ExchangeSettlementRecordsMapper, ExchangeSettlementRecords> implements ExchangeSettlementRecordsService {
+public class ExchangeSettlementRecordsServiceImpl extends ServiceImpl<ExchangeSettlementRecordsMapper, ExchangeSettlementDetail> implements ExchangeSettlementRecordsService {
 
 }