From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/admin/src/main/java/com/doumee/api/business/PricingRuleController.java | 62 +------------------------------
1 files changed, 2 insertions(+), 60 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 d4e5950..c721b08 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,67 +42,9 @@
@Autowired
private PricingRuleService pricingRuleService;
- /*@PreventRepeat
- @ApiOperation("鏂板缓")
- @PostMapping("/create")
- @RequiresPermissions("business:pricingRule:create")
- public ApiResponse create(@RequestBody PricingRule pricingRule) {
- return ApiResponse.success(pricingRuleService.create(pricingRule));
- }
-
- @ApiOperation("鏍规嵁ID鍒犻櫎")
- @GetMapping("/delete/{id}")
- @RequiresPermissions("business:pricingRule:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
- pricingRuleService.deleteById(id);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鎵归噺鍒犻櫎")
- @GetMapping("/delete/batch")
- @RequiresPermissions("business:pricingRule:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
- String[] idArray = ids.split(",");
- List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
- idList.add(Integer.valueOf(id));
- }
- pricingRuleService.deleteByIdInBatch(idList);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鏍规嵁ID淇敼")
- @PostMapping("/updateById")
- @RequiresPermissions("business:pricingRule:update")
- public ApiResponse updateById(@RequestBody PricingRule pricingRule) {
- pricingRuleService.updateById(pricingRule);
- return ApiResponse.success(null);
- }
-
- @ApiOperation("鍒嗛〉鏌ヨ")
- @PostMapping("/page")
- @RequiresPermissions("business:pricingRule:query")
- public ApiResponse<PageData<PricingRule>> findPage(@RequestBody PageWrap<PricingRule> pageWrap) {
- return ApiResponse.success(pricingRuleService.findPage(pageWrap));
- }
-
- @ApiOperation("瀵煎嚭Excel")
- @PostMapping("/exportExcel")
- @RequiresPermissions("business:pricingRule:exportExcel")
- public void exportExcel(@RequestBody PageWrap<PricingRule> pageWrap, HttpServletResponse response) {
- List<PricingRule> pricingRuleList = pricingRuleService.findPage(pageWrap).getRecords();
- ExcelExporter.build(PricingRule.class).export(pricingRuleList, "璁′环瑙勫垯閰嶇疆", response);
- }
-
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:pricingRule:query")
- public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(pricingRuleService.findById(id));
- }*/
@PreventRepeat
- @ApiOperation("鎵归噺淇濆瓨灏卞湴瀛樺彇瑙勫垯")
+ @ApiOperation("鎵归噺淇濆瓨灏卞湴瀵勫瓨瑙勫垯")
@PostMapping("/localStorage/batchSave")
@RequiresPermissions("business:pricingRule:create")
public ApiResponse batchSaveLocalStoragePricing(@RequestBody @Validated LocalStoragePricingSaveDTO request) {
@@ -110,7 +52,7 @@
return ApiResponse.success(null);
}
- @ApiOperation("鏌ヨ灏卞湴瀛樺彇瑙勫垯鍒楄〃")
+ @ApiOperation("鏌ヨ灏卞湴瀵勫瓨瑙勫垯鍒楄〃")
@GetMapping("/localStorage/list")
@RequiresPermissions("business:pricingRule:query")
public ApiResponse<List<LocalStoragePricingVO>> listLocalStoragePricing(@RequestParam Integer cityId) {
--
Gitblit v1.9.3