From d967c0cdaa252316aa102f681cacdccb5512b7ad Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 21 七月 2022 14:53:03 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 88 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 86 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
index 381637c..a33ac98 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java
@@ -10,6 +10,9 @@
import com.panzhihua.common.model.dtos.community.microCommercialStreet.BindUserPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.LoginWithPhoneDTO;
import com.panzhihua.common.model.dtos.community.microCommercialStreet.McsMerchantDTO;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import com.panzhihua.common.model.dtos.PageDTO;
@@ -561,8 +564,8 @@
* @return 协议内容
*/
@PostMapping("useragreement")
- public R userAgreement(@RequestParam("type") int type) {
- return userService.userAgreement(type);
+ public R userAgreement(@RequestParam("type") int type,@RequestParam("appid")String appId) {
+ return userService.userAgreement(type,appId);
}
/**
@@ -691,6 +694,11 @@
@PostMapping("updateuserispartymember")
public R updateUserIsPartymember(@RequestParam("idCard") String idCard) {
return userService.updateUserIsPartymember(idCard);
+ }
+
+ @PostMapping("updateuserispartymemberByPhone")
+ public R updateUserIsPartymemberByPhone(@RequestParam("phone") String phone) {
+ return userService.updateUserIsPartymemberByPhone(phone);
}
/**
@@ -1346,4 +1354,80 @@
return userService.updateUserPartyStatus(userId);
}
+ @PostMapping("/uuLogin")
+ public R uuLogin(@RequestBody UuLoginVO uuLoginVO){
+ return userService.uuLogin(uuLoginVO);
+ }
+
+
+ /**
+ * 数据看板：数据总览
+ * @return
+ */
+ @GetMapping("/indexData/totalData")
+ public R indexData(@RequestParam(value = "type",required = false) Integer type,
+ @RequestParam(value = "streetId",required = false) Long streetId,
+ @RequestParam(value = "areaCode",required = false) Long areaCode){
+ return userService.newIndexData(type,streetId,areaCode);
+ }
+
+ /**
+ * 数据看板：用户占比
+ * @return
+ */
+ @GetMapping("/indexData/userRate")
+ public 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){
+ return userService.userRate(type,streetId,areaCode,range);
+ }
+
+ /**
+ * 数据看板：真实用户统计
+ * @return
+ */
+ @GetMapping("/indexData/realUser")
+ public 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){
+ return userService.realUser(type,streetId,areaCode,range);
+ }
+
+
+ @GetMapping("/indexData/userActivity")
+ public 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){
+ return userService.userActivity(type,streetId,areaCode,range);
+ }
+
+
+ /**
+ *导出验证密码
+ */
+ @GetMapping("/checkExport")
+ public R checkExport(@RequestParam("account")String account,@RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword){
+ return userService.checkExport(account,password,oldPassword);
+ }
+
+ /**
+ * uu洗车推送
+ * @param washPhone
+ * @param phone
+ * @param washName
+ * @param orderStatus
+ * @return
+ */
+ @GetMapping("/uuPush")
+ public R uuPush(@RequestParam(value = "washPhone",required = false)String washPhone,@RequestParam("phone")String phone,@RequestParam(value = "washName",required = false)String washName,@RequestParam("orderStatus")Integer orderStatus){
+ return userService.uuPush(washPhone,phone,washName,orderStatus);
+ }
+
+ @GetMapping("/indexData/getAreaAndStreet")
+ public R getAreaAndStreet(){
+ return userService.getAreaAndStreet();
+ }
}
--
Gitblit v1.7.1