From dd3211a61a85edc7a30f9d3c319a777a9e45c742 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 17 七月 2023 15:12:53 +0800
Subject: [PATCH] Merge branch 'fwq-通用审核接口' into master-prod-new
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java | 23 +++++++
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java | 17 +++++
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 29 +++++++++
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java | 32 ++++++++++
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java | 16 +++++
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java | 16 +++++
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java | 20 ++++++
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java | 24 ++++++++
8 files changed, 177 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java
new file mode 100644
index 0000000..b7a39d8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarCommonReturnDto.java
@@ -0,0 +1,23 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰鍥炶皟鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarCommonReturnDto {
+
+ /**appId*/
+ private String appId;
+ /**鏃堕棿 骞存湀鏃ユ椂鍒嗙*/
+ private String time;
+ /**sign*/
+ private String sign;
+ /**杩斿洖鏁版嵁 鍙弬鑰僊arketingReturnDto*/
+ private String data;
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java
new file mode 100644
index 0000000..18b1352
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingContentDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜鍙戦�佹秷鎭弬鏁�
+ * @author fwq
+ */
+@Data
+public class MarketingContentDto {
+ /**灞曠ず鍐呭閿�煎*/
+ private List<MarketingMsgItemDto> contentList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java
new file mode 100644
index 0000000..d1305d8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgDto.java
@@ -0,0 +1,20 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜鍙戦�佹秷鎭弬鏁�
+ * @author fwq
+ */
+@Data
+public class MarketingMsgDto {
+
+ /*******************蹇呭～椤�*************************/
+ /** 鏄惁鏀惧ぇ绗竴涓猚ontent_item锛岄粯璁rue*/
+ private Boolean emphasisFirstItem = true;
+ /** 娑堟伅鍐呭閿�煎锛屾渶澶氬厑璁�10涓猧tem -蹇呭～椤�*/
+ private List<MarketingMsgItemDto> contentItem;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java
new file mode 100644
index 0000000..5c3b700
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingMsgItemDto.java
@@ -0,0 +1,17 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜鍙戦�佹秷鎭弬鏁�
+ * @author fwq
+ */
+@Data
+public class MarketingMsgItemDto {
+ /**濡傛灉鏄彂閫佺殑娑堟伅锛氶暱搴�10涓眽瀛椾互鍐� -蹇呭～椤�*/
+ private String key;
+ /**濡傛灉鏄彂閫佺殑娑堟伅锛� 闀垮害30涓眽瀛椾互鍐� -蹇呭～椤�*/
+ private String value;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
new file mode 100644
index 0000000..b4f4ea8
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingResultDto.java
@@ -0,0 +1,16 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰杩斿洖鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarketingResultDto {
+ /**钀ラ攢鍔╂墜鍞竴鏍囪瘑*/
+ private String applyId;
+ /**瀹℃牳鏍囪瘑*/
+ private String examineId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java
new file mode 100644
index 0000000..81fef17
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingReturnDto.java
@@ -0,0 +1,32 @@
+package com.hz.his.dto.marketing.common;
+
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰鍥炶皟鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarketingReturnDto{
+
+ /**瀹℃牳缁撴灉 agree涓洪�氳繃,reject涓轰笉閫氳繃*/
+ public static final String AGREE = "agree";
+ public static final String REJECT = "reject";
+ /**瀹℃牳缁撴灉*/
+ private String result;
+ /**杩斿洖淇℃伅*/
+ private String resultMsg;
+ /**鍞竴鏍囪瘑*/
+ private String uniqueId;
+ /**瀹℃牳鏍囪瘑*/
+ private String applyId;
+ /**瀹℃牳浜烘爣璇�*/
+ private String opId;
+ /**瀹℃牳浜哄悕绉�*/
+ private String opMan;
+ /**瀹℃牳鎰忚*/
+ private String applyRemarks;
+
+
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
new file mode 100644
index 0000000..e421cb2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java
@@ -0,0 +1,29 @@
+package com.hz.his.dto.marketing.common;
+
+import com.hz.his.dto.marketing.MarketingDto;
+import lombok.Data;
+
+/**
+ * 钀ラ攢鍔╂墜璇锋眰鍏叡鍙傛暟
+ * @author fwq
+ */
+@Data
+public class MarketingTotalDto extends MarketingDto {
+
+ /******MarketingDto缁ф壙瀛楁 -蹇呭～椤�****/
+
+ /**瀹℃牳绫诲瀷 >20鐨勫��*/
+ private Integer type;
+ /**瀹℃牳鍞竴鏍囪瘑*/
+ private String uniqueId;
+
+ /**瀹℃壒鐣岄潰灞曠ず鐨勫唴瀹� -蹇呭～椤�*/
+ private MarketingContentDto marketingContentDto;
+
+ /**娑堟伅鍙戦�佸唴瀹� -蹇呭～椤�*/
+ private MarketingMsgDto marketingMsgDto;
+
+ /**鍥炶皟閾炬帴 -蹇呭～椤� 鍥炶皟浼犲弬*/
+ private String callbackUrl;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
new file mode 100644
index 0000000..16bc710
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java
@@ -0,0 +1,24 @@
+package com.hz.his.feign.service.marketing;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.marketing.common.MarketingTotalDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 钀ラ攢鍔╂墜瀹℃牳鎺ュ彛
+ */
+@FeignClient(name="marketing-assistant-user",path = "/m_assistant",contextId = "m-common")
+public interface MCommonService {
+
+ /**
+ * 缁熶竴鐢宠瀹℃牳鎺ュ彛
+ */
+ @PostMapping(value = "/common/apply")
+ Result applyOrderDiscount(@RequestBody MarketingTotalDto marketingTotalDto);
+
+
+
+
+}
--
Gitblit v1.8.0