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/FlowerService.java |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerService.java b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
index 9c63b20..98451a5 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -333,8 +333,6 @@
             dto.setZoneName(String.join(",", zoneNameLs));
         }
 
-        //TODO 合伙人加价列表
-
         return dto;
     }
 
@@ -500,7 +498,7 @@
         Member member = getMember(levelId);
 
         BigDecimal price = getFinalPrice(pId, dto.getCategory()
-                , s.getId(), dto.getPrice(), dto.getLevel());
+                , dto.getId(), dto.getPrice(), dto.getLevel());
         dto.setPrice(price);
         dto.setPriceMember(calculateMemberPrice(price, member));
 
@@ -722,4 +720,14 @@
 
         return page;
     }
+
+    public void clearInvalidHistory(String userId) {
+
+        List<Long> ids = flowerMapper.searchInvalidHistory(userId);
+        if(ids!=null && ids.size()>0){
+            browseService.deleteBatchIds(ids);
+
+        }
+
+    }
 }

--
Gitblit v1.9.3