From 1468baceb9b0f168a76b999dcf9e724c49d100c8 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期五, 23 二月 2024 17:40:45 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java | 7 +++
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 +++++++++
phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java | 3 +
phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java | 4 ++
6 files changed, 69 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
index efd6d47..c86d196 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/promotion/PromotionDto.java
@@ -1,5 +1,6 @@
package com.hz.his.dto.promotion;
+import com.hz.his.dto.PageDto;
import lombok.Data;
/**
@@ -7,7 +8,7 @@
* @author fwq
* */
@Data
-public class PromotionDto {
+public class PromotionDto extends PageDto {
/**鏇存柊鏃堕棿*/
private String editTime;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
index 7de6199..1c606f3 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCardItemService.java
@@ -52,4 +52,11 @@
*/
@PostMapping(value = "/cardItem/update/list")
Result getUpdateCardItem(@RequestBody CardDto cardDto);
+
+ /**
+ * 鑾峰彇鏆傚仠鍜岀粨鏉熼攢鍞殑鍗￠」
+ * @return Result
+ */
+ @PostMapping(value = "/cardItem/noUp/list")
+ Result noUpList(@RequestBody CardDto cardDto);
}
\ No newline at end of file
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/his/feign/service/phis/SPromotionService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
index 1fa3065..157c675 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SPromotionService.java
@@ -41,4 +41,8 @@
/**鑾峰彇淇冮攢鏇存柊鍒楄〃*/
@PostMapping(value = "/promotion/update/list")
Result getUpdatePromotion(@RequestBody PromotionDto promotionDto);
+
+ /**鑾峰彇鏆傚仠鍜岀粨鏉熼攢鍞殑淇冮攢*/
+ @PostMapping(value = "/promotion/noUp/list")
+ Result noUpList(@RequestBody PromotionDto promotionDto);
}
\ No newline at end of file
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