From b6a7f6e41467f73f26fc7f209652e19ff26c3752 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期二, 03 九月 2024 20:18:32 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java | 7 +++++++
src/main/java/com/mzl/flower/service/flower/FlowerMarkupPsService.java | 15 +++++++++++++++
src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java
new file mode 100644
index 0000000..747a186
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/request/flower/FlowerMarkupPsSpCgBatchSaveDTO.java
@@ -0,0 +1,34 @@
+package com.mzl.flower.dto.request.flower;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class FlowerMarkupPsSpCgBatchSaveDTO {
+ @ApiModelProperty(value = "合伙人id")
+ private Long partnerId;
+
+ @ApiModelProperty(value = "分类id列表")
+ private List<Long> categoryId;
+
+ @ApiModelProperty(value = "A级金额")
+ private BigDecimal levelA;
+
+ @ApiModelProperty(value = "B级金额")
+ private BigDecimal levelB;
+
+ @ApiModelProperty(value = "C级金额")
+ private BigDecimal levelC;
+
+ @ApiModelProperty(value = "D级金额")
+ private BigDecimal levelD;
+
+ @ApiModelProperty(value = "E级金额")
+ private BigDecimal levelE;
+
+ @ApiModelProperty(value = "O级金额")
+ private BigDecimal levelO;
+}
diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupPsService.java b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupPsService.java
index a5a830d..0e92cf2 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupPsService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupPsService.java
@@ -66,6 +66,21 @@
markupCacheClient.deleteAllPsSpCg(id);
}
+ public void saveMarkupSpCgBatch(FlowerMarkupPsSpCgBatchSaveDTO dto){
+ List<Long> categoryIds = dto.getCategoryId();
+ if(categoryIds == null || categoryIds.size() == 0){
+ throw new ValidationException("分类列表不能为空");
+ }
+ for(Long categoryId : categoryIds) {
+ FlowerMarkupPsSpCgSaveDTO cg = new FlowerMarkupPsSpCgSaveDTO();
+ BeanUtils.copyProperties(dto, cg);
+
+ cg.setCategoryId(categoryId);
+
+ saveMarkupSpCg(cg);
+ }
+ }
+
public void saveMarkupSpCg(FlowerMarkupPsSpCgSaveDTO dto){
Long cId = dto.getCategoryId();
FlowerMarkupPsSpCg cg = spCgMapper.selectOne(new QueryWrapper<FlowerMarkupPsSpCg>()
diff --git a/src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java b/src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java
index 442961f..a9a441c 100644
--- a/src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java
+++ b/src/main/java/com/mzl/flower/web/flower/FlowerMarkupPsController.java
@@ -49,6 +49,13 @@
return returnData(R.SUCCESS.getCode(), null);
}
+ @PostMapping("/spcg/list/save/batch")
+ @ApiOperation(value = "批量新增商品分类加价")
+ public ResponseEntity<ReturnDataDTO> saveMarkupSpCgBatch(@RequestBody FlowerMarkupPsSpCgBatchSaveDTO dto) {
+ psService.saveMarkupSpCgBatch(dto);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
@PostMapping("/spcg/list/save")
@ApiOperation(value = "新增商品分类加价")
public ResponseEntity<ReturnDataDTO> saveMarkupSpCg(@RequestBody FlowerMarkupPsSpCgSaveDTO dto) {
--
Gitblit v1.9.3