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/service/flower/FlowerMarkupSpService.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java
index d5cc067..89b410b 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerMarkupSpService.java
@@ -26,7 +26,6 @@
     private FlowerMarkupSpMapper spMapper;
 
     public void saveMarkupSp(FlowerMarkupSpSaveDTO dto){
-
         FlowerMarkupSp sp = spMapper.selectOne(new QueryWrapper<FlowerMarkupSp>()
                 .eq("partner_id", dto.getPartnerId()).eq("flower_id", dto.getFlowerId()));
         if(sp == null){
@@ -45,6 +44,20 @@
         markupCacheClient.addMarkupSp(dto.getPartnerId(), dto.getFlowerId(), sp);
     }
 
+    public void saveMarkupSpBatch(FlowerMarkupSpSaveBatchDTO dto){
+        List<Long> flowerIds = dto.getFlowerIds();
+        if(flowerIds != null && flowerIds.size() > 0){
+            for(Long flowerId : flowerIds){
+                FlowerMarkupSpSaveDTO dt = new FlowerMarkupSpSaveDTO();
+                dt.setFlowerId(flowerId);
+                dt.setPartnerId(dto.getPartnerId());
+                dt.setFee(dto.getFee());
+
+                saveMarkupSp(dt);
+            }
+        }
+    }
+
     public FlowerMarkupSpDTO getMarkupSp(Long flowerId){
         FlowerMarkupSpDTO dto = new FlowerMarkupSpDTO();
         dto.setFlowerId(flowerId);
@@ -59,6 +72,18 @@
         return dto;
     }
 
+    public Page<FlowerMarkupSpListDTO> selectMarkupSpFlowerList(Page page, FlowerMarkupSpQueryDTO dto){
+        List<FlowerMarkupSpListDTO> ll = spMapper.selectMarkupSpFlowerList(page, dto.getPartnerId(), dto);
+        if(ll != null && ll.size() > 0){
+            for(FlowerMarkupSpListDTO ss : ll){
+                ss.setPrice(getFinalPriceForPartner(dto.getPartnerId(), ss.getCategory(), ss.getFlowerId(), ss.getPrice(), ss.getLevel()));
+            }
+        }
+
+        page.setRecords(ll);
+        return page;
+    }
+
     public Page<FlowerMarkupSpListDTO> selectMarkupSpList(Page page, FlowerMarkupSpQueryDTO dto){
 
         List<FlowerMarkupSpListDTO> ll = spMapper.selectMarkupSpList(page, dto.getPartnerId(), dto);

--
Gitblit v1.9.3