From 03bd93bf72ea24c2134c08bff69a3671202759ff Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 15 Sep 2025 13:48:44 +0800
Subject: [PATCH] feat(mall): 优化活动订单列表接口和导出功能
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java
index 9881d10..95b9080 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java
@@ -40,7 +40,7 @@
ArrayList<ApiScCategoryInfoVo> objects = new ArrayList<>();
List<HappySocialCircleCategory> happySocialCircleCategories = happySocialCircleCategoryMapper.selectList(
new LambdaQueryWrapper<HappySocialCircleCategory>()
- .select(HappySocialCircleCategory::getId, HappySocialCircleCategory::getName)
+ .select(HappySocialCircleCategory::getId, HappySocialCircleCategory::getName, HappySocialCircleCategory::getBackImage)
.eq(HappySocialCircleCategory::getState, StateUpDownEnum.UP.getCode())
.eq(HappySocialCircleCategory::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
.orderByAsc(HappySocialCircleCategory::getOrderCnt)
@@ -50,6 +50,7 @@
ApiScCategoryInfoVo apiScCategoryInfoVo = new ApiScCategoryInfoVo();
apiScCategoryInfoVo.setId(happySocialCircleCategory.getId());
apiScCategoryInfoVo.setName(happySocialCircleCategory.getName());
+ apiScCategoryInfoVo.setBackImage(happySocialCircleCategory.getBackImage());
objects.add(apiScCategoryInfoVo);
}
}
@@ -61,7 +62,7 @@
ArrayList<ApiScCategoryInfoVo> objects = new ArrayList<>();
List<HappySocialCircleCategory> happySocialCircleCategories = happySocialCircleCategoryMapper.selectList(
new LambdaQueryWrapper<HappySocialCircleCategory>()
- .select(HappySocialCircleCategory::getId, HappySocialCircleCategory::getName)
+ .select(HappySocialCircleCategory::getId, HappySocialCircleCategory::getName, HappySocialCircleCategory::getBackImage)
.eq(HappySocialCircleCategory::getState, StateUpDownEnum.UP.getCode())
.eq(HappySocialCircleCategory::getHotState, StateUpDownEnum.UP.getCode())
.eq(HappySocialCircleCategory::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
@@ -72,6 +73,7 @@
ApiScCategoryInfoVo apiScCategoryInfoVo = new ApiScCategoryInfoVo();
apiScCategoryInfoVo.setId(happySocialCircleCategory.getId());
apiScCategoryInfoVo.setName(happySocialCircleCategory.getName());
+ apiScCategoryInfoVo.setBackImage(happySocialCircleCategory.getBackImage());
objects.add(apiScCategoryInfoVo);
}
}
@@ -108,7 +110,7 @@
.select(HappyFollow::getId, HappyFollow::getType)
.eq(HappyFollow::getSourceType, StateUpDownEnum.SOURCE_TYPE_SOCIAL_CIRCLE.getCode())
.eq(HappyFollow::getSourceId, happySocialCircle.getId())
- .in(HappyFollow::getType, Arrays.asList(StateUpDownEnum.LIKE.getCode(), StateUpDownEnum.SHARE.getCode()))
+ .in(HappyFollow::getType, Arrays.asList(StateUpDownEnum.FOLLOW.getCode(), StateUpDownEnum.LIKE.getCode(), StateUpDownEnum.SHARE.getCode()))
.eq(HappyFollow::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
);
if(CollUtil.isNotEmpty(happyFollows)){
@@ -119,6 +121,8 @@
apiScInfoVo.setZanCnt(Math.toIntExact(zanCnt));
Long sendCnt = ObjectUtil.defaultIfNull(typeCountMap.get(StateUpDownEnum.SHARE.getCode()), 0L);
apiScInfoVo.setSendCnt(Math.toIntExact(sendCnt));
+ Long followCnt = ObjectUtil.defaultIfNull(typeCountMap.get(StateUpDownEnum.FOLLOW.getCode()), 0L);
+ apiScInfoVo.setFollowCnt(Math.toIntExact(followCnt));
}
}
return new FebsResponse().success().data(apiScInfoVo);
--
Gitblit v1.9.1