From b3810c8cb1fb0b9b33cd42fcabd0cf30bacab37d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 14 May 2025 15:02:50 +0800
Subject: [PATCH] feat(mall): 添加商品积分价格字段
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiHappySocialCircleServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 602c0df..f2c5f5f 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
@@ -3,9 +3,11 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.StateUpDownEnum;
import cc.mrbird.febs.mall.dto.activity.ApiScInfoDto;
+import cc.mrbird.febs.mall.entity.HappyFollow;
import cc.mrbird.febs.mall.entity.HappySocialCircle;
import cc.mrbird.febs.mall.entity.HappySocialCircleCategory;
import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.mapper.HappyFollowMapper;
import cc.mrbird.febs.mall.mapper.HappySocialCircleCategoryMapper;
import cc.mrbird.febs.mall.mapper.HappySocialCircleMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
@@ -14,6 +16,7 @@
import cc.mrbird.febs.mall.vo.activity.ApiScCategoryInfoVo;
import cc.mrbird.febs.mall.vo.activity.ApiScInfoVo;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -23,6 +26,9 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
@Slf4j
@Service
@@ -30,6 +36,7 @@
public class ApiHappySocialCircleServiceImpl extends ServiceImpl<HappySocialCircleMapper, HappySocialCircle> implements ApiHappySocialCircleService {
private final HappySocialCircleCategoryMapper happySocialCircleCategoryMapper;
+ private final HappyFollowMapper happyFollowMapper;
private final MallMemberMapper mallMemberMapper;
@Override
public FebsResponse allCategory() {
@@ -39,7 +46,7 @@
.select(HappySocialCircleCategory::getId, HappySocialCircleCategory::getName)
.eq(HappySocialCircleCategory::getState, StateUpDownEnum.UP.getCode())
.eq(HappySocialCircleCategory::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
- .orderByDesc(HappySocialCircleCategory::getOrderCnt)
+ .orderByAsc(HappySocialCircleCategory::getOrderCnt)
);
if(CollUtil.isNotEmpty(happySocialCircleCategories)){
for (HappySocialCircleCategory happySocialCircleCategory : happySocialCircleCategories) {
@@ -61,7 +68,7 @@
.eq(HappySocialCircleCategory::getState, StateUpDownEnum.UP.getCode())
.eq(HappySocialCircleCategory::getHotState, StateUpDownEnum.UP.getCode())
.eq(HappySocialCircleCategory::getDeleteFlag, StateUpDownEnum.DOWN.getCode())
- .orderByDesc(HappySocialCircleCategory::getOrderCnt)
+ .orderByAsc(HappySocialCircleCategory::getOrderCnt)
);
if(CollUtil.isNotEmpty(happySocialCircleCategories)){
for (HappySocialCircleCategory happySocialCircleCategory : happySocialCircleCategories) {
--
Gitblit v1.9.1