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 |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 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 edfdb33..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.*;
@@ -1201,4 +1202,28 @@
     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