From 0947c349e79d437dfb056bb2c622cba478c882f0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 21 七月 2022 15:40:56 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java |   75 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 2 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 2c2e927..a59304d 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
@@ -18,6 +18,7 @@
 import com.panzhihua.common.model.vos.*;
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
 import com.panzhihua.common.model.vos.user.*;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -74,7 +75,7 @@
      * @param type
      *            用户类型 用户类型 1 小程序 2 运营平台 3 社区平台
      */
-    R<LoginUserInfoVO> getUserInfo(String name, int type);
+    R<LoginUserInfoVO> getUserInfo(String name, int type,String appId);
 
     /**
      * 三端获取登录用户信息
@@ -355,7 +356,7 @@
      *            所属app 1居民端app 2网格员端app 3商家端app
      * @return 协议内容
      */
-    R userAgreement(int type);
+    R userAgreement(int type,String appId);
 
     /**
      * 意见反馈
@@ -451,6 +452,15 @@
      * @return 修改结果
      */
     R updateUserIsPartymember(String idCard);
+
+    /**
+     * 修改用户的党员状态
+     *
+     * @param phone
+     *            身份证号
+     * @return 修改结果
+     */
+    R updateUserIsPartymemberByPhone(String phone);
 
     /**
      * 修改用户为非党员状态
@@ -828,4 +838,65 @@
     R deleteUserCashByPhone(String phone);
 
     R updateUserPartyStatus(Long userId);
+
+    /**
+     * uu洗车登录
+     * @param uuLoginVO
+     * @return
+     */
+    R uuLogin(UuLoginVO uuLoginVO);
+
+    /**
+     * 导出验证密码
+     * @param account
+     * @param password
+     * @return
+     */
+    R checkExport(@RequestParam("account")String account, @RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
+
+    /**
+     * 数据看板：数据总览
+     * @param type 查看类型
+     * @param streetId 街道id
+     * @param areaCode 区县code
+     * */
+    R newIndexData(Integer type, Long streetId,Long areaCode);
+
+    /**
+     * 用户占比统计
+     * @param type 查看类型
+     * @param streetId 街道id
+     * @param areaCode 区县code
+     * @param range  */
+    R userRate(Integer type, Long streetId, Long areaCode, Integer range);
+
+    /**
+     * 真实用户占比统计
+     * @param type 查看类型
+     * @param streetId 街道id
+     * @param areaCode 区县code
+     * @param range  */
+    R realUser(Integer type, Long streetId, Long areaCode, Integer range);
+
+
+    /**
+     * 用户行为折线图
+     * @param type 查看类型
+     * @param streetId 街道id
+     * @param areaCode 区县code
+     * @param range  */
+    R userActivity(Integer type, Long streetId, Long areaCode, Integer range);
+
+    /**
+     * 获取区县即下属街道名
+     * */
+    R getAreaAndStreet();
+
+    /**
+     * uu洗车通知推送
+     * @param phone
+     * @param orderStatus
+     * @return
+     */
+    R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
 }

--
Gitblit v1.7.1