From d44a87efeecb96fbc4b1ac6a10961a9d8a8f3021 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 28 Nov 2025 15:51:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=81=8A=E5=A4=A9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/config/vo/MemberConfigBaseVO.java      |  8 ++++++++
 .../dal/dataobject/config/MemberConfigDO.java    | 16 +++++++++++++++-
 .../member/service/recent/RecentServiceImpl.java |  2 ++
 .../src/main/resources/mapper/RecentMapper.xml   |  6 ++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigBaseVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigBaseVO.java
index a9a6b31..d61b4a2 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigBaseVO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/config/vo/MemberConfigBaseVO.java
@@ -28,4 +28,12 @@ public class MemberConfigBaseVO {
     @NotNull(message = "1 元赠送积分不能为空")
     private Integer pointTradeGivePoint;
 
+    @NotNull(message = "普通用户每天可以和几个人聊天不能为空")
+    @Schema(description = "普通用户每天可以和几个人聊天")
+    private Integer defaultChatUserCout;
+
+    @NotNull(message = "普通用户每天可以和人发几次消息不能为空")
+    @Schema(description = "普通用户每天可以和人发几次消息")
+    private Integer defaultChatUserMsgCout;
+
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/config/MemberConfigDO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/config/MemberConfigDO.java
index 6efb4a1..83db08c 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/config/MemberConfigDO.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/dataobject/config/MemberConfigDO.java
@@ -26,23 +26,37 @@ public class MemberConfigDO extends BaseDO {
      */
     @TableId
     private Long id;
+
     /**
      * 积分抵扣开关
      */
     private Boolean pointTradeDeductEnable;
+
     /**
      * 积分抵扣，单位：分
-     *
+     * <p>
      * 1 积分抵扣多少分
      */
     private Integer pointTradeDeductUnitPrice;
+
     /**
      * 积分抵扣最大值
      */
     private Integer pointTradeDeductMaxPrice;
+
     /**
      * 1 元赠送多少分
      */
     private Integer pointTradeGivePoint;
 
+    /**
+     * 普通用户每天可以和几个人聊天
+     */
+    private Integer defaultChatUserCout;
+
+    /**
+     * 普通用户每天可以和人发几次消息
+     */
+    private Integer defaultChatUserMsgCout;
+
 }
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentServiceImpl.java
index 96fdf9b..f59024d 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentServiceImpl.java
+++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentServiceImpl.java
@@ -285,6 +285,8 @@ public class RecentServiceImpl implements RecentService {
 
         RecentPageReqVO resultQuery = BeanUtil.toBean(bean, RecentPageReqVO.class);
         resultQuery.setSceneBizType(bean.getScene().getType());
+        resultQuery.setIssueProvince(bean.getProvince());
+        resultQuery.setIssueCity(bean.getCity());
         // 只查询异性
         if (ObjectUtil.isNotEmpty(operationUser.getSex())) {
             SexEnum sexEnum = SexEnum.valueOfSex(operationUser.getSex());
diff --git a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/RecentMapper.xml b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/RecentMapper.xml
index 931d726..c3f9dde 100644
--- a/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/RecentMapper.xml
+++ b/yudao-module-member/yudao-module-member-biz/src/main/resources/mapper/RecentMapper.xml
@@ -112,6 +112,12 @@
             <if test="dto.memberSex != null">
                 and u.sex = #{dto.memberSex}
             </if>
+            <if test="dto.issueProvince != null">
+                and u.province like concat('%', #{dto.issueProvince}, '%')
+            </if>
+            <if test="dto.issueCity != null">
+                and u.city like concat('%', #{dto.issueCity}, '%')
+            </if>
             <if test="dto.memberRecentTagList != null and dto.memberRecentTagList.size() != 0">
                 and exists (select 1
                 from member_recent_tag t