From 3d237ccfcc5aa5534bda80131287e1562e2e0ad3 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 30 八月 2024 15:51:32 +0800
Subject: [PATCH] 会员价展示
---
src/main/java/com/mzl/flower/service/flower/FlowerService.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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 77dbb9c..9c63b20 100644
--- a/src/main/java/com/mzl/flower/service/flower/FlowerService.java
+++ b/src/main/java/com/mzl/flower/service/flower/FlowerService.java
@@ -11,6 +11,7 @@
import com.mzl.flower.entity.customer.Collect;
import com.mzl.flower.entity.customer.Customer;
import com.mzl.flower.entity.flower.*;
+import com.mzl.flower.entity.menber.Member;
import com.mzl.flower.entity.payment.Cart;
import com.mzl.flower.entity.payment.Order;
import com.mzl.flower.entity.payment.OrderItem;
@@ -467,20 +468,7 @@
dto.setUserId(SecurityUtils.getUserId());
dto.setParamId(paramService.getParamIdByCategoryId(dto.getCategory()));
List<FlowerShowListDTO> ls = flowerMapper.selectFlowerShowList(page, dto);
- if(ls != null && ls.size() > 0){
- Long partnerId = getCurrentCustomerPartner();
- for(FlowerShowListDTO s : ls){
- BigDecimal price = getFinalPrice(partnerId, s.getCategory()
- , s.getId(), s.getPrice(), s.getLevel());
- s.setPrice(price);
- s.setCollection(s.getCollectCount() > 0);
- s.setShopnum(s.getShopnum() == null ? 0 : s.getShopnum());
-
- if(s.getSales() != null && s.getRealSales() != null){
- s.setSales(s.getSales() + s.getRealSales());
- }
- }
- }
+ prepareShowList(ls);
page.setRecords(ls);
@@ -507,10 +495,14 @@
if(pId == null){
pId = getCurrentCustomerPartner();
}
+ Customer p = getCurrentCustomerWithoutCheck();
+ Long levelId = p == null ? null : p.getLevelId();
+ Member member = getMember(levelId);
BigDecimal price = getFinalPrice(pId, dto.getCategory()
, s.getId(), dto.getPrice(), dto.getLevel());
dto.setPrice(price);
+ dto.setPriceMember(calculateMemberPrice(price, member));
String userId = SecurityUtils.getUserId();
if(StringUtils.isNotEmpty(userId)) {
@@ -611,8 +603,33 @@
dto.setParamId(paramService.getParamIdByCategoryId(dto.getCategory()));
List<FlowerShowListDTO> flowerShowListDTOS = flowerMapper.myCollect(page, dto);
+ prepareShowList(flowerShowListDTOS);
+
page.setRecords(flowerShowListDTOS);
return page;
+ }
+
+ private void prepareShowList(List<FlowerShowListDTO> ls){
+ if(ls != null && ls.size() > 0){
+ Customer p = getCurrentCustomerWithoutCheck();
+ Long partnerId = p == null ? null : p.getPartnerId();
+ Long levelId = p == null ? null : p.getLevelId();
+ Member member = getMember(levelId);
+
+ for(FlowerShowListDTO s : ls){
+ BigDecimal price = getFinalPrice(partnerId, s.getCategory()
+ , s.getId(), s.getPrice(), s.getLevel());
+ s.setPrice(price);
+ s.setPriceMember(calculateMemberPrice(price, member));
+
+ s.setCollection(s.getCollectCount() > 0);
+ s.setShopnum(s.getShopnum() == null ? 0 : s.getShopnum());
+
+ if(s.getSales() != null && s.getRealSales() != null){
+ s.setSales(s.getSales() + s.getRealSales());
+ }
+ }
+ }
}
public Page<FlowerShowListDTO> myBrowseHistory(Page page, FlowerShowQueryDTO dto) {
@@ -626,6 +643,8 @@
}*/
dto.setParamId(paramService.getParamIdByCategoryId(dto.getCategory()));
List<FlowerShowListDTO> flowerShowListDTOS = flowerMapper.myBrowseHistory(page, dto);
+ prepareShowList(flowerShowListDTOS);
+
page.setRecords(flowerShowListDTOS);
return page;
}
@@ -634,7 +653,8 @@
if(dto.getZoneId()!=null && dto.getZoneId().size()>0){//添加专区
for (Long zoneId : dto.getZoneId()) {
for(Long flowerId : dto.getIds()) {
- FlowerZoneMap fzp = flowerZoneMapMapper.selectOne(new QueryWrapper<FlowerZoneMap>().eq("flower_id", flowerId).eq("zone_id", zoneId));
+ FlowerZoneMap fzp = flowerZoneMapMapper.selectOne(new QueryWrapper<FlowerZoneMap>()
+ .eq("flower_id", flowerId).eq("zone_id", zoneId));
if(fzp==null){
fzp = new FlowerZoneMap();
fzp.setFlowerId(flowerId);
--
Gitblit v1.9.3