From 54fe327fe1ec7d9ecd5c42ae147d7669befa0f60 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 3 Sep 2024 12:04:00 +0800 Subject: [PATCH] md --- .../xdadan/erp/web/emis/EmisExchangeRateController.java | 4 ++-- .../com/xdadan/erp/emis/mapper/EmisExchangeRateMapper.java | 2 +- .../xdadan/erp/emis/service/IEmisExchangeRateService.java | 2 +- .../erp/emis/service/impl/EmisExchangeRateServiceImpl.java | 4 ++-- .../erp/emis/service/impl/EmisWaybillServiceImpl.java | 6 +++--- .../src/main/resources/mapper/EmisExchangeRateMapper.xml | 7 ++++++- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java index 1fa7f0aa3..7a8b307b8 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisExchangeRateController.java @@ -77,9 +77,9 @@ public class EmisExchangeRateController extends BaseController @GetMapping("/getValidExchangeRate") - public AjaxResult getValidExchangeRate(String from,String to) + public AjaxResult getValidExchangeRate(String from,String to,String rateDate) { - EmisExchangeRate emisExchangeRate=emisExchangeRateService.getValidExchangeRate(from,to); + EmisExchangeRate emisExchangeRate=emisExchangeRateService.getValidExchangeRate(from,to,rateDate); float rate=0.0f; if(emisExchangeRate!=null){ rate=Float.valueOf(emisExchangeRate.getRate()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisExchangeRateMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisExchangeRateMapper.java index c2536f739..51ddd26dd 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisExchangeRateMapper.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisExchangeRateMapper.java @@ -48,7 +48,7 @@ public interface EmisExchangeRateMapper extends BaseMapper public int checkUnique(EmisExchangeRate emisExchangeRate); - public EmisExchangeRate getValidExchangeRate(@Param("from") String from,@Param("to") String to); + public EmisExchangeRate getValidExchangeRate(@Param("from") String from,@Param("to") String to,@Param("rateDate") String rateDate); /** * 新增 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisExchangeRateService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisExchangeRateService.java index 28cf21ba6..8af5b4e5b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisExchangeRateService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisExchangeRateService.java @@ -50,7 +50,7 @@ public interface IEmisExchangeRateService * @param to * @return */ - public EmisExchangeRate getValidExchangeRate(String from, String to); + public EmisExchangeRate getValidExchangeRate(String from, String to,String rateDate); /** * 新增汇率维护 diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisExchangeRateServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisExchangeRateServiceImpl.java index 083a80d24..ca6acfe40 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisExchangeRateServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisExchangeRateServiceImpl.java @@ -67,9 +67,9 @@ public class EmisExchangeRateServiceImpl implements IEmisExchangeRateService } @Override - public EmisExchangeRate getValidExchangeRate(String from, String to) + public EmisExchangeRate getValidExchangeRate(String from, String to,String rateDate) { - return emisExchangeRateMapper.getValidExchangeRate(from, to); + return emisExchangeRateMapper.getValidExchangeRate(from, to,rateDate); } /** diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java index 5c12c412e..b442e8ef7 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java @@ -1888,7 +1888,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 汇率计算 if( !StringUtils.isEmpty(feeItem.getCurrency()) && !"CNY".equals(feeItem.getCurrency()) ){ - EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY"); + EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY",null); if(emisExchangeRate!=null){ BigDecimal rate=BigDecimal.valueOf(Double.valueOf(emisExchangeRate.getRate())); @@ -2271,7 +2271,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb if(realFee!=null){ // 汇率计算 if( !StringUtils.isEmpty(feeItem.getCurrency()) && !"CNY".equals(feeItem.getCurrency()) ){ - EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY"); + EmisExchangeRate emisExchangeRate=emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(),"CNY",null); if(emisExchangeRate!=null){ BigDecimal rate=BigDecimal.valueOf(Double.valueOf(emisExchangeRate.getRate())); @@ -3096,7 +3096,7 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb // 汇率计算 if (!StringUtils.isEmpty(feeItem.getCurrency()) && !"CNY".equals(feeItem.getCurrency())) { - EmisExchangeRate emisExchangeRate = emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(), "CNY"); + EmisExchangeRate emisExchangeRate = emisExchangeRateMapper.getValidExchangeRate(feeItem.getCurrency(), "CNY",null); if (emisExchangeRate != null) { BigDecimal rate = BigDecimal.valueOf(Double.valueOf(emisExchangeRate.getRate())); diff --git a/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml b/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml index fe26095f9..b2cc0954b 100644 --- a/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisExchangeRateMapper.xml @@ -72,7 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, currency, dest_currency, rate, start_date, end_date, bl_valid, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_exchange_rate a where a.currency=#{from} and a.dest_currency=#{to} - and start_date now() and now() end_date + + and start_date #{rateDate} and #{rateDate} end_date + + + and start_date now() and now() end_date +