From 8fc8c4954bb9d048b432e6a8dbe801c79ebe357b Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 31 十月 2023 18:11:01 +0800
Subject: [PATCH] Merge branch 'rx-1023-营销优惠券新版' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index 428a4bb..c640347 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -10,6 +10,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
@@ -78,10 +79,33 @@
     Result getUpdateSpuProject(@RequestBody ProjectDto projectDto);
 
     /**
-     * 鑾峰彇椤圭洰spu瑙勬牸鍒楄〃(鍚屾浣跨敤)
+     * 鑾峰彇褰撳墠椤圭洰sku瑙勬牸鍜屽叾spu瑙勬牸(鍚屾浣跨敤)
      * @return Result
+     * 杩斿洖浣跨敤SpecDt
      */
     @PostMapping(value = "/project/page/spu/spec/update")
-    Result getUpdateSpuSpecProject(@RequestParam("hisId") String hisId);
+    Result getUpdateSpuSpecProject(@RequestParam("projectId") String projectId);
+
+    /**
+     * 鑾峰彇褰撳墠椤圭洰sku鍜屽搴旂殑spu淇℃伅
+     * @return Result
+     */
+    @PostMapping(value = "/project/sku/spu")
+    Result getSkuAndSpu(@RequestParam("projectId") String projectId);
+
+    /**
+     * 鍒ゆ柇鏄惁涓哄尰鐤楅」鐩�
+     * @return Result
+     */
+    @PostMapping(value = "/project/check/medical")
+    Result checkMedicalIitems(@RequestBody ProjectDto projectDto);
+
+    /**
+     * his鍔╂墜锛岄棬搴楀姪鎵� 寮�鍗曟椂 浣跨敤鏌ヨ椤圭洰鍒楄〃
+     * @param projectDto
+     * @return
+     */
+    @PostMapping(value = "/project/list/by/type")
+    Result  getProjectByTypeId(@RequestBody ProjectDto projectDto);
 
 }
\ No newline at end of file

--
Gitblit v1.8.0