From 94c34f08015c3f5f4d839354958aea88b31473a0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 21 一月 2022 11:13:07 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 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 3c2a312..c669969 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
@@ -8,6 +8,7 @@
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.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
@@ -415,7 +416,7 @@
*
* @return 展示数据
*/
- R dataKanban();
+ R dataKanban(String areaCode);
/**
* 社区管理后台数据看板
@@ -747,9 +748,9 @@
* 运营后台-用户数据统计汇总
* @return 用户数据统计汇总
*/
- R communityStatistics();
+ R communityStatistics(String areaCode);
- R communityStatisticsExport();
+ R communityStatisticsExport(String areaCode);
/**
* 通过UnionId获取用户信息
@@ -771,4 +772,45 @@
* @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 sendMessageCode(String phone, String clientIP, String prefixKey, Integer limit, Integer timeout);
+
+ /**
+ * 根据openId获取微商业街用户
+ * @param openid
+ * @return
+ */
+ R getMcsUserByOpenId(String openid);
+
+ /**
+ * 商业街用户微信授权-绑定手机号
+ * @param bindUserPhoneDTO
+ * @return
+ */
+ R bindOrAddMcsUser(BindUserPhoneDTO bindUserPhoneDTO);
}
--
Gitblit v1.7.1