diff --git a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/config/dto/MemberConfigRespDTO.java b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/config/dto/MemberConfigRespDTO.java index bddae95..c4bf3b5 100644 --- a/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/config/dto/MemberConfigRespDTO.java +++ b/yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/config/dto/MemberConfigRespDTO.java @@ -76,4 +76,9 @@ public class MemberConfigRespDTO { */ private List reportTypeList; + /** + * 是否自动通过微信认证 + */ + private Boolean autoWechatNumAuth; + } 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 1edc2dc..2dceed2 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 @@ -60,4 +60,7 @@ public class MemberConfigBaseVO { @Schema(description = "举报类型") private List reportTypeList; + @Schema(description = "是否自动通过微信认证") + private Boolean autoWechatNumAuth; + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/recent/AppRecentController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/recent/AppRecentController.java index df889d3..f43eb71 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/recent/AppRecentController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/recent/AppRecentController.java @@ -9,6 +9,7 @@ import cn.iocoder.yudao.module.member.controller.admin.recent.vo.RecentPageResVo import cn.iocoder.yudao.module.member.controller.admin.recent.vo.RecentSaveReqVO; import cn.iocoder.yudao.module.member.controller.app.recent.vo.*; import cn.iocoder.yudao.module.member.enums.MemberRecentSceneEnum; +import cn.iocoder.yudao.module.member.service.recent.BO.RecentIssueTotalBO; import cn.iocoder.yudao.module.member.service.recent.RecentService; import cn.iocoder.yudao.module.member.service.recent.ViewRecordService; import cn.iocoder.yudao.module.member.service.user.BO.MemberWechatBO; @@ -56,6 +57,12 @@ public class AppRecentController { return success(recentService.createRecent(BeanUtils.toBean(dto, RecentSaveReqVO.class))); } + @GetMapping("/recent-issue-total") + @Operation(summary = "朋友圈数量统计") + public CommonResult recentIssueTotal() { + return success(recentService.recentIssueTotal(getLoginUserId())); + } + @GetMapping("/get-recent") @Operation(summary = "查看朋友圈") public CommonResult getByRecentId(@RequestParam("recentId") Long recentId) { 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 523751f..2841ba8 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 @@ -96,4 +96,9 @@ public class MemberConfigDO extends BaseDO { @TableField(typeHandler = JacksonTypeHandler.class) private List reportTypeList; + /** + * 是否自动授权微信号 + */ + private Boolean autoWechatNumAuth; + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/BO/RecentIssueTotalBO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/BO/RecentIssueTotalBO.java new file mode 100644 index 0000000..388c3e1 --- /dev/null +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/BO/RecentIssueTotalBO.java @@ -0,0 +1,13 @@ +package cn.iocoder.yudao.module.member.service.recent.BO; + +import lombok.Data; + +@Data +public class RecentIssueTotalBO { + + /** + * 自己发布朋友圈的总数 + */ + private Long selfRecentTotal; + +} diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentService.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentService.java index d8ae1c2..f5c3ebc 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentService.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/recent/RecentService.java @@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.member.controller.admin.recent.vo.*; import cn.iocoder.yudao.module.member.controller.app.recent.vo.*; import cn.iocoder.yudao.module.member.dal.dataobject.recent.RecentDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.module.member.service.recent.BO.RecentIssueTotalBO; import cn.iocoder.yudao.module.member.service.user.BO.MemberWechatBO; /** @@ -18,6 +19,11 @@ public interface RecentService { */ Long createRecent(@Valid RecentSaveReqVO createReqVO); + /** + * 朋友圈数量统计 + */ + RecentIssueTotalBO recentIssueTotal(Long operateUserId); + /** * 查看朋友圈 */ 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 b2e782e..fdb27f8 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 @@ -15,14 +15,12 @@ import cn.iocoder.yudao.module.member.client.vo.txmap.geocoder.TxMapGeocoderResp import cn.iocoder.yudao.module.member.controller.admin.recent.vo.*; import cn.iocoder.yudao.module.member.controller.app.recent.vo.*; import cn.iocoder.yudao.module.member.dal.dataobject.config.MemberConfigDO; -import cn.iocoder.yudao.module.member.dal.dataobject.location.LocationDO; import cn.iocoder.yudao.module.member.dal.dataobject.photo.PhotoDO; import cn.iocoder.yudao.module.member.dal.dataobject.recent.OperationDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberRecentCfgDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberRecentTagDO; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.dal.mysql.recent.OperationMapper; -import cn.iocoder.yudao.module.member.dal.mysql.user.MemberRecentTagMapper; import cn.iocoder.yudao.module.member.enums.MemberErrorCode; import cn.iocoder.yudao.module.member.enums.MemberRecentOperateEnum; import cn.iocoder.yudao.module.member.enums.MemberRecentSceneEnum; @@ -34,6 +32,7 @@ import cn.iocoder.yudao.module.member.client.service.ThirdAuthService; import cn.iocoder.yudao.module.member.service.opentype.OpenTypeService; import cn.iocoder.yudao.module.member.service.photo.BO.MemberPhotoTotalExtBO; import cn.iocoder.yudao.module.member.service.photo.PhotoService; +import cn.iocoder.yudao.module.member.service.recent.BO.RecentIssueTotalBO; import cn.iocoder.yudao.module.member.service.user.BO.MemberExtBO; import cn.iocoder.yudao.module.member.service.user.BO.MemberTagExtBO; import cn.iocoder.yudao.module.member.service.user.BO.MemberWechatBO; @@ -41,6 +40,7 @@ import cn.iocoder.yudao.module.member.service.user.MemberRecentCfgService; import cn.iocoder.yudao.module.member.service.user.MemberRecentTagService; import cn.iocoder.yudao.module.member.service.user.MemberUserService; import cn.iocoder.yudao.module.system.enums.common.SexEnum; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -62,7 +62,6 @@ import cn.iocoder.yudao.module.member.dal.mysql.recent.RecentMapper; import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDateTime; -import java.time.LocalTime; import java.util.*; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; @@ -167,6 +166,19 @@ public class RecentServiceImpl implements RecentService { return recent.getId(); } + /** + * 朋友圈数量统计 + */ + @Override + public RecentIssueTotalBO recentIssueTotal(Long operateUserId) { + RecentIssueTotalBO result = new RecentIssueTotalBO(); + Long count = recentMapper.selectCount(new LambdaQueryWrapper() + .eq(RecentDO::getMemberId, operateUserId) + ); + result.setSelfRecentTotal(count); + return result; + } + /** * 查看朋友圈 */ 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 9e04d1c..ec77819 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 @@ -87,11 +87,11 @@ - order by a.create_time desc , a.id desc + order by a.create_time desc , a.id asc - order by a.create_time asc , distance desc + order by distance asc , a.create_time desc diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index bb662e2..59a4cd0 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -252,7 +252,7 @@ al-config: access-key-id: LTAI5tBrkf3ynA5CMLb4TYbo access-key-secret: u3Za5XigBfRXo0iJHSbPgOSZTDVN3C face-scene-id: 1000016556 - face-verify-callback-url: https://dzc001.fy.takin.cc + face-verify-callback-url: https://chatapi.zianxin.com face-verify-callback-token: uVuYOzoiQBWPp4A5kPgTddZlKWoSQlzc brokerage: