wuweihua/BMS
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

乱码注释调整

Browse Source
This commit is contained in:
liuminghui
2026-10-27 10:17:53 +08:00
parent f80af4a2f6
commit be0b067516
132 changed files with 440 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bms-back/bms-admin/src/main/java/com/bms/web/controller/api/PriceSyncEsLogAdvice.java
+2 -2
View File
@@ -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 })
bms-back/bms-admin/src/main/java/com/bms/web/controller/api/TmsPriceController.java
+2 -2
View File
@@ -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
*/
bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/BillingTaskMonitorController.java
+1 -1
View File
@@ -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")
bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/EsLogController.java
+2 -2
View File
@@ -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;
bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/PriceLogController.java
+2 -2
View File
@@ -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;
bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/TabOrderMonitorController.java
+2 -2
View File
@@ -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;
bms-back/bms-admin/src/main/java/com/bms/web/controller/price/BillingController.java
+3 -3
View File
@@ -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)
{
bms-back/bms-admin/src/main/java/com/bms/web/controller/price/PriceSetController.java
+5 -5
View File
@@ -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)
{
bms-back/bms-admin/src/main/java/com/bms/web/controller/price/ProductController.java
+5 -5
View File
@@ -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,
bms-back/bms-admin/src/main/java/com/bms/web/controller/price/RedlineProductController.java
+5 -5
View File
@@ -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,
bms-back/bms-admin/src/main/java/com/bms/web/controller/price/ZoneController.java
+1 -1
View File
@@ -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")
bms-back/bms-admin/src/main/java/com/bms/web/controller/system/SysFileTemplateController.java
+1 -1
View File
@@ -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
bms-back/bms-admin/src/main/resources/i18n/messages.properties
+10 -10
View File
@@ -76,16 +76,16 @@ price.set.detail.registration.empty=固定价明细必须填写挂号费
price.set.detail.zone.empty=固定价明细必须选择分区
price.set.detail.roundMode.invalid=取值方式仅支持 UP / DOWN / HALF_UP
price.set.detail.freight.belowBase=套餐运费不能低于导入基准价 {0}
price.set.import.fixedOnly=\u4ec5\u56fa\u5b9a\u4ef7\u5957\u9910\u652f\u6301\u5bfc\u5165\u4fee\u6539\u4ef7\u683c
price.set.import.noDetails=\u5957\u9910\u6682\u65e0\u4ef7\u683c\u660e\u7ec6\uff0c\u8bf7\u5148\u62c9\u53d6\u4ea7\u54c1\u4ef7
price.set.import.noPriceRows=\u4ef7\u8868\u672a\u89e3\u6790\u5230\u6709\u6548\u4ef7\u683c\u884c
price.set.import.success=\u5bfc\u5165\u5b8c\u6210\uff1a\u66f4\u65b0 {0} \u6761\uff0c\u672a\u5339\u914d {1} \u6761\uff0c\u5957\u9910\u65e0\u5bf9\u5e94\u4ea7\u54c1 {2} \u4e2a
price.set.import.noDetailWritten=\u672a\u5199\u5165\u4efb\u4f55\u5957\u9910\u660e\u7ec6\uff08\u4ef7\u8868\u65e0\u53ef\u7528\u91cd\u91cf\u6bb5\u6216\u5747\u4e3a\u7a7a\u8fd0\u8d39/\u6302\u53f7\u8d39\u4e14\u65e0\u53ef\u66f4\u65b0\u884c\uff09
price.set.import.updateSuccess=\u5bfc\u5165\u4fee\u6539\u5b8c\u6210\uff1a\u66f4\u65b0 {0} \u6761\uff0c\u672a\u5339\u914d {1} \u6761\uff0c\u8df3\u8fc7\u7a7a\u8fd0\u8d39/\u6302\u53f7\u8d39 {2} \u6761
price.set.import.upsertSuccess=\u5bfc\u5165\u5b8c\u6210\uff1a\u65b0\u589e {0} \u6761\uff0c\u66f4\u65b0 {1} \u6761\uff0c\u8df3\u8fc7\u7a7a\u8fd0\u8d39/\u6302\u53f7\u8d39 {2} \u6761
price.set.import.weightBandMismatch=\u5bfc\u5165\u5931\u8d25\uff1a\u4ee5\u4e0b\u4ea7\u54c1+\u56fd\u5bb6\u7684\u91cd\u91cf\u6bb5\u4e0e\u5957\u9910\u4e0d\u4e00\u81f4\uff1a{0}
price.set.import.weightBandMismatch.item=\u4ea7\u54c1 {0} / \u56fd\u5bb6 {1}\uff08\u5957\u9910\u91cd\u91cf\u6bb5\uff1a{2}\uff1bExcel\uff1a{3}\uff09
price.set.pull.success=\u62c9\u53d6\u5b8c\u6210\uff1a\u5df2\u5199\u5165 {0} \u6761\u5957\u9910\u660e\u7ec6
price.set.import.fixedOnly=仅固定价套餐支持导入修改价格
price.set.import.noDetails=套餐暂无价格明细，请先拉取产品价
price.set.import.noPriceRows=价表未解析到有效价格行
price.set.import.success=导入完成：更新 {0} 条，未匹配 {1} 条，套餐无对应产品 {2} 个
price.set.import.noDetailWritten=未写入任何套餐明细（价表无可用重量段或均为空运费/挂号费且无可更新行）
price.set.import.updateSuccess=导入修改完成：更新 {0} 条，未匹配 {1} 条，跳过空运费/挂号费 {2} 条
price.set.import.upsertSuccess=导入完成：新增 {0} 条，更新 {1} 条，跳过空运费/挂号费 {2} 条
price.set.import.weightBandMismatch=导入失败：以下产品+国家的重量段与套餐不一致：{0}
price.set.import.weightBandMismatch.item=产品 {0} / 国家 {1}（套餐重量段：{2}；Excel：{3}）
price.set.pull.success=拉取完成：已写入 {0} 条套餐明细
price.set.customer.notExists=客户绑定不存在
price.set.customer.unbindAudit=审核中的套餐不允许解绑客户
price.set.customer.customerId.empty=客户ID不能为空