From 1e586a8778838c24cd2cfdfdcf18ab0132b6b09f Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 21 七月 2022 14:33:22 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 e11b2aa..bb5ec3f 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
@@ -356,7 +356,7 @@
* 所属app 1居民端app 2网格员端app 3商家端app
* @return 协议内容
*/
- R userAgreement(int type);
+ R userAgreement(int type,String appId);
/**
* 意见反馈
@@ -854,7 +854,43 @@
*/
R checkExport(@RequestParam("account")String account, @RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);
- R newIndexData(Integer type, Long streetId);
+ /**
+ * 数据看板：数据总览
+ * @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洗车通知推送
@@ -862,5 +898,5 @@
* @param orderStatus
* @return
*/
- R uuPush(@RequestParam("phone")String phone,@RequestParam("orderStatus")Integer orderStatus);
+ R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);
}
--
Gitblit v1.7.1