From a2379bde85121aea8716f709a859f31775e8fd46 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期三, 31 八月 2022 11:36:16 +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/feign/service/sync/SyncOrderService.java | 25 +++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java | 4 ++++
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java | 3 +--
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
new file mode 100644
index 0000000..1bdab13
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
@@ -0,0 +1,25 @@
+package com.hz.his.feign.service.sync;
+
+/**
+ * @Author
+ */
+
+import com.hx.resultTool.Result;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="synchro-service",path = "/his_synchro",contextId = "synchro-order")
+public interface SyncOrderService {
+
+ /**
+ * 鏍规嵁鐢ㄦ埛id鑾峰彇棰嗗仴璁㈠崟淇℃伅
+ * @param orderId
+ * @return
+ */
+ @PostMapping(value = "/sync/order/getOrderById")
+ Result getOrderById(@RequestParam("orderId") String orderId);
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
index 4b9e7fb..97f2c91 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserService.java
@@ -4,10 +4,9 @@
* @Author
*/
+import com.hx.resultTool.Result;
import net.sf.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
-import com.hx.resultTool.Result;
-import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
diff --git a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
index eeb2e00..daa96e5 100644
--- a/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
+++ b/phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java
@@ -49,6 +49,8 @@
private String channelCategory;
/**鎵�灞為棬搴�*/
private String shopId;
+ /**鎵�灞為棬搴楀悕绉�*/
+ private String shopName;
/**鐢ㄦ埛瑙掕壊*/
private String userRole;
/**鐢ㄦ埛绫诲瀷*/
@@ -57,4 +59,6 @@
private String hisCorpUserId;
/**鎵�灞為【闂�(閿�鍞【闂�)*/
private String hisCorpUser;
+ /**鎬у埆*/
+ private Integer gender;
}
--
Gitblit v1.8.0