From bb37b8ff2eac4cb2ab9997a50bf68f5bde16d661 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期四, 08 九月 2022 15:23:37 +0800
Subject: [PATCH] Merge branch 'huacheng_push' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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 ad4f609..323cbc9 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
@@ -38,7 +38,7 @@
* 用户在开放平台的唯一标识符
* @return token
*/
- R updateInsertUser(String openid, String sessionKey, String unionid);
+ R updateInsertUser(String openid, String sessionKey, String unionid,String appId);
/**
* 维护小程序用户基本信息 头像 昵称 性别
@@ -75,7 +75,7 @@
* @param type
* 用户类型 用户类型 1 小程序 2 运营平台 3 社区平台
*/
- R<LoginUserInfoVO> getUserInfo(String name, int type);
+ R<LoginUserInfoVO> getUserInfo(String name, int type,String appId);
/**
* 三端获取登录用户信息
@@ -356,7 +356,7 @@
* 所属app 1居民端app 2网格员端app 3商家端app
* @return 协议内容
*/
- R userAgreement(int type);
+ R userAgreement(int type,String appId);
/**
* 意见反馈
@@ -478,7 +478,7 @@
* 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
* @return 协议内容
*/
- R agreement(Integer type);
+ R agreement(Integer type,String appId);
/**
* 维护用户最后登录时间
@@ -860,7 +860,7 @@
* @param streetId 街道id
* @param areaCode 区县code
* */
- R newIndexData(Integer type, Long streetId,Long areaCode);
+ R newIndexData(Integer type, Long streetId,Long areaCode,String appid);
/**
* 用户占比统计
@@ -868,7 +868,7 @@
* @param streetId 街道id
* @param areaCode 区县code
* @param range */
- R userRate(Integer type, Long streetId, Long areaCode, Integer range);
+ R userRate(Integer type, Long streetId, Long areaCode, Integer range,String appId);
/**
* 真实用户占比统计
@@ -876,7 +876,7 @@
* @param streetId 街道id
* @param areaCode 区县code
* @param range */
- R realUser(Integer type, Long streetId, Long areaCode, Integer range);
+ R realUser(Integer type, Long streetId, Long areaCode, Integer range,String appId);
/**
@@ -884,8 +884,9 @@
* @param type 查看类型
* @param streetId 街道id
* @param areaCode 区县code
- * @param range */
- R userActivity(Integer type, Long streetId, Long areaCode, Integer range);
+ * @param range
+ * @param appId */
+ R userActivity(Integer type, Long streetId, Long areaCode, Integer range, String appId);
/**
* 获取区县即下属街道名
@@ -899,4 +900,24 @@
* @return
*/
R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+
+ /**
+ * 获取城镇或村落列表
+ * */
+ R getCommunityList(String name,Long id);
+
+ /**
+ * 重置密码
+ * @param type
+ * @param account
+ * @return
+ */
+ R resetPassword(Integer type,String account,String appId);
+
+ /**
+ * 天府通办登录
+ * @param uuLoginVO
+ * @return
+ */
+ R tfLogin(UuLoginVO uuLoginVO);
}
--
Gitblit v1.7.1