查看历史试算功能

bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcQuoteMapper.java

@@ -1,8 +1,9 @@
 package com.ruoyi.price.mapper;
 
-import com.ruoyi.price.domain.PrcQuote;
 import java.math.BigDecimal;
+import java.util.List;
 import org.apache.ibatis.annotations.Param;
+import com.ruoyi.price.domain.PrcQuote;
 
 /** billing quote header mapper */
 public interface PrcQuoteMapper
@@ -11,6 +12,8 @@ public interface PrcQuoteMapper
 
     public PrcQuote selectPrcQuoteById(Long quoteId);
 
+    public List<PrcQuote> selectPrcQuoteList(PrcQuote quote);
+
     public int insertPrcQuote(PrcQuote quote);
 
     public int updateQuoteAmounts(@Param("quoteId") Long quoteId,

bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/ITmsPriceQuoteService.java

@@ -1,7 +1,9 @@
 package com.ruoyi.price.service;
 
+import com.ruoyi.price.domain.PrcQuote;
 import com.ruoyi.price.domain.vo.TmsPriceQuoteRequest;
 import com.ruoyi.price.domain.vo.TmsPriceQuoteResult;
+import java.util.List;
 
 /**
  * TMS freight quote service.
@@ -15,4 +17,8 @@ import com.ruoyi.price.domain.vo.TmsPriceQuoteResult;
 public interface ITmsPriceQuoteService
 {
     TmsPriceQuoteResult quote(TmsPriceQuoteRequest request);
+
+    List<PrcQuote> selectQuoteList(PrcQuote query);
+
+    TmsPriceQuoteResult getQuote(Long quoteId);
 }

bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/TmsPriceQuoteServiceImpl.java

@@ -112,6 +112,27 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
         return result;
     }
 
+    @Override
+    public List<PrcQuote> selectQuoteList(PrcQuote query)
+    {
+        return quoteMapper.selectPrcQuoteList(query);
+    }
+
+    @Override
+    public TmsPriceQuoteResult getQuote(Long quoteId)
+    {
+        if (quoteId == null)
+        {
+            throw new ServiceException(MessageUtils.message("price.quote.quoteIdRequired"));
+        }
+        PrcQuote quote = quoteMapper.selectPrcQuoteById(quoteId);
+        if (quote == null)
+        {
+            throw new ServiceException("QUOTE_NOT_FOUND: quoteId=" + quoteId);
+        }
+        return toResult(quote, quoteFeeMapper.selectByQuoteId(quoteId), true);
+    }
+
     private TmsPriceQuoteResult doQuote(TmsPriceQuoteRequest request, Date bizDate)
     {
         String productCode = request.getProductCode().trim();
@@ -164,7 +185,7 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
         }
 
         return buildDefault(request.getCustomerId(), base, productCode, productName, weight,
-            "no customer package override; use product default freight/registration");
+            MessageUtils.message("price.quote.noCustomerPackageOverride"));
     }
 
     private TmsPriceQuoteResult tryFixed(PrcCustomerPriceSet bind, PrcPriceSet set,
@@ -176,7 +197,8 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
             TmsPriceQuoteResult r = buildFromRates(SRC_DEFAULT, base.getFreightPrice(), null, null,
                 base.getRegistrationFee(), base, productCode, productName, weight, null);
             fillPackage(r, bind, set);
-            r.setMatchMessage("FIXED package has no details; use bms_product_country default");
+            // 套餐固定价格没有明细，使用产品默认价格
+            r.setMatchMessage(MessageUtils.message("price.quote.fixedPackageNoDetails"));
             r.setCustomerId(bind.getCustomerId());
             return r;
         }
@@ -208,7 +230,8 @@ public class TmsPriceQuoteServiceImpl implements ITmsPriceQuoteService
         {
             r.setProductCountryId(detail.getProductCountryId());
         }
-        r.setMatchMessage("hit customer FIXED package detail");
+        // 命中客户套餐固定价格明细
+        r.setMatchMessage(MessageUtils.message("price.quote.hitCustomerFixedPackageDetail"));
         r.setCustomerId(bind.getCustomerId());
         return r;
     }