From 4f322a929061ed746940c198dfbe045575ace141 Mon Sep 17 00:00:00 2001
From: Gauthier LO <lo.gauthier.glo@gmail.com>
Date: Thu, 1 Aug 2024 12:40:06 +0200
Subject: [PATCH] fix

---
 .../business/mapper/LogisticChannelPriceMapper.java       | 2 +-
 .../business/mapper/xml/LogisticChannelPriceMapper.xml    | 2 +-
 .../service/impl/LogisticChannelPriceServiceImpl.java     | 6 +++++-
 .../business/service/impl/LogisticChannelServiceImpl.java | 8 +++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/LogisticChannelPriceMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/LogisticChannelPriceMapper.java
index f41f08280..72e63e9ac 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/LogisticChannelPriceMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/LogisticChannelPriceMapper.java
@@ -34,7 +34,7 @@ public interface LogisticChannelPriceMapper extends BaseMapper<LogisticChannelPr
      * @param countryList      the country, represented by 2 letters code
      * @return one propre price
      */
-    LogisticChannelPrice findBy(
+    List<LogisticChannelPrice> findBy(
             @Param("channelName") String channelName,
             @Param("date") Date shippingTime,
             @Param("trueWeight") BigDecimal weight,
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/LogisticChannelPriceMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/LogisticChannelPriceMapper.xml
index 5fdf2e8d4..89bdd7df8 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/LogisticChannelPriceMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/LogisticChannelPriceMapper.xml
@@ -33,7 +33,7 @@
           AND effective_date &lt;= #{date}
           AND active = 1
         ORDER BY effective_date DESC
-        LIMIT 1
+        LIMIT 2
     </select>
     <select id="findPrevious" resultType="org.jeecg.modules.business.entity.LogisticChannelPrice">
         WITH current_price AS
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LogisticChannelPriceServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LogisticChannelPriceServiceImpl.java
index 22b5b1e37..5c86742de 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LogisticChannelPriceServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LogisticChannelPriceServiceImpl.java
@@ -90,12 +90,16 @@ public class LogisticChannelPriceServiceImpl extends ServiceImpl<LogisticChannel
 
         String countryCode = countryService.findByEnName(order.getCountry()).getCode();
 
-        LogisticChannelPrice price = logisticChannelPriceMapper.findBy(
+        List<LogisticChannelPrice> priceList = logisticChannelPriceMapper.findBy(
                 logisticChannelName,
                 order.getShippingTime(),
                 weight,
                 Collections.singletonList(countryCode)
         );
+        // find the one with latest effective date
+        LogisticChannelPrice price = priceList.stream()
+                .max(Comparator.comparing(LogisticChannelPrice::getEffectiveDate))
+                .orElse(null);
         if (price == null) {
             throw new UserException("Can't find price for channel {}, shipped at {}, weight {}, country {}",
                     logisticChannelName,
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LogisticChannelServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LogisticChannelServiceImpl.java
index 7cca43e73..d6d8f3f3f 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LogisticChannelServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/LogisticChannelServiceImpl.java
@@ -80,12 +80,18 @@ public class LogisticChannelServiceImpl extends ServiceImpl<LogisticChannelMappe
     @Override
     public List<LogisticChannelPrice> findLogisticsChannelPrice(String channelName, Date date, int trueWeight, List<String> countryList) {
         List<LogisticChannelPrice> priceList = new ArrayList<>();
-        LogisticChannelPrice currentPrice = logisticChannelPriceMapper.findBy(channelName, new java.util.Date(), BigDecimal.valueOf(trueWeight), countryList);
+        List<LogisticChannelPrice> currentPriceList = logisticChannelPriceMapper.findBy(channelName, new java.util.Date(), BigDecimal.valueOf(trueWeight), countryList);
+        LogisticChannelPrice currentPrice = currentPriceList.stream()
+                .max(Comparator.comparing(LogisticChannelPrice::getEffectiveDate))
+                .orElse(null);
         if(currentPrice != null) {
             priceList.add(currentPrice);
             LogisticChannelPrice previousPrice = logisticChannelPriceMapper.findPrevious(channelName, new java.util.Date(), BigDecimal.valueOf(trueWeight), countryList);
             if(previousPrice != null) {
                 priceList.add(previousPrice);
+            } else {
+                currentPriceList.stream()
+                        .min(Comparator.comparing(LogisticChannelPrice::getEffectiveDate)).ifPresent(priceList::add);
             }
         }
         return priceList;