From e5a706033f87f40cb9da3fcd1f6c43758bb15d51 Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期三, 11 十月 2023 11:16:47 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/base/CodeNoDataDto.java | 14 ++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SCodeNoDataService.java | 24 ++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java | 2 ++
3 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/base/CodeNoDataDto.java b/phis-feign/src/main/java/com/hz/his/dto/base/CodeNoDataDto.java
new file mode 100644
index 0000000..ba40129
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/base/CodeNoDataDto.java
@@ -0,0 +1,14 @@
+package com.hz.his.dto.base;
+
+import lombok.Data;
+
+/**
+ * @USER: fhx
+ * @DATE: 2023/10/11
+ **/
+@Data
+public class CodeNoDataDto {
+
+ /** 缂栧彿 */
+ private String code;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
index c3cba43..00f9493 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/MarketActivityDto.java
@@ -54,6 +54,8 @@
private String marketActivityId;
/** 钀ラ攢娲诲姩鍏宠仈浼樻儬鍒竔d */
private String activityCouponId;
+ /** 钀ラ攢娲诲姩鍒嗙粍id */
+ private String groupId;
/** 骞冲彴绫诲瀷(PlatformConstants) */
private String platformType;
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCodeNoDataService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCodeNoDataService.java
new file mode 100644
index 0000000..ae63433
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SCodeNoDataService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.PageDto;
+import com.hz.his.dto.base.CodeNoDataDto;
+import com.hz.his.dto.card.CardDto;
+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;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "code-no-data")
+public interface SCodeNoDataService {
+
+ /**
+ * 鏌ヨ缂栧彿鍏宠仈鏁版嵁
+ * @return Result
+ */
+ @PostMapping(value = "/code/no/data/detail")
+ Result getDetail(@RequestBody CodeNoDataDto codeNoDataDto);
+}
\ No newline at end of file
--
Gitblit v1.8.0