Merge remote-tracking branch 'origin/master'

bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/BillingController.java

@@ -1,14 +1,19 @@
 package com.ruoyi.web.controller.price;
 
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.price.domain.PrcQuote;
 import com.ruoyi.price.domain.vo.TmsPriceQuoteRequest;
 import com.ruoyi.price.domain.vo.TmsPriceQuoteResult;
 import com.ruoyi.price.service.ITmsPriceQuoteService;
@@ -25,6 +30,28 @@ public class BillingController extends BaseController
     @Autowired
     private ITmsPriceQuoteService tmsPriceQuoteService;
 
+    /**
+     * Historical quote list.
+     */
+    @PreAuthorize("@ss.hasPermi('price:billing:quote')")
+    @GetMapping("/quote/list")
+    public TableDataInfo list(PrcQuote query)
+    {
+        startPage();
+        List<PrcQuote> list = tmsPriceQuoteService.selectQuoteList(query);
+        return getDataTable(list);
+    }
+
+    /**
+     * Historical quote detail with fee lines.
+     */
+    @PreAuthorize("@ss.hasPermi('price:billing:quote')")
+    @GetMapping("/quote/{quoteId}")
+    public AjaxResult getInfo(@PathVariable Long quoteId)
+    {
+        return success(tmsPriceQuoteService.getQuote(quoteId));
+    }
+
     /**
      * Same matching logic as TMS open API, for BMS console trial.
      */

bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/ProductController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.price;
 
+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.annotation.Log;
@@ -45,9 +47,11 @@ public class ProductController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('price:product:query')")
     @GetMapping("/{productCode}/countries")
-    public AjaxResult countries(@PathVariable String productCode)
+    public AjaxResult countries(@PathVariable String productCode,
+        @RequestParam(required = false) Date effectiveDate,
+        @RequestParam(required = false) Long productId)
     {
-        List<BmsProductCountry> list = productService.selectCountryListByProductCode(productCode);
+        List<BmsProductCountry> list = productService.selectCountryListByProductCode(productCode, effectiveDate, productId);
         return success(list);
     }