From d0d88074c0c16f68214a1865df665976b0e4e9da Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期二, 04 七月 2023 16:22:35 +0800
Subject: [PATCH] 统一接口
---
phis-feign/src/main/java/com/hz/his/dto/marketing/common/MarketingTotalDto.java | 7 +++
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/MarketingMsgDto.java | 6 --
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MCommonService.java | 24 ++++++++++++
4 files changed, 63 insertions(+), 6 deletions(-)
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
index 2522f24..d1305d8 100644
--- 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
@@ -12,12 +12,8 @@
public class MarketingMsgDto {
/*******************蹇呭～椤�*************************/
- /** 娑堟伅鏍囬锛岄暱搴﹂檺鍒�4-12涓眽瀛� -蹇呭～椤�*/
- private String title;
- /** 娑堟伅鎻忚堪锛岄暱搴﹂檺鍒�4-12涓眽瀛� -蹇呭～椤�*/
- private String description;
/** 鏄惁鏀惧ぇ绗竴涓猚ontent_item锛岄粯璁rue*/
- private boolean emphasisFirstItem = true;
+ private Boolean emphasisFirstItem = true;
/** 娑堟伅鍐呭閿�煎锛屾渶澶氬厑璁�10涓猧tem -蹇呭～椤�*/
private List<MarketingMsgItemDto> contentItem;
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
index 0094730..e421cb2 100644
--- 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
@@ -12,13 +12,18 @@
/******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