From 55642c818f14bf8cf52c98e6858014bd8dc3d3a7 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 16 四月 2026 20:10:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java b/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
index b6d5d4c..8efa3d4 100644
--- a/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
+++ b/server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java
@@ -134,35 +134,19 @@
}
@PreventRepeat
- @ApiOperation("鏂板棰勮鏃舵晥閰嶇疆")
- @PostMapping("/estimatedDelivery/create")
+ @ApiOperation("淇濆瓨棰勮鏃舵晥閰嶇疆")
+ @PostMapping("/estimatedDelivery/save")
@RequiresPermissions("business:pricingRule:create")
- public ApiResponse createEstimatedDelivery(@RequestBody @Validated EstimatedDeliverySaveDTO request) {
- return ApiResponse.success(pricingRuleService.createEstimatedDelivery(request));
- }
-
- @PreventRepeat
- @ApiOperation("淇敼棰勮鏃舵晥閰嶇疆")
- @PostMapping("/estimatedDelivery/update")
- @RequiresPermissions("business:pricingRule:update")
- public ApiResponse updateEstimatedDelivery(@RequestBody @Validated EstimatedDeliverySaveDTO request) {
- pricingRuleService.updateEstimatedDelivery(request);
+ public ApiResponse saveEstimatedDelivery(@RequestBody @Validated EstimatedDeliverySaveDTO request) {
+ pricingRuleService.saveEstimatedDelivery(request);
return ApiResponse.success(null);
}
- @ApiOperation("鍒犻櫎棰勮鏃舵晥閰嶇疆")
- @GetMapping("/estimatedDelivery/delete/{id}")
- @RequiresPermissions("business:pricingRule:delete")
- public ApiResponse deleteEstimatedDelivery(@PathVariable Integer id) {
- pricingRuleService.deleteEstimatedDelivery(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鏌ヨ棰勮鏃舵晥閰嶇疆鍒楄〃")
+ @ApiOperation("鏌ヨ棰勮鏃舵晥閰嶇疆")
@GetMapping("/estimatedDelivery/list")
@RequiresPermissions("business:pricingRule:query")
public ApiResponse<List<EstimatedDeliveryVO>> listEstimatedDelivery(@RequestParam Integer cityId) {
- return ApiResponse.success(pricingRuleService.listEstimatedDelivery(cityId));
+ return ApiResponse.success(pricingRuleService.getEstimatedDelivery(cityId));
}
@PreventRepeat
--
Gitblit v1.9.3