From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java | 32 ++++++++------------------------
1 files changed, 8 insertions(+), 24 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..d4e5950 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
@@ -42,7 +42,7 @@
@Autowired
private PricingRuleService pricingRuleService;
- @PreventRepeat
+ /*@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
@RequiresPermissions("business:pricingRule:create")
@@ -99,7 +99,7 @@
@RequiresPermissions("business:pricingRule:query")
public ApiResponse findById(@PathVariable Integer id) {
return ApiResponse.success(pricingRuleService.findById(id));
- }
+ }*/
@PreventRepeat
@ApiOperation("鎵归噺淇濆瓨灏卞湴瀛樺彇瑙勫垯")
@@ -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