From 08eefab8f0b04018dc62928ec2191bcae9d3e7d0 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 15 十月 2021 16:25:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/UserApi.java | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 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 850628f..874c77b 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
@@ -4,6 +4,7 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.dtos.DataKanBansDto;
import com.panzhihua.common.model.dtos.community.convenient.ConvenientMerchantDTO;
import com.panzhihua.common.model.dtos.community.convenient.DisableOrEnableConvenientMerchantDTO;
import org.springframework.web.bind.annotation.*;
@@ -146,8 +147,8 @@
* @return 修改结果
*/
@GetMapping("resetPasswordPatch")
- public R resetPasswordPatch(@RequestParam("userIds") Long[] userId) {
- return userService.resetPasswordPatch(userId);
+ public R resetPasswordPatch(@RequestParam("userIds") Long[] userId,@RequestParam("password")String password) {
+ return userService.resetPasswordPatch(userId,password);
}
/**
@@ -1192,4 +1193,37 @@
public R disableOrEnableMerchantUsers(@RequestBody DisableOrEnableConvenientMerchantDTO disableOrEnableConvenientMerchantDTO) {
return userService.disableOrEnableMerchantUsers(disableOrEnableConvenientMerchantDTO);
}
+
+ /**
+ * 根据openid维护社区团队里是否注册
+ * @param openid 用户微信唯一标识
+ */
+ @PostMapping("judgeCommunityTeam")
+ public void judgeCommunityTeam(@RequestParam("openid") String openid) {
+ userService.judgeCommunityTeam(openid);
+ }
+
+ /**
+ * 数据看板升级版
+ *
+ * @return 运营后台数据看板升级版
+ */
+ @PostMapping("datakanbans")
+ public R dataKanBans(@RequestBody DataKanBansDto dataKanBansDto) {
+ return userService.dataKanBans(dataKanBansDto);
+ }
+
+ /**
+ * 运营后台-用户数据统计汇总
+ * @return 用户数据统计汇总
+ */
+ @GetMapping("community/statistics")
+ public R communityStatistics() {
+ return userService.communityStatistics();
+ }
+
+ @GetMapping("community/statistics/export")
+ public R communityStatisticsExport() {
+ return userService.communityStatisticsExport();
+ }
}
--
Gitblit v1.7.1