From 2377b0ca8cd1839c80c6271a7067ea43a0b78aa7 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Tue, 27 May 2025 15:49:54 +0800
Subject: [PATCH] fix(order): 修复订单列表中提货方式的显示逻辑
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 4971f43..b5027d5 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -14,6 +14,7 @@
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.mall.vo.*;
+import cc.mrbird.febs.mall.vo.memberLevel.ApiLabelInfoVo;
import cc.mrbird.febs.mall.vo.memberLevel.ApiMemberLabelVo;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.service.IXcxPayService;
@@ -330,16 +331,25 @@
List<HappyMemberLabelRecord> happyMemberLabelRecords = happyMemberLabelRecordMapper.selectList(
new LambdaQueryWrapper<HappyMemberLabelRecord>()
.eq(HappyMemberLabelRecord::getMemberId, id)
+ .orderByDesc(HappyMemberLabelRecord::getId)
+ .last("limit 5")
);
if(CollUtil.isNotEmpty(happyMemberLabelRecords)){
Set<Long> collect = happyMemberLabelRecords.stream().map(HappyMemberLabelRecord::getLabelId).collect(Collectors.toSet());
List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
new LambdaQueryWrapper<HappyMemberLabel>()
- .select(HappyMemberLabel::getIconPng)
+ .select(HappyMemberLabel::getIconPng, HappyMemberLabel::getName)
.in(HappyMemberLabel::getId, collect)
);
if(CollUtil.isNotEmpty(happyMemberLabels)){
- mallMemberVo.setLabelList(happyMemberLabels.stream().map(HappyMemberLabel::getIconPng).collect(Collectors.toList()));
+ ArrayList<ApiLabelInfoVo> apiMemberLabelVos = new ArrayList<>();
+ for (HappyMemberLabel happyMemberLabel : happyMemberLabels) {
+ ApiLabelInfoVo apiLabelInfoVo = new ApiLabelInfoVo();
+ apiLabelInfoVo.setIconPng(happyMemberLabel.getIconPng());
+ apiLabelInfoVo.setName(happyMemberLabel.getName());
+ apiMemberLabelVos.add(apiLabelInfoVo);
+ }
+ mallMemberVo.setLabelList(apiMemberLabelVos);
}
}
return new FebsResponse().success().data(mallMemberVo);
@@ -1725,7 +1735,7 @@
Set<Long> collect = happyMemberLabelRecords.stream().map(HappyMemberLabelRecord::getLabelId).collect(Collectors.toSet());
List<HappyMemberLabel> happyMemberLabels = happyMemberLabelMapper.selectList(
new LambdaQueryWrapper<HappyMemberLabel>()
- .select(HappyMemberLabel::getIconPng)
+ .select(HappyMemberLabel::getIconPng, HappyMemberLabel::getName, HappyMemberLabel::getContent, HappyMemberLabel::getHeaderPng)
.in(HappyMemberLabel::getId, collect)
);
if(CollUtil.isNotEmpty(happyMemberLabels)){
--
Gitblit v1.9.1