Enhance surcharge management by adding support for price type filtering in SurchargeController and related services. Introduce new methods for handling redline product codes in mappers and services. Update front-end API to accommodate price type parameters in surcharge queries. Modify database schema to include redline product and country tables for improved surcharge calculations.

bms-front/src/api/price/redline.js

@@ -0,0 +1,177 @@
+import request from '@/utils/request'
+
+/** 查询红线价列表 */
+export function listRedline(query) {
+  return request({
+    url: '/price/redline/list',
+    method: 'get',
+    params: query
+  })
+}
+
+/** 产品下拉选项（非分页，不要求 price:redline:list 权限） */
+export function listRedlineOptions(query) {
+  return request({
+    url: '/price/redline/optionselect',
+    method: 'get',
+    params: query
+  })
+}
+
+/** 查询产品详情 */
+export function getRedline(productId) {
+  return request({
+    url: '/price/redline/' + productId,
+    method: 'get'
+  })
+}
+
+/** 查询产品国家明细（优先 productId，绑定到具体产品版本行） */
+export function listRedlineCountries(productCode, effectiveDate, productId) {
+  const params = {}
+  if (effectiveDate) params.effectiveDate = effectiveDate
+  if (productId) params.productId = productId
+  return request({
+    url: '/price/redline/' + productCode + '/countries',
+    method: 'get',
+    params
+  })
+}
+
+/** 修改产品国家明细行（重量段/运费/挂号费/尺寸/尾程/时效/生效失效日期） */
+export function updateRedlineCountry(data) {
+  return request({
+    url: '/price/redline/country',
+    method: 'put',
+    data: data
+  })
+}
+
+/** 新增红线价 */
+export function addRedline(data) {
+  return request({
+    url: '/price/redline',
+    method: 'post',
+    data: data
+  })
+}
+
+/** 修改产品 */
+export function updateRedline(data) {
+  return request({
+    url: '/price/redline',
+    method: 'put',
+    data: data
+  })
+}
+
+/** 删除产品 */
+export function delRedline(productIds) {
+  return request({
+    url: '/price/redline/' + productIds,
+    method: 'delete'
+  })
+}
+
+export function getRedlineImportTask(taskId) {
+  return request({
+    url: '/price/redline/import/task/' + taskId,
+    method: 'get'
+  })
+}
+
+function pickImportTaskId(res) {
+  if (!res) return null
+  const d = res.data
+  if (d && typeof d === 'object' && d.taskId) return String(d.taskId)
+  if (typeof d === 'string' && d.trim()) return d.trim()
+  if (typeof res.msg === 'string') {
+    const m = res.msg.trim()
+    if (/^[a-f0-9]{32}$/i.test(m)) return m
+    if (/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i.test(m)) {
+      return m.replace(/-/g, '')
+    }
+  }
+  return null
+}
+
+async function pollProductImportTask(taskId, onProgress) {
+  const started = Date.now()
+  const maxMs = 30 * 60 * 1000
+  while (Date.now() - started < maxMs) {
+    const res = await getRedlineImportTask(taskId)
+    const task = res.data || {}
+    if (typeof onProgress === 'function') {
+      onProgress(task)
+    }
+    if (task.status === 'SUCCESS') {
+      return { task }
+    }
+    if (task.status === 'FAIL') {
+      const err = new Error(task.error || task.message || 'import failed')
+      err.task = task
+      throw err
+    }
+    await new Promise(resolve => setTimeout(resolve, 800))
+  }
+  throw new Error('import timeout')
+}
+
+/**
+ * Async all-country product import; poll until done.
+ * @param {File|Blob} file
+ * @param {string} effectiveDate yyyy-MM-dd (required)
+ * @param {(task: object) => void} [onProgress]
+ */
+export async function importRedlineExcelAsync(file, effectiveDate, onProgress) {
+  const formData = new FormData()
+  formData.append('file', file)
+  const params = new URLSearchParams()
+  params.set('updateSupport', '0')
+  if (effectiveDate) params.set('effectiveDate', effectiveDate)
+  const submitRes = await request({
+    url: '/price/redline/importData?' + params.toString(),
+    method: 'post',
+    data: formData,
+    headers: { 'Content-Type': 'multipart/form-data' }
+  })
+  const taskId = pickImportTaskId(submitRes)
+  if (!taskId) {
+    throw new Error('missing import taskId')
+  }
+  return pollProductImportTask(taskId, onProgress)
+}
+
+/**
+ * Async single-country product import; poll until done.
+ * @param {File|Blob} file
+ * @param {string} countryCode
+ * @param {string} effectiveDate yyyy-MM-dd
+ * @param {(task: object) => void} [onProgress]
+ */
+export async function importRedlineCountryExcelAsync(file, countryCode, effectiveDate, onProgress) {
+  const formData = new FormData()
+  formData.append('file', file)
+  const params = new URLSearchParams()
+  params.set('countryCode', countryCode)
+  if (effectiveDate) params.set('effectiveDate', effectiveDate)
+  const submitRes = await request({
+    url: '/price/redline/importCountryData?' + params.toString(),
+    method: 'post',
+    data: formData,
+    headers: { 'Content-Type': 'multipart/form-data' }
+  })
+  const taskId = pickImportTaskId(submitRes)
+  if (!taskId) {
+    throw new Error('missing import taskId')
+  }
+  return pollProductImportTask(taskId, onProgress)
+}
+
+/** List imported Excel attachments for product_code */
+export function listProductExcelFiles(productCode) {
+  return request({
+    url: '/price/redline/' + encodeURIComponent(productCode) + '/excelFiles',
+    method: 'get'
+  })
+}

bms-front/src/api/price/surcharge.js

@@ -20,10 +20,11 @@ export function getSurcharge(scId) {
 }
 
 /** 查询指定产品的附加费关联（非分页，含附加费与明细展示字段） */
-export function listSurchargeByProduct(productCode) {
+export function listSurchargeByProduct(productCode, priceType) {
   return request({
     url: '/price/surcharge/byProduct/' + productCode,
-    method: 'get'
+    method: 'get',
+    params: priceType ? { priceType } : undefined
   })
 }