From d5208f24fbf0e71d21171a06b64ce457bad40d43 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 31 八月 2022 16:10:40 +0800
Subject: [PATCH] bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   74 +++++++++++++++++++++++++++++++++++-
 1 files changed, 71 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 09480d4..8dc4c55 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -45,7 +45,7 @@
      */
     @PostMapping("/addOrUpdate")
     R addOrUpdate(@RequestParam("openid") String openid, @RequestParam("sessionKey") String sessionKey,
-        @RequestParam("unionid") String unionid);
+        @RequestParam("unionid") String unionid,@RequestParam("appId")String appId);
 
     /**
      * 维护小程序用户基本信息 头像 昵称 性别
@@ -143,6 +143,9 @@
      */
     @GetMapping("resetPassword")
     R resetPassword(@RequestParam("userId") Long userId);
+
+    @GetMapping("/resetPasswordAccount")
+    R resetPasswordAccount(@RequestParam("type")Integer type,@RequestParam("account")String account);
 
     /**
      * 批量重置密码用户登录密码默认admin123456
@@ -536,7 +539,15 @@
      * @return 协议内容
      */
     @PostMapping("useragreement")
-    R userAgreement(@RequestParam("type") int type);
+    R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId);
+
+    /**
+     * uu洗车登录
+     * @param uuLoginVO
+     * @return
+     */
+    @PostMapping("uuLogin")
+    R uuLogin(@RequestBody UuLoginVO uuLoginVO);
 
     /**
      * 意见反馈
@@ -655,6 +666,13 @@
     R updateUserIsPartymember(@RequestParam("idCard") String idCard);
 
     /**
+     * 修改党员状态
+     * @param phone
+     * @return
+     */
+    @PostMapping("updateuserispartymemberByPhone")
+    R updateUserIsPartymemberByPhone(@RequestParam("phone") String phone);
+    /**
      * 修改用户的为非党员状态
      *
      * @param idCard
@@ -682,7 +700,7 @@
      * @return 协议内容
      */
     @PostMapping("agreement")
-    R agreement(@RequestParam("type") Integer type);
+    R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);
 
     /**
      * 维护用户最后登录时间
@@ -1206,4 +1224,54 @@
      */
     @PostMapping("/update/user/party/status")
     R updateUserPartyStatus(@RequestParam("userId") Long userId);
+
+    /**
+     *导出验证密码
+     */
+    @GetMapping("/checkExport")
+    R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
+
+    @GetMapping("/indexData/totalData")
+    R newIndexData(@RequestParam(value = "type",required = false) Integer type,
+                   @RequestParam(value = "type",required = false) Long streetId,
+                   @RequestParam(value = "areaCode",required = false) Long areaCode,@RequestParam("appId")String appId);
+
+    @GetMapping("/indexData/userRate")
+    R userRate(@RequestParam(value = "type",required = false) Integer type,
+               @RequestParam(value = "streetId",required = false) Long streetId,
+               @RequestParam(value = "areaCode",required = false) Long areaCode,
+               @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false) String appId);
+
+
+    @GetMapping("/indexData/realUser")
+    R realUser(@RequestParam(value = "type",required = false) Integer type,
+               @RequestParam(value = "streetId",required = false) Long streetId,
+               @RequestParam(value = "areaCode",required = false) Long areaCode,
+               @RequestParam(value = "range",required = false) Integer range,@RequestParam(value = "appId",required = false) String appId);
+
+    @GetMapping("/indexData/userActivity")
+    R userActivity(@RequestParam(value = "type", required = false) Integer type,
+                   @RequestParam(value = "streetId", required = false) Long streetId,
+                   @RequestParam(value = "areaCode", required = false) Long areaCode,
+                   @RequestParam(value = "range", required = false) Integer range, @RequestParam(value = "appId",required = false) String appId);
+
+    @GetMapping("/indexData/getAreaAndStreet")
+    R getAreaAndStreet();
+    /**
+     * uu洗车推送
+     * @param washPhone
+     * @param phone
+     * @param washName
+     * @param orderStatus
+     * @return
+     */
+    @GetMapping("/uuPush")
+    R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
+
+    @GetMapping("/communityList")
+    R communityList(@RequestParam("name") String name, @RequestParam("id") Long  id);
+
+
+    @PostMapping("/tfLogin")
+    R tfLogin(@RequestBody UuLoginVO uuLoginVO);
 }

--
Gitblit v1.7.1