From 417d0d22bf20bd53ba6afc031af8fd0fccd2248d Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期五, 23 二月 2024 18:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

---
 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java |   26 ++++++++++++++++++++++++++
 phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java          |   12 ++++++++++++
 phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java                |   18 ++++++++++++++++++
 3 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
new file mode 100644
index 0000000..68b65fa
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderActivityService.java
@@ -0,0 +1,26 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.phis.vo.order.OrderActivityVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**璁㈠崟娲诲姩鏌ヨ
+ * @author CJH
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "order-activity")
+public interface SOrderActivityService {
+
+    /**
+     * 鏍规嵁娲诲姩缂栫爜鏌ヨ璁㈠崟鏄惁宸茬粡鎵ц
+     * @param orderActivityVo 瀵硅薄
+     * @return Result 浣跨敤OrderActivityReturnVo杞寲
+     */
+    @PostMapping(value = "/order/activity/execute")
+    Result getActivityExecute(@RequestBody OrderActivityVo orderActivityVo);
+
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
new file mode 100644
index 0000000..294892a
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityReturnVo.java
@@ -0,0 +1,12 @@
+package com.hz.phis.vo.order;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class OrderActivityReturnVo {
+    /**娲诲姩鐨勮鍗曟槸鍚﹀凡鎵ц锛�0鍚�1鏄�*/
+    private Integer isExecute;
+}
diff --git a/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
new file mode 100644
index 0000000..7f47b21
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/phis/vo/order/OrderActivityVo.java
@@ -0,0 +1,18 @@
+package com.hz.phis.vo.order;
+
+import lombok.Data;
+
+/**
+ * @author CJH
+ */
+@Data
+public class OrderActivityVo {
+    /**娲诲姩椤甸潰绫诲瀷-鎸囧畾璁㈠崟鏍囪瘑*/
+    private String orderId;
+    /**娲诲姩椤甸潰绫诲瀷-鍙┖*/
+    private Integer activityPageType;
+   /**娲诲姩鍖哄垎缂栧彿-蹇呭~*/
+    private String activityPageCode;
+    /**his鐢ㄦ埛-蹇呭~*/
+    private String userId;
+}

--
Gitblit v1.8.0