diff --git a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java index ea279a23a..f4d4fe086 100644 --- a/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java +++ b/mhd_finance/src/main/java/com/linke/finance/application/server/reconciliation/ReconciliationApplicationService.java @@ -203,6 +203,10 @@ public class ReconciliationApplicationService { TmsOrder tmsOrder = records.get(0); reconciliationPO.setSettlementCurrency(tmsOrder.getSettlementCurrency()); } + if (reconciliationPO.getSettlementCurrency() != null){ + String s = tmsReceiptMapper.selectCnName(String.valueOf(reconciliationPO.getSettlementCurrency())); + reconciliationPO.setSettlementCurrencyName(s); + } } } List reconciliationAccountList=reconciliationAccountMapper.selectList(new QueryWrapper() diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java index c44b6830b..717b9d6c6 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/po/ReconciliationPO.java @@ -246,6 +246,9 @@ public class ReconciliationPO extends BaseVOEntity{ @ApiModelProperty("结算币种") private String settlementCurrency; + @ApiModelProperty("结算币种名称") + private String settlementCurrencyName; + @ApiModelProperty(value = "收款账户") private String accountInformation; diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java index 5ab174aa8..b6d130ca3 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/tmsReceipt/repository/mapper/TmsReceiptMapper.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.linke.finance.domain.tmsReceipt.entity.TmsReceipt; import com.linke.finance.domain.tmsReceipt.repository.po.TmsReceiptPO; import com.linke.finance.domain.tmsReceipt.repository.todo.TmsReceiptDO; +import org.apache.ibatis.annotations.Param; + /** * 收款单Mapper接口 * @@ -18,4 +20,5 @@ public interface TmsReceiptMapper extends BaseMapper */ public List queryList(TmsReceiptDO tmsReceiptDO); + String selectCnName(@Param("settlementCount") String settlementCount); } diff --git a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml index 2c52427e7..65777d7e9 100644 --- a/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml +++ b/mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml @@ -122,4 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + \ No newline at end of file