From 55255f6b9f81b8a3fdd576b27cda5c34fbb7ba0a Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 12 九月 2024 17:39:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpCgController.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpCgController.java b/src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpCgController.java
index 194943a..ef808e8 100644
--- a/src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpCgController.java
+++ b/src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpCgController.java
@@ -5,6 +5,7 @@
import com.mzl.flower.base.R;
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.config.exception.ValidationException;
+import com.mzl.flower.dto.request.flower.FlowerMarkupSpCgBatchSaveDTO;
import com.mzl.flower.dto.request.flower.FlowerMarkupSpCgQueryDTO;
import com.mzl.flower.dto.request.flower.FlowerMarkupSpCgSaveDTO;
import com.mzl.flower.dto.response.flower.FlowerMarkupSpCgDTO;
@@ -43,6 +44,18 @@
return returnData(R.SUCCESS.getCode(), null);
}
+ @PostMapping("/list/save/batch")
+ @ApiOperation(value = "批量新增商品分类加价")
+ public ResponseEntity<ReturnDataDTO> saveMarkupSpCgBatch(@RequestBody FlowerMarkupSpCgBatchSaveDTO dto) {
+ Partner s = spCgService.getCurrentPartner();
+ if(s == null){
+ throw new ValidationException("未找到当前合伙人信息");
+ }
+ dto.setPartnerId(s.getId());
+ spCgService.saveMarkupSpCgBatch(dto);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
@PostMapping("/list/save/platform")
@ApiOperation(value = "运营平台新增商品分类加价")
public ResponseEntity<ReturnDataDTO> saveMarkupSpCgPlatform(@RequestBody FlowerMarkupSpCgSaveDTO dto) {
--
Gitblit v1.9.3