From 92fe22d1e6e615750541ef650d815b9576bdf5de Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 09 九月 2024 19:10:06 +0800
Subject: [PATCH] 1、245-小程序-供应商-商品管理-回收站-平台或花农删除的商品全部到回收站，回收站增加恢复和删除的按钮，恢复可以将商品恢复到原来的状态，删除可以将此商品彻底删除 目前在回收站点击编辑上架等功能显示“商品未找到”点击删除也删不了商品 2、 255-小程序-供应商-增加同品类同等级价格排名，方便花农根据排名改价格(前后端修改) 3、252-小程序-花店-首页搜索、交易大厅搜索-1.点击分类显示下拉选择效果 2.热区扩大一些，点击<无法切换
---
src/main/java/com/mzl/flower/web/partner/FlowerMarkupSpController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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..88cfaff 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;
@@ -65,7 +66,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 +95,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) {
+ Partner s = spService.getCurrentPartner();
+ if(s == null){
+ throw new ValidationException("未找到当前合伙人信息");
+ }
+ dto.setPartnerId(s.getId());
+ spService.saveMarkupSpBatch(dto);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
}
--
Gitblit v1.9.3