From f489850355bae6d690b2d3e6d0627f90bde79b1d Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 06 九月 2024 18:59:51 +0800
Subject: [PATCH] 1.优惠券记录新增category查询字段 2.小程序-商品历史记录根据更新时间排序 3.优惠券-用户优惠券控制已下架的优惠券不可重新上架，及当前优惠券的已经发放的情况下不可再次下发
---
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