乱码注释调整
This commit is contained in:
+2
-2
@@ -16,8 +16,8 @@ import com.bms.price.search.IBillSearchStore;
|
||||
import com.bms.web.controller.price.BillingController;
|
||||
|
||||
/**
|
||||
* Persist quote/bill API failures to Elasticsearch (validation, JSON parse, business, unexpected).
|
||||
* Uses {@link EsBizLogSupport#saveApiFail} so service/controller can also call without duplicate docs.
|
||||
* 把报价/计费接口失败写入 Elasticsearch(校验、JSON 解析、业务异常、未预期异常)。
|
||||
* 通过 {@link EsBizLogSupport#saveApiFail} 写入,service/controller 也可调用且不会重复落文档。
|
||||
*/
|
||||
@Order(0)
|
||||
@RestControllerAdvice(assignableTypes = { TmsPriceController.class, BillingController.class })
|
||||
|
||||
@@ -29,10 +29,10 @@ import com.bms.price.service.IPrcOrderBillService;
|
||||
import com.bms.price.service.ITmsPriceQuoteService;
|
||||
|
||||
/**
|
||||
* TMS open API: freight quote.
|
||||
* TMS 开放接口:运费试算。
|
||||
*
|
||||
* POST /api/tms/price/quote
|
||||
* Header X-Api-Code must equal bms.tms.api-code
|
||||
* 请求头 X-Api-Code 必须等于 bms.tms.api-code
|
||||
*
|
||||
* @author bms
|
||||
*/
|
||||
|
||||
+1
-1
@@ -24,7 +24,7 @@ import com.bms.price.enums.BillTaskSuccessStatus;
|
||||
import com.bms.price.service.IPrcBillingTaskService;
|
||||
|
||||
/**
|
||||
* Monitor: failed / waiting prc_billing_task list and manual resync.
|
||||
* 监控:失败/等待中的 prc_billing_task 列表,以及手工重同步。
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/monitor/billingTask")
|
||||
|
||||
+2
-2
@@ -17,7 +17,7 @@ import com.bms.price.search.BillSearchPage;
|
||||
import com.bms.price.search.IBillSearchStore;
|
||||
|
||||
/**
|
||||
* Generic Elasticsearch business-log viewer.
|
||||
* 通用 Elasticsearch 业务日志查看。
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/monitor/eslog")
|
||||
@@ -39,7 +39,7 @@ public class EsLogController extends BaseController
|
||||
BillSearchPage page = billSearchStore.search(logType, bizId, status, pageNum, pageSize);
|
||||
TableDataInfo rsp = new TableDataInfo();
|
||||
rsp.setCode(HttpStatus.SUCCESS);
|
||||
rsp.setMsg("\u67e5\u8be2\u6210\u529f");
|
||||
rsp.setMsg("查询成功");
|
||||
rsp.setRows(page.getRows());
|
||||
rsp.setTotal(page.getTotal());
|
||||
return rsp;
|
||||
|
||||
+2
-2
@@ -18,7 +18,7 @@ import com.bms.price.search.EsLogType;
|
||||
import com.bms.price.search.IBillSearchStore;
|
||||
|
||||
/**
|
||||
* Price before-after change log (sales / product / redline) from ES.
|
||||
* 来自 ES 的价格变更前后日志(销售价 / 产品价 / 红线价)。
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/monitor/priceLog")
|
||||
@@ -39,7 +39,7 @@ public class PriceLogController extends BaseController
|
||||
BillSearchPage page = billSearchStore.search(EsLogType.PRICE_CHANGE, bizId, status, pageNum, pageSize);
|
||||
TableDataInfo rsp = new TableDataInfo();
|
||||
rsp.setCode(HttpStatus.SUCCESS);
|
||||
rsp.setMsg("\u67e5\u8be2\u6210\u529f");
|
||||
rsp.setMsg("查询成功");
|
||||
rsp.setRows(page.getRows());
|
||||
rsp.setTotal(page.getTotal());
|
||||
return rsp;
|
||||
|
||||
+2
-2
@@ -134,7 +134,7 @@ public class TabOrderMonitorController extends BaseController
|
||||
{
|
||||
TableDataInfo rsp = new TableDataInfo();
|
||||
rsp.setCode(HttpStatus.SUCCESS);
|
||||
rsp.setMsg("\u67e5\u8be2\u6210\u529f");
|
||||
rsp.setMsg("查询成功");
|
||||
if (!hasListFilters(query))
|
||||
{
|
||||
rsp.setRows(Collections.emptyList());
|
||||
@@ -294,7 +294,7 @@ public class TabOrderMonitorController extends BaseController
|
||||
BillSearchPage page = billSearchStore.search(EsLogType.ORDER_SOURCE_SYNC, bizId, status, pageNum, pageSize);
|
||||
TableDataInfo rsp = new TableDataInfo();
|
||||
rsp.setCode(HttpStatus.SUCCESS);
|
||||
rsp.setMsg("\u67e5\u8be2\u6210\u529f");
|
||||
rsp.setMsg("查询成功");
|
||||
rsp.setRows(page.getRows());
|
||||
rsp.setTotal(page.getTotal());
|
||||
return rsp;
|
||||
|
||||
+3
-3
@@ -61,7 +61,7 @@ import com.bms.price.service.OrderBillProductCheckService;
|
||||
import com.bms.price.service.support.OrderBillExportSupport;
|
||||
|
||||
/**
|
||||
* Billing center: order quote trial (authenticated).
|
||||
* 计费中心:订单报价试算(需登录)。
|
||||
*
|
||||
* @author bms
|
||||
*/
|
||||
@@ -154,7 +154,7 @@ public class BillingController extends BaseController
|
||||
* Requires at least one meaningful filter. Poll task then download.
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('price:billing:export')")
|
||||
@Log(title = "\u8ba1\u8d39\u5217\u8868", businessType = BusinessType.EXPORT)
|
||||
@Log(title = "计费列表", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/bill/export")
|
||||
public AjaxResult exportBillList(@RequestBody(required = false) PrcOrderBill query)
|
||||
{
|
||||
@@ -230,7 +230,7 @@ public class BillingController extends BaseController
|
||||
* Requires at least one meaningful filter (default orderStatuses alone is not enough).
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('price:orderBill:export')")
|
||||
@Log(title = "\u8ba2\u5355\u5217\u8868", businessType = BusinessType.EXPORT)
|
||||
@Log(title = "订单列表", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/orderBill/export")
|
||||
public AjaxResult exportOrderBillList(@RequestBody(required = false) PrcOrderBill query)
|
||||
{
|
||||
|
||||
+5
-5
@@ -247,7 +247,7 @@ public class PriceSetController extends BaseController
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('price:set:edit') or @ss.hasPermi('price:set:forceEdit')")
|
||||
@Log(title = "\u5957\u9910\u660e\u7ec6", businessType = BusinessType.UPDATE)
|
||||
@Log(title = "套餐明细", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/detail")
|
||||
public AjaxResult editDetail(@RequestBody PrcPriceSetDetail detail)
|
||||
{
|
||||
@@ -255,7 +255,7 @@ public class PriceSetController extends BaseController
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('price:set:edit') or @ss.hasPermi('price:set:forceEdit')")
|
||||
@Log(title = "\u5957\u9910\u4ef7\u683c\u5bfc\u5165", businessType = BusinessType.IMPORT)
|
||||
@Log(title = "套餐价格导入", businessType = BusinessType.IMPORT)
|
||||
@PostMapping("/detail/importPrices")
|
||||
public AjaxResult importDetailPrices(
|
||||
@RequestParam(value = "files", required = false) MultipartFile[] files,
|
||||
@@ -319,7 +319,7 @@ public class PriceSetController extends BaseController
|
||||
* Async pull product library into version details. Returns taskId; poll /save/task/{taskId}.
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('price:set:edit') or @ss.hasPermi('price:set:forceEdit')")
|
||||
@Log(title = "\u5957\u9910\u62c9\u53d6\u4ea7\u54c1", businessType = BusinessType.IMPORT)
|
||||
@Log(title = "套餐拉取产品", businessType = BusinessType.IMPORT)
|
||||
@PostMapping("/detail/pullFromLibrary")
|
||||
public AjaxResult pullFromLibrary(@RequestParam("priceSetId") Long priceSetId,
|
||||
@RequestParam(value = "psvId", required = false) Long psvId,
|
||||
@@ -335,7 +335,7 @@ public class PriceSetController extends BaseController
|
||||
* Async batch write of detail surcharge snapshots. Returns taskId; poll /save/task/{taskId}.
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('price:set:edit') or @ss.hasPermi('price:set:forceEdit')")
|
||||
@Log(title = "\u5957\u9910\u9644\u52a0\u8d39", businessType = BusinessType.UPDATE)
|
||||
@Log(title = "套餐附加费", businessType = BusinessType.UPDATE)
|
||||
@PostMapping("/detail/surcharge/async")
|
||||
public AjaxResult batchSurchargeAsync(@RequestBody List<PrcPriceSetDetail> details)
|
||||
{
|
||||
@@ -346,7 +346,7 @@ public class PriceSetController extends BaseController
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('price:set:edit') or @ss.hasPermi('price:set:forceEdit')")
|
||||
@Log(title = "\u5957\u9910\u660e\u7ec6", businessType = BusinessType.DELETE)
|
||||
@Log(title = "套餐明细", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/detail/{psdIds}")
|
||||
public AjaxResult removeDetail(@PathVariable Long[] psdIds)
|
||||
{
|
||||
|
||||
+5
-5
@@ -36,7 +36,7 @@ import com.bms.price.service.IPrcPriceExcelFileService;
|
||||
import com.bms.price.service.support.CatalogVersionSupport;
|
||||
|
||||
/**
|
||||
* Product list (async Excel import)
|
||||
* 产品列表(异步 Excel 导入)
|
||||
*
|
||||
* @author bms
|
||||
*/
|
||||
@@ -185,7 +185,7 @@ public class ProductController extends BaseController
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('price:product:edit')")
|
||||
@Log(title = "\u4ea7\u54c1\u56fd\u5bb6\u660e\u7ec6", businessType = BusinessType.UPDATE)
|
||||
@Log(title = "产品国家明细", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/country")
|
||||
public AjaxResult editCountry(@RequestBody BmsProductCountry country)
|
||||
{
|
||||
@@ -193,7 +193,7 @@ public class ProductController extends BaseController
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('price:product:remove')")
|
||||
@Log(title = "\u4ea7\u54c1\u5217\u8868", businessType = BusinessType.DELETE)
|
||||
@Log(title = "产品列表", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{productIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] productIds)
|
||||
{
|
||||
@@ -204,7 +204,7 @@ public class ProductController extends BaseController
|
||||
* Async import Weishi B2C workbook. Returns taskId; poll /import/task/{taskId}.
|
||||
* effectiveDate is required: written to product / product_country; previous open rows expire at this date.
|
||||
*/
|
||||
@Log(title = "\u4ea7\u54c1\u5217\u8868", businessType = BusinessType.IMPORT)
|
||||
@Log(title = "产品列表", businessType = BusinessType.IMPORT)
|
||||
@PreAuthorize("@ss.hasPermi('price:product:import')")
|
||||
@PostMapping("/importData")
|
||||
public AjaxResult importData(MultipartFile file, boolean updateSupport,
|
||||
@@ -220,7 +220,7 @@ public class ProductController extends BaseController
|
||||
* Async single-country cost-sheet import. Returns taskId; poll /import/task/{taskId}.
|
||||
* effectiveDate is required: written to product / product_country; previous open rows expire at this date.
|
||||
*/
|
||||
@Log(title = "\u4ea7\u54c1\u5217\u8868", businessType = BusinessType.IMPORT)
|
||||
@Log(title = "产品列表", businessType = BusinessType.IMPORT)
|
||||
@PreAuthorize("@ss.hasPermi('price:product:import')")
|
||||
@PostMapping("/importCountryData")
|
||||
public AjaxResult importCountryData(MultipartFile file, String countryCode,
|
||||
|
||||
+5
-5
@@ -36,7 +36,7 @@ import com.bms.price.service.IPrcPriceExcelFileService;
|
||||
import com.bms.price.service.support.CatalogVersionSupport;
|
||||
|
||||
/**
|
||||
* redline product list (async Excel import)
|
||||
* 红线价产品列表(异步 Excel 导入)
|
||||
*
|
||||
* @author bms
|
||||
*/
|
||||
@@ -185,7 +185,7 @@ public class RedlineProductController extends BaseController
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('price:redline:edit')")
|
||||
@Log(title = "\u4ea7\u54c1\u56fd\u5bb6\u660e\u7ec6", businessType = BusinessType.UPDATE)
|
||||
@Log(title = "产品国家明细", businessType = BusinessType.UPDATE)
|
||||
@PutMapping("/country")
|
||||
public AjaxResult editCountry(@RequestBody BmsRedlineProductCountry country)
|
||||
{
|
||||
@@ -193,7 +193,7 @@ public class RedlineProductController extends BaseController
|
||||
}
|
||||
|
||||
@PreAuthorize("@ss.hasPermi('price:redline:remove')")
|
||||
@Log(title = "\u4ea7\u54c1\u5217\u8868", businessType = BusinessType.DELETE)
|
||||
@Log(title = "产品列表", businessType = BusinessType.DELETE)
|
||||
@DeleteMapping("/{productIds}")
|
||||
public AjaxResult remove(@PathVariable Long[] productIds)
|
||||
{
|
||||
@@ -204,7 +204,7 @@ public class RedlineProductController extends BaseController
|
||||
* Async import Weishi B2C workbook. Returns taskId; poll /import/task/{taskId}.
|
||||
* effectiveDate is required: written to product / product_country; previous open rows expire at this date.
|
||||
*/
|
||||
@Log(title = "\u4ea7\u54c1\u5217\u8868", businessType = BusinessType.IMPORT)
|
||||
@Log(title = "产品列表", businessType = BusinessType.IMPORT)
|
||||
@PreAuthorize("@ss.hasPermi('price:redline:import')")
|
||||
@PostMapping("/importData")
|
||||
public AjaxResult importData(MultipartFile file, boolean updateSupport,
|
||||
@@ -220,7 +220,7 @@ public class RedlineProductController extends BaseController
|
||||
* Async single-country cost-sheet import. Returns taskId; poll /import/task/{taskId}.
|
||||
* effectiveDate is required: written to product / product_country; previous open rows expire at this date.
|
||||
*/
|
||||
@Log(title = "\u4ea7\u54c1\u5217\u8868", businessType = BusinessType.IMPORT)
|
||||
@Log(title = "产品列表", businessType = BusinessType.IMPORT)
|
||||
@PreAuthorize("@ss.hasPermi('price:redline:import')")
|
||||
@PostMapping("/importCountryData")
|
||||
public AjaxResult importCountryData(MultipartFile file, String countryCode,
|
||||
|
||||
@@ -24,7 +24,7 @@ import com.bms.price.domain.PrcZoneRegion;
|
||||
import com.bms.price.service.IPrcZoneService;
|
||||
|
||||
/**
|
||||
* Zone management: region -> zone -> postcode detail
|
||||
* 分区管理:国家(region) -> 分区 -> 邮编明细
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/price/zone")
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ import com.bms.common.enums.BusinessType;
|
||||
import com.bms.system.domain.SysFileTemplate;
|
||||
import com.bms.system.service.ISysFileTemplateService;
|
||||
|
||||
/** System file template CRUD + OSS upload/download. */
|
||||
/** 系统文件模板的增删改查,以及 OSS 上传/下载。 */
|
||||
@RestController
|
||||
@RequestMapping("/system/fileTemplate")
|
||||
public class SysFileTemplateController extends BaseController
|
||||
|
||||
Reference in New Issue
Block a user