From 6a6f2aaa2e34f62ee320c2b9327dd566b6bfa350 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 26 七月 2022 14:06:35 +0800
Subject: [PATCH] 双争双评bug修改

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 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 1de8467..79afe2f 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
@@ -536,7 +536,7 @@
      * @return 协议内容
      */
     @PostMapping("useragreement")
-    R userAgreement(@RequestParam("type") int type);
+    R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId);
 
     /**
      * uu洗车登录
@@ -697,7 +697,7 @@
      * @return 协议内容
      */
     @PostMapping("agreement")
-    R agreement(@RequestParam("type") Integer type);
+    R agreement(@RequestParam("type") Integer type,@RequestParam("appId")String appId);
 
     /**
      * 维护用户最后登录时间
@@ -1222,17 +1222,38 @@
     @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")
+    @GetMapping("/indexData/totalData")
     R newIndexData(@RequestParam(value = "type",required = false) Integer type,
-                   @RequestParam(value = "type",required = false) Long streetId);
+                   @RequestParam(value = "type",required = false) Long streetId,
+                   @RequestParam(value = "areaCode",required = false) Long areaCode);
 
+    @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);
+
+
+    @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);
+
+    @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);
+
+    @GetMapping("/indexData/getAreaAndStreet")
+    R getAreaAndStreet();
     /**
      * uu洗车推送
      * @param washPhone

--
Gitblit v1.7.1