From a768dc3daa04d35fedfbe75c0a59b9b2545b85c4 Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期四, 19 九月 2024 16:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2'
---
src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java b/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java
index 3000ec0..41f590e 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerCategoryService.java
@@ -13,12 +13,15 @@
import com.mzl.flower.dto.response.flower.FlowerCategoryDTO;
import com.mzl.flower.dto.response.flower.FlowerCategoryShowDTO;
import com.mzl.flower.dto.response.flower.FlowerCategoryTreeDTO;
+import com.mzl.flower.entity.customer.Customer;
import com.mzl.flower.entity.flower.Flower;
import com.mzl.flower.entity.flower.FlowerCategory;
import com.mzl.flower.entity.flower.FlowerCategoryDaily;
+import com.mzl.flower.entity.menber.Member;
import com.mzl.flower.mapper.flower.FlowerCategoryDailyMapper;
import com.mzl.flower.mapper.flower.FlowerCategoryMapper;
import com.mzl.flower.mapper.flower.FlowerMapper;
+import com.mzl.flower.mapper.member.MemberMapper;
import com.mzl.flower.service.BaseService;
import com.mzl.flower.utils.TreeBuilderUtil;
import io.micrometer.core.instrument.util.StringUtils;
@@ -154,7 +157,11 @@
List<FlowerCategoryTreeDTO> treeList = new ArrayList<>();
List<FlowerCategoryTreeDTO> result = new ArrayList<>();
if(tLs != null && tLs.size() > 0){
- Long partnerId = getCurrentCustomerPartner();
+ Customer p = getCurrentCustomerWithoutCheck();
+ Long partnerId = p == null ? null : p.getPartnerId();
+ Long levelId = p == null ? null : p.getLevelId();
+ Member member = getMember(levelId);
+
for(FlowerCategoryTreeDTO t : tLs){
if(t.getParentId() != null && t.getFlowerCount() == 0){
continue;
@@ -165,6 +172,8 @@
JSONObject o = parseObject(ppp, JSONObject.class);
t.setPriceLow(o.getBigDecimal("priceLow"));
t.setPriceHigh(o.getBigDecimal("priceHigh"));
+ t.setPriceLowMember(calculateMemberPrice(t.getPriceLow(), member));
+ t.setPriceHighMember(calculateMemberPrice(t.getPriceHigh(), member));
}
treeList.add(t);
--
Gitblit v1.9.3