From 9f20421d877be1d13460ff607b66a71810d6f154 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期四, 22 九月 2022 18:00:28 +0800
Subject: [PATCH] Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java | 22 ++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java | 29 +++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java | 8 ++++++++
3 files changed, 59 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
new file mode 100644
index 0000000..d3ca583
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java
@@ -0,0 +1,29 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author
+ */
+
+@Data
+public class OrderRefundNoteDto {
+
+ private String id;
+ //閫�娆捐矾寰�"
+ private Integer refundroute;
+ //閫�娆炬柟寮忕紪鍙�
+ private String refundNumberNo;
+ //閫�娆炬柟寮忓悕绉�
+ private String refundName;
+ //鍙湁鍦ㄨ浆鍌ㄥ�奸噾鐨勬椂鍊欐墠鏈夎繖鐜╂剰
+ //閫�娆惧偍鍊奸噾閲戦
+ private BigDecimal refundStoredTotal;
+ //閫�娆剧姸鎬�
+ private Integer refundStatus;
+ //澶囨敞
+ private String remarks;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java
new file mode 100644
index 0000000..13a7daf
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteListDto.java
@@ -0,0 +1,22 @@
+package com.hz.his.dto.order;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author
+ */
+@Data
+public class OrderRefundNoteListDto {
+
+ /** 閫�娆剧殑鏂瑰紡闆嗗悎 */
+ private List<OrderRefundNoteDto> orderRefundNoteDtos;
+
+ //鎿嶄綔浜哄憳id
+ private String operationId;
+
+ /** 璁㈠崟id */
+ private String orderId;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java
index 8b02b47..ea00b85 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncProjectService.java
@@ -27,4 +27,12 @@
*/
@GetMapping(value = "/sync/project/update/service/tree")
Result updateServiceTree(@RequestBody JSONObject jsonObject);
+
+ /**
+ * 鍚屾his鐢ㄦ埛鍙垝鎵ｇ殑鏁版嵁
+ * @param jsonObject 鍙傛暟
+ * @return 杩斿洖
+ */
+ @GetMapping(value = "/sync/executionRecord/executable")
+ Result syncExecutionRecord(@RequestBody JSONObject jsonObject);
}
--
Gitblit v1.8.0