From d8afbdc39cd6e7739054fc1cc21898e0b81216d0 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期一, 21 八月 2023 11:38:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-fwq优惠券分类优化' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
index b49122c..88fe124 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/bi/BiDoctorSaleService.java
@@ -11,7 +11,7 @@
  * 鍖荤敓蹇姤
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-doctor-perf")
+@FeignClient(name = "phiskin-bi-view-user", path = "/bi-view", contextId = "bi-doctor-perf-sale")
 public interface BiDoctorSaleService {
 
     /**
@@ -20,18 +20,25 @@
     @PostMapping("/admin/doctor/sale/report/deduction/total/list")
     Result deductionList(@RequestBody EmployeeReportDto employeeReportDto);
 
+
     /**
      * 鍖荤敓-鎵ц涓氱哗鏁版嵁-鍒嗛棬搴�
      */
     @PostMapping("/admin/doctor/sale/report/deduction/shop/list")
     Result deductionDetailList(@RequestBody EmployeeReportDto employeeReportDto);
 
-
     /**
-     * 鍖荤敓-鏍稿績椤圭洰
+     * 鍖荤敓-鏍稿績椤圭洰鍗犳瘮鏁版嵁
      */
     @PostMapping("/admin/doctor/sale/report/core/project/list")
     Result coreProjectList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍖荤敓-鏍稿績椤圭洰涓氱哗杩借釜
+     */
+    @PostMapping("/admin/doctor/sale/report/core/project/list/shop")
+    Result coreProjectShopList(@RequestBody EmployeeReportDto employeeReportDto);
+
 
     /**
      * 鎵ц椤圭洰-鍒嗙被
@@ -39,6 +46,13 @@
     @PostMapping("/admin/doctor/sale/report/project/type/list")
     Result projectList(@RequestBody EmployeeReportDto employeeReportDto);
 
+
+    /**
+     * 鎵ц椤圭洰-SPU鍗犳瘮
+     */
+    @PostMapping("/admin/doctor/sale/report/project/spu/list")
+    Result projectGeneralList(@RequestBody EmployeeReportDto employeeReportDto);
+
     /**
      * 鎵ц閮ㄤ綅
      */
@@ -46,6 +60,18 @@
     Result bodyList(@RequestBody EmployeeReportDto employeeReportDto);
 
     /**
+     * 娴佸け鏁版嵁
+     */
+    @PostMapping("/admin/doctor/sale/report/loss/user/list")
+    Result lossUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
+     * 鍖荤敓娌荤枟浼氬憳鎯呭喌
+     */
+    @PostMapping("/admin/doctor/sale/report/treat/user/list")
+    Result treatUserList(@RequestBody EmployeeReportDto employeeReportDto);
+
+    /**
      * 鍧愯瘖,鎺ヨ瘖,棰勭害鏁版嵁
      */
     @PostMapping("/admin/doctor/sale/report/all/list")

--
Gitblit v1.8.0