From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 68 ++++++++++++++++++++++++++++++---
1 files changed, 61 insertions(+), 7 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 a59304d..1bcf0c7 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
@@ -11,6 +11,7 @@
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.partybuilding.ComPbCheckUserDTO;
import com.panzhihua.common.model.dtos.user.PageFeedBackDTO;
import com.panzhihua.common.model.dtos.user.PageUserAppletsBackstageDTO;
import com.panzhihua.common.model.dtos.user.SysUserEditTipsDTO;
@@ -38,7 +39,7 @@
* 用户在开放平台的唯一标识符
* @return token
*/
- R updateInsertUser(String openid, String sessionKey, String unionid);
+ R updateInsertUser(String openid, String sessionKey, String unionid,String appId);
/**
* 维护小程序用户基本信息 头像 昵称 性别
@@ -478,7 +479,7 @@
* 1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
* @return 协议内容
*/
- R agreement(Integer type);
+ R agreement(Integer type,String appId);
/**
* 维护用户最后登录时间
@@ -860,7 +861,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 +869,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 +877,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 +885,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 +901,56 @@
* @return
*/
R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+
+ /**
+ * 无水洗车通知推送
+ * @param phone
+ * @param orderStatus
+ * @return
+ */
+ R wsPush(@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);
+
+ /**
+ * 三说会堂新增业务中心或专家账号
+ * */
+ R addExpertOrIndustryCenter(AdministratorsUserVO administratorsUserVO);
+
+ /**
+ * 三说会堂后台重置密码
+ * */
+ R resetPassExpertOrIndustryCenter(String account,String password);
+
+ /**
+ * 用户授权
+ * @param userId
+ * @return
+ */
+ R accept(Long userId);
+
+ R addComPbCheckUser(ComPbCheckUserDTO comPbCheckUserDTO);
+
+ /**
+ * 移除专家权限
+ * */
+ R removeExpertRole(String phone);
}
--
Gitblit v1.7.1