Merge remote-tracking branch 'origin/dev' into dev

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<ReconciliationAccount> reconciliationAccountList=reconciliationAccountMapper.selectList(new QueryWrapper<ReconciliationAccount>()

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;
 

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<TmsReceipt>
      */
     public List<TmsReceiptPO> queryList(TmsReceiptDO tmsReceiptDO);
 
+    String selectCnName(@Param("settlementCount") String settlementCount);
 }

mhd_finance/src/main/resources/mapper/tmsReceipt/TmsReceiptMapper.xml

@@ -122,4 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectTmsReceiptPo"/>
         <include refid="selectTmsReceiptPo1"/>
     </select>
+    <select id="selectCnName" resultType="java.lang.String">
+        select chinese_name from NGWL_TEST_WLHY.TMS_SETTLEMENT_EXCHANGE_RATE where english_name = #{settlementCount}
+    </select>
 </mapper>