From e4e7ba66a8d70300b2533852e7d573b8deab063d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 09 八月 2022 18:49:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 26 -------------
phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java | 50 +++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiTuanOrderService.java | 24 ++++++++++++
3 files changed, 74 insertions(+), 26 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityController.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityController.java
deleted file mode 100644
index acb4443..0000000
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityController.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.hz.his.feign.service.phis;
-
-import com.hx.resultTool.Result;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @ClassName SActivityController
- * @Description 娲诲姩瑙勫垯
- * @Author Wrh
- * @Date 2022/8/8 17:36
- * @Version 1.0
- */
-@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "activity")
-public interface SActivityController {
-
- /**
- * 鑾峰彇娓犻亾璇︽儏
- * @param id 娲诲姩鏍囪瘑
- * @return Result
- */
- @PostMapping(value = "/activity/detail")
- Result getActivityDetail(@RequestParam("id") String id);
-
-}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
new file mode 100644
index 0000000..b3c9610
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SActivityService.java
@@ -0,0 +1,50 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName SActivityController
+ * @Description 娲诲姩瑙勫垯
+ * @Author Wrh
+ * @Date 2022/8/8 17:36
+ * @Version 1.0
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "activity")
+public interface SActivityService {
+
+ /**
+ * 娲诲姩瑙勫垯璇︽儏
+ * @param id 娲诲姩鏍囪瘑
+ * @return Result
+ */
+ @PostMapping(value = "/activity/detail")
+ Result getActivityDetail(@RequestParam("id") String id);
+
+
+ /**
+ * 娲诲姩瑙勫垯鍒楄〃
+ * @param shoId 闂ㄥ簵鏍囪瘑
+ * @return Result
+ */
+ @PostMapping(value = "/activity/shopId/list")
+ Result getActivityList(@RequestParam("shoId") String shoId);
+
+
+ /**
+ * 鏍￠獙鐢ㄦ埛鏄惁绗﹀悎娲诲姩瑙勫垯
+ * @param userId 鐢ㄦ埛鏍囪瘑
+ * @param id 娲诲姩鏍囪瘑
+ * @param ordersTotal 璁㈠崟鎬婚噾棰�
+ * @return Result
+ */
+ @PostMapping(value = "/activity/list")
+ Result getActivityList(@RequestParam("userId") String userId,@RequestParam("id") String id,@RequestParam("ordersTotal") BigDecimal ordersTotal);
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiTuanOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiTuanOrderService.java
new file mode 100644
index 0000000..6eecb79
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipMeiTuanOrderService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.platform;
+
+import com.alibaba.fastjson.JSONObject;
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * @Author
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-meituan")
+public interface SPhipMeiTuanOrderService {
+
+ /**
+ * 缇庡洟璁㈠崟鎺ㄩ�乧rm楠岃瘉
+ * @param jsonObject
+ * orderId 缇庡洟璁㈠崟id
+ * phone 鎵嬫満鍙�
+ * @return
+ */
+ @PostMapping(value = "/meituan/order/sendCrm")
+ Result sendCrm(@RequestBody JSONObject jsonObject);
+}
--
Gitblit v1.8.0