From 623afb6fbb8ce6adebf237e7b670d9f4f339184d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期三, 01 五月 2024 00:11:14 +0800
Subject: [PATCH] Merge branch 'master-fwq-积分抵扣现金' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 58 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
index 6f18fed..2fe0bb2 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiUserService.java
@@ -1,8 +1,10 @@
 package com.hz.his.feign.service.platform.bi;
 
 import com.hx.resultTool.Result;
+import com.hz.his.dto.report.UserDetailReportDto;
 import com.hz.his.dto.report.UserReportDto;
 import com.hz.his.dto.report.UserReportListDto;
+import com.hz.his.dto.user.UserDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -41,10 +43,22 @@
     Result deductionList(@RequestBody UserReportDto userReportDto);
 
     /**
+     * 椤圭洰娑堣垂棰戞鍜屾笚閫忕巼-瀵煎嚭娓楅�忔湭鎵ц
+     */
+    @PostMapping("/admin/user/report/deduction/list/export")
+    Result deductionListExport(@RequestBody UserReportDto userReportDto);
+
+    /**
      * 鍖荤敓鎷夌兢绾跨储-鍘嗗彶娌荤枟鏍囩
      */
     @PostMapping("/admin/user/report/treat/tag/list")
     Result treatTagList(@RequestBody UserReportDto userReportDto);
+
+    /**
+     * 鍖荤敓鎷夌兢绾跨储-鍘嗗彶娌荤枟鏍囩-瀵煎嚭
+     */
+    @PostMapping("/admin/user/report/treat/tag/list/export")
+    Result treatTagListExport(@RequestBody UserReportDto userReportDto);
 
     /**
      * 鍖荤敓鎷夌兢绾跨储-缇庨檯鏍囩
@@ -52,6 +66,50 @@
     @PostMapping("/admin/user/report/treat/mj/tag/list")
     Result treatMjTagList(@RequestBody UserReportDto userReportDto);
 
+    /**
+     * 鍖荤敓鎷夌兢绾跨储-缇庨檯鏍囩-瀵煎嚭
+     */
+    @PostMapping("/admin/user/report/treat/mj/tag/list/export")
+    Result treatMjTagListExport(@RequestBody UserReportDto userReportDto);
+
+    /**
+     * 瀹㈡埛璧勬枡鍗�
+     */
+    @PostMapping("/admin/user/info/card/detail")
+    Result userInfoCardDetail(@RequestBody UserDto userDto);
+
+    /**
+     *  rfm瀹㈡埛姒傝-浼氬憳鏁伴噺
+     */
+    @PostMapping("/admin/rfmUser/report/total/list")
+    Result totalList(@RequestBody UserDetailReportDto userDetailReportDto);
+    /**
+     *  rfm瀹㈡埛姒傝-RFM鍒嗗�间汉鏁�
+     */
+    @PostMapping("/admin/rfmUser/report/score/list")
+    Result scoreList(@RequestBody UserDetailReportDto userDetailReportDto);
+    /**
+     *  rfm瀹㈡埛姒傝-瀹㈢兢鏁版嵁
+     */
+    @PostMapping("/admin/rfmUser/report/group/list")
+    Result groupList(@RequestBody UserDetailReportDto userDetailReportDto);
+    /**
+     *  rfm瀹㈡埛姒傝-鎵ц椤圭洰鏁版嵁
+     */
+    @PostMapping("/admin/rfmUser/report/deduction/list")
+    Result deductionList(@RequestBody UserDetailReportDto userDetailReportDto);
+
+    /**
+     *  rfm瀹㈡埛姒傝-棰滃�艰鍒掓爣绛句俊鎭�
+     */
+    @PostMapping("/admin/rfmUser/report/label/list")
+    Result labelList(@RequestBody UserDetailReportDto userDetailReportDto);
+
+    /**
+     *  rfm瀹㈡埛姒傝-鎼滅储鐢ㄦ埛鍒楄〃
+     */
+    @PostMapping("/admin/rfmUser/report/user/search/list")
+    Result userSearchList(@RequestBody UserDetailReportDto userDetailReportDto);
 
 
 }

--
Gitblit v1.8.0