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; + /** * 积分抵扣,单位:分 - * + *

* 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 @@ and u.sex = #{dto.memberSex} + + and u.province like concat('%', #{dto.issueProvince}, '%') + + + and u.city like concat('%', #{dto.issueCity}, '%') + and exists (select 1 from member_recent_tag t