From ae1471f378f399f76518539ec8992e64a3673436 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 08 一月 2025 15:26:06 +0800
Subject: [PATCH] 1.订单提交：订单最小金额配置
---
src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpController.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpController.java b/src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpController.java
index 6d56aca..da846f4 100644
--- a/src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpController.java
+++ b/src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpController.java
@@ -6,6 +6,7 @@
import com.mzl.flower.base.ReturnDataDTO;
import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.dto.request.flower.FlowerMarkupSpQueryDTO;
+import com.mzl.flower.dto.request.flower.FlowerMarkupSpSaveBatchDTO;
import com.mzl.flower.dto.request.flower.FlowerMarkupSpSaveDTO;
import com.mzl.flower.dto.response.flower.FlowerMarkupSpDTO;
import com.mzl.flower.dto.response.flower.FlowerMarkupSpListDTO;
@@ -21,6 +22,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
@RestController
@RequestMapping("/api/flower/markup/sp")
@Api(value = "合伙人商品加价管理", tags = "合伙人商品加价管理")
@@ -33,23 +37,23 @@
@PostMapping("/list/save")
@ApiOperation(value = "新增商品加价")
- public ResponseEntity<ReturnDataDTO> saveMarkupSp(@RequestBody FlowerMarkupSpSaveDTO dto) {
+ public ResponseEntity<ReturnDataDTO> saveMarkupSp(@RequestBody FlowerMarkupSpSaveDTO dto, HttpServletRequest request) throws IOException {
Partner s = spService.getCurrentPartner();
if(s == null){
throw new ValidationException("未找到当前合伙人信息");
}
dto.setPartnerId(s.getId());
- spService.saveMarkupSp(dto);
+ spService.saveMarkupSp(dto,request);
return returnData(R.SUCCESS.getCode(), null);
}
@PostMapping("/list/save/platform")
@ApiOperation(value = "运营平台新增商品加价")
- public ResponseEntity<ReturnDataDTO> saveMarkupSpPlatform(@RequestBody FlowerMarkupSpSaveDTO dto) {
+ public ResponseEntity<ReturnDataDTO> saveMarkupSpPlatform(@RequestBody FlowerMarkupSpSaveDTO dto,HttpServletRequest request) throws IOException {
if(dto.getPartnerId()== null || dto.getPartnerId() == 0){
throw new ValidationException("合伙人id不能为空");
}
- spService.saveMarkupSp(dto);
+ spService.saveMarkupSp(dto,request);
return returnData(R.SUCCESS.getCode(), null);
}
@@ -65,7 +69,8 @@
@GetMapping("/list")
@ApiOperation(value = "获取商品加价列表")
- public ResponseEntity<ReturnDataDTO<Page<FlowerMarkupSpListDTO>>> selectMarkupSpList(Page page, FlowerMarkupSpQueryDTO dto){
+ public ResponseEntity<ReturnDataDTO<Page<FlowerMarkupSpListDTO>>> selectMarkupSpList(Page page
+ , FlowerMarkupSpQueryDTO dto){
Partner s = spService.getCurrentPartner();
if(s == null){
throw new ValidationException("未找到当前合伙人信息");
@@ -93,4 +98,28 @@
return returnData(R.SUCCESS.getCode(), null);
}
+
+ @GetMapping("/flower/list")
+ @ApiOperation(value = "获取加价商品加列表")
+ public ResponseEntity<ReturnDataDTO<Page<FlowerMarkupSpListDTO>>> selectMarkupSpFlowerList(Page page
+ , FlowerMarkupSpQueryDTO dto){
+ Partner s = spService.getCurrentPartner();
+ if(s == null){
+ throw new ValidationException("未找到当前合伙人信息");
+ }
+ dto.setPartnerId(s.getId());
+ return returnData(R.SUCCESS.getCode(), spService.selectMarkupSpFlowerList(page, dto));
+ }
+
+ @PostMapping("/flower/list/save")
+ @ApiOperation(value = "批量新增商品加价")
+ public ResponseEntity<ReturnDataDTO> saveMarkupSpBatch(@RequestBody FlowerMarkupSpSaveBatchDTO dto,HttpServletRequest request) throws IOException {
+ Partner s = spService.getCurrentPartner();
+ if(s == null){
+ throw new ValidationException("未找到当前合伙人信息");
+ }
+ dto.setPartnerId(s.getId());
+ spService.saveMarkupSpBatch(dto,request);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
}
--
Gitblit v1.9.3