From 6f7e081c1debfc1fe09f34c1c5b67b2d61219e08 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 13 七月 2022 16:00:28 +0800
Subject: [PATCH] 合并test到本分支
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 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 165afd4..ad4f609 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
@@ -845,5 +846,57 @@
*/
R uuLogin(UuLoginVO uuLoginVO);
- R newIndexData(Integer type, Long streetId);
+ /**
+ * 导出验证密码
+ * @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