From c951d18a2c81aac586773beac0638e63a0d78348 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 7 Apr 2025 09:16:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/mapper/busi/BusiNoticeMapper.xml | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
index 615104a..ca1aff8 100644
--- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
@@ -214,10 +214,22 @@ order by dbns.create_time desc
AND ( dbn.gift_detail IS NOT NULL AND dbn.gift_detail != '' )
- AND ( dbn.platform_code =#{entity.platformCode} )
+ and dbn.platform_code IN
+
+ -- platform_code 包含it
+ #{it}
+
- AND ( dbn.blogger_types LIKE CONCAT('%',#{entity.bloggerType},'%') )
+ and
+
+ dbn.blogger_types like concat('%',#{it},'%')
+
+
+
+
+ AND ( dbn.blogger_types IN (#{it}) )
+
AND ( dbn.title LIKE CONCAT('%',#{entity.searchValue},'%') OR
From 93cf789dc7f08af87990f8c7f3c5d3d4134690f6 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 7 Apr 2025 15:14:17 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../busi/controller/BusiNoticeController.java | 21 +++++++
.../ruoyi/busi/mapper/BusiNoticeMapper.java | 8 +++
.../busi/service/IBusiNoticeService.java | 4 ++
.../service/impl/BusiNoticeServiceImpl.java | 31 ++++++++++
.../com/ruoyi/busi/vo/SubscribeDataObj.java | 4 +-
.../controller/MemberBusiCardController.java | 15 +++++
.../member/query/MemberBusiCardQuery.java | 9 +++
.../service/IMemberBusiCardService.java | 7 +++
.../impl/MemberBusiCardServiceImpl.java | 48 +++++++++++++++
.../com/ruoyi/member/vo/MemberBusiCardVO.java | 2 +
.../mapper/busi/BusiNoticeMapper.xml | 59 +++++++++++++------
11 files changed, 189 insertions(+), 19 deletions(-)
create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/member/query/MemberBusiCardQuery.java
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java
index 5dea874..e6824e5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/controller/BusiNoticeController.java
@@ -231,4 +231,25 @@ public class BusiNoticeController extends BaseController
IPage list = busiNoticeService.subscribeList(query,page);
return success(list);
}
+
+
+
+ /**
+ * 小程序端查询关注通告列表
+ * @author zcy
+ * @date 15:39 2025/3/29
+ * @param query 查询条件
+ * @param pageNum 1
+ * @param pageSize 10
+ * @return com.ruoyi.common.core.domain.AjaxResult
+ **/
+ @GetMapping("/loveList")
+ public AjaxResult loveList(AppNoticeQuery query,
+ @RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize)
+ {
+ Page page = new Page<>(pageNum, pageSize);
+ IPage list = busiNoticeService.loveList(query,page);
+ return success(list);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java
index 1b2d589..f14fae7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/mapper/BusiNoticeMapper.java
@@ -60,6 +60,14 @@ public interface BusiNoticeMapper extends BaseMapper {
**/
IPage subscribeList(@Param("entity") SubscribeDataObj subscribeDataObj, Page page);
+ /**
+ * 小程序端查询关注通告列表
+ * @author zcy
+ * @date 15:39 2025/3/29
+ * @param query 查询条件
+ * @return com.ruoyi.common.core.domain.AjaxResult
+ **/
+ IPage loveList(@Param("entity") AppNoticeQuery query, Page page);
/**
* 小程序端查询通告详细信息
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java
index e6eac8a..63e4431 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/IBusiNoticeService.java
@@ -84,4 +84,8 @@ public interface IBusiNoticeService extends IService
IPage subscribeList(AppNoticeQuery query, Page page);
+ IPage loveList(AppNoticeQuery query, Page page);
+
+
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
index fd1ae01..0f0e61c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/service/impl/BusiNoticeServiceImpl.java
@@ -344,6 +344,23 @@ public class BusiNoticeServiceImpl extends ServiceImpl loveList(AppNoticeQuery query, Page page) {
+ //获取当前登录用户
+ Long userId = SecurityUtils.getUserId();
+ query.setUserId(userId);
+ return baseMapper.loveList(query,page);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/SubscribeDataObj.java b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/SubscribeDataObj.java
index 6f1dff4..854a7fb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/SubscribeDataObj.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/busi/vo/SubscribeDataObj.java
@@ -10,8 +10,8 @@ public class SubscribeDataObj {
private List bloggerTypeCode;
//平台
private List platformCode;
- //通告类型
- private List noticeTypeCode;
+ //结算方式类型
+ private String settleTypeCode;
//关键词
private List keywordsList;
//奖励类型
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBusiCardController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBusiCardController.java
index 73742e4..7859194 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBusiCardController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberBusiCardController.java
@@ -1,5 +1,6 @@
package com.ruoyi.member.controller;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
@@ -8,7 +9,9 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.member.domain.MemberBusiCard;
+import com.ruoyi.member.query.MemberBusiCardQuery;
import com.ruoyi.member.service.IMemberBusiCardService;
+import com.ruoyi.member.vo.MemberBusiCardVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -118,4 +121,16 @@ public class MemberBusiCardController extends BaseController {
memberBusiCardService.removeById(id);
return success();
}
+
+
+ /**
+ * 查询博主名片符合信息
+ * @author zcy
+ * @date 21:47 2025/3/21
+ **/
+ @GetMapping("/getSignCard")
+ public AjaxResult getSignCard(MemberBusiCardQuery query) {
+ JSONObject res = memberBusiCardService.getSignCard(query);
+ return success(res);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/query/MemberBusiCardQuery.java b/ruoyi-admin/src/main/java/com/ruoyi/member/query/MemberBusiCardQuery.java
new file mode 100644
index 0000000..6e7abe3
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/query/MemberBusiCardQuery.java
@@ -0,0 +1,9 @@
+package com.ruoyi.member.query;
+
+import lombok.Data;
+
+@Data
+public class MemberBusiCardQuery {
+ //通告id
+ private String noticeId;
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBusiCardService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBusiCardService.java
index ec96f3f..c1f8ca1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBusiCardService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberBusiCardService.java
@@ -1,9 +1,11 @@
package com.ruoyi.member.service;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.member.domain.MemberBusiCard;
+import com.ruoyi.member.query.MemberBusiCardQuery;
import com.ruoyi.member.vo.MemberBusiCardVO;
import java.util.List;
@@ -64,4 +66,9 @@ public interface IMemberBusiCardService extends IService {
* @date 13:44 2025/4/3
**/
void saveBusiCard(MemberBusiCard memberBusiCard);
+
+ JSONObject getSignCard(MemberBusiCardQuery req);
+
+
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java
index f4930c5..61fe3d7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java
@@ -1,25 +1,32 @@
package com.ruoyi.member.service.impl;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.base.domain.BaseCategory;
import com.ruoyi.base.service.IBaseCategoryService;
+import com.ruoyi.busi.domain.BusiNotice;
+import com.ruoyi.busi.service.IBusiNoticeService;
import com.ruoyi.common.core.domain.DlBaseEntity;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.member.domain.MemberBusiCard;
import com.ruoyi.member.mapper.MemberBusiCardMapper;
+import com.ruoyi.member.query.MemberBusiCardQuery;
import com.ruoyi.member.service.IMemberBusiCardService;
import com.ruoyi.member.vo.MemberBusiCardVO;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 博主名片Service业务层处理
@@ -33,6 +40,8 @@ public class MemberBusiCardServiceImpl extends ServiceImpl resList =new ArrayList<>();
+ BusiNotice busiNotice = noticeService.getById(req.getNoticeId());
+ //先获取博主全部审核通过的该平台的名片
+ Long userId = SecurityUtils.getUserId();
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
+ lambdaQueryWrapper.eq(MemberBusiCard::getUserId, userId).eq(MemberBusiCard::getPlatformCode, busiNotice.getPlatformCode())
+ .eq(MemberBusiCard::getApprovalStatus, "1");
+ List list = list(lambdaQueryWrapper);
+ for (MemberBusiCard memberBusiCard : list) {
+ MemberBusiCardVO memberBusiCardVO = new MemberBusiCardVO();
+ BeanUtils.copyProperties(memberBusiCard, memberBusiCardVO);
+ memberBusiCardVO.setCanUse("1");
+ resList.add(memberBusiCardVO);
+ }
+ int canUseNum =0;
+ //获取通告的粉丝限制
+ if (null != req.getNoticeId()) {
+ //获取通告的粉丝限制
+ for (MemberBusiCardVO re : resList) {
+ if ((null == busiNotice.getFansUp() ||re.getFansNum() > busiNotice.getFansUp())||(null ==busiNotice.getFansDown() || re.getFansNum() < busiNotice.getFansDown()) ) {
+ re.setCanUse("0");
+ canUseNum++;
+ }
+ }
+ }
+ res.put("list", resList);
+ res.put("canUserNum", canUseNum);
+ return res;
+
+
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberBusiCardVO.java b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberBusiCardVO.java
index f82808e..ed54e79 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberBusiCardVO.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/vo/MemberBusiCardVO.java
@@ -7,4 +7,6 @@ import lombok.Data;
public class MemberBusiCardVO extends MemberBusiCard {
/**地址*/
String address;
+ //是否可用 0否1是
+ String canUse;
}
diff --git a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
index ca1aff8..3182bf3 100644
--- a/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/busi/BusiNoticeMapper.xml
@@ -150,6 +150,7 @@ order by dbns.create_time desc
WHERE
dbn.del_flag = 0
AND (dbn.approval_status = '1')
+ and dbn.end_date >= CURDATE()
AND ( dbn.gift_detail IS NOT NULL AND dbn.gift_detail != '' )
@@ -210,9 +211,7 @@ order by dbns.create_time desc
WHERE
dbn.del_flag = 0
AND (dbn.approval_status = '1')
-
- AND ( dbn.gift_detail IS NOT NULL AND dbn.gift_detail != '' )
-
+ and dbn.end_date >= CURDATE()
and dbn.platform_code IN
@@ -226,21 +225,16 @@ order by dbns.create_time desc
dbn.blogger_types like concat('%',#{it},'%')
-
-
- AND ( dbn.blogger_types IN (#{it}) )
+
+ and dbn.settle_type = #{entity.settleTypeCode}
+
+
+
+ and
+
+ title like concat('%',#{it},'%') or detail like concat('%',#{it},'%') or brand like concat('%',#{it},'%')
-
- AND ( dbn.title LIKE CONCAT('%',#{entity.searchValue},'%') OR
- dbn.detail LIKE CONCAT('%',#{entity.searchValue},'%') )
-
-
- AND ( dbn.fee_down IS NOT NULL OR dbn.fee_up IS NOT NULL )
-
-
- AND ( dbn.gift_detail IS NOT NULL AND dbn.gift_detail!='' )
-
AND ( dbn.fans_up <=#{entity.fansUp} )
@@ -265,10 +259,41 @@ order by dbns.create_time desc
-- 默认正序排列 --
- dbn.create_time ASC
+ dbn.create_time DESC
+
From 6a7085fc202ee19c5cc1f4def9c9fa3150b2b94a Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 7 Apr 2025 15:42:00 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/impl/MemberBusiCardServiceImpl.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java
index 61fe3d7..32313f7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberBusiCardServiceImpl.java
@@ -154,15 +154,13 @@ public class MemberBusiCardServiceImpl extends ServiceImpl busiNotice.getFansUp())||(null ==busiNotice.getFansDown() || re.getFansNum() < busiNotice.getFansDown()) ) {
- re.setCanUse("0");
- canUseNum++;
- }
+ //获取通告的粉丝限制
+ for (MemberBusiCardVO re : resList) {
+ if ((null != busiNotice.getFansUp() &&re.getFansNum() > busiNotice.getFansUp())||(null !=busiNotice.getFansDown() && re.getFansNum() < busiNotice.getFansDown()) ) {
+ re.setCanUse("0");
+ canUseNum--;
}
}
res.put("list", resList);