From 10cc0db30a1be5377e4c09bce349014a667849b6 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 12 一月 2022 13:21:08 +0800
Subject: [PATCH] Merge branch 'phs' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
index 51bb0f8..8ccf9f7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java
@@ -2,11 +2,13 @@
import java.util.List;
+import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.PageDTO;
import com.panzhihua.common.model.dtos.community.ExportUserDTO;
import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
@@ -704,7 +706,7 @@
/**
* 批量重置密码
*/
- R resetPasswordPatch(Long[] userId);
+ R resetPasswordPatch(Long[] userId,String password);
/**
* 便民服务新增商家账号
@@ -727,4 +729,73 @@
* @return
*/
R disableOrEnableMerchantUsers(DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO);
+
+ /**
+ * 根据openid维护社区团队里是否注册
+ * @param openid 用户微信唯一标识
+ */
+ void judgeCommunityTeam(String openid);
+
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
+ R dataKanBans(DataKanBansDto dataKanBansDto);
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ R communityStatistics();
+
+ R communityStatisticsExport();
+
+ /**
+ * 通过UnionId获取用户信息
+ * @param unionId
+ * @return
+ */
+ R getUserInfoByUnionId(String unionId);
+
+ /**
+ * 微商业街新增商家账号
+ * @param mcsMerchantDTO
+ * @return 商家用户id
+ */
+ R addMcsMerchantUser(McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 微商业街修改商家账号
+ * @param mcsMerchantDTO
+ * @return
+ */
+ R putMcsMerchantUser(McsMerchantDTO mcsMerchantDTO);
+
+ /**
+ * 检查用户是否有效
+ * @param userId
+ * @param type
+ * @return
+ */
+ Boolean checkUserIsValid(Long userId, Integer type);
+
+ /**
+ * 根据手机号、用户类型查询用户
+ * @param phone
+ * @param type
+ * @return
+ */
+ R getSysUserByPhone(String phone, Integer type);
+
+ /**
+ * 发送验证码登录
+ * @param phone 手机号
+ * @param clientIP 用户ip
+ * @param prefixKey redis Key 前缀
+ * @param limit 获取次数限制
+ * @param timeout 超次数获取时间等待
+ * @return
+ */
+ R sendMessageCodeForLogin(String phone, String clientIP, String prefixKey, Integer limit, Integer timeout);
}
--
Gitblit v1.7.1