From 97d4be46878693118131656a1d9b9541cef41985 Mon Sep 17 00:00:00 2001
From: zhouxiang <zhouxiang>
Date: 星期三, 19 十月 2022 14:39:47 +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/platform/SPhipPreOrderService.java | 53 +++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java | 14 ++-
phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java | 28 +++++++
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserCard.java | 23 +++++
phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java | 15 +++
phis-feign/src/main/java/com/hz/his/dto/sync/SyncUserCradDto.java | 13 +++
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncExecutionRecordService.java | 2
phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java | 56 ++++++++++++++
8 files changed, 196 insertions(+), 8 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
index 5aaec20..593fb6b 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/CancelOrderDto.java
@@ -8,9 +8,20 @@
@Data
public class CancelOrderDto {
- /** 璁㈠崟id */
+ /** 璁㈠崟id 蹇呭～*/
private String orderId;
- /** 鎿嶄綔浜篿d */
+ /** 鎿嶄綔浜篿d 蹇呭～*/
private String operatorId;
+
+ /** 骞冲彴鏉ユ簮 蹇呭～*/
+ private Integer platformSource;
+
+ /**his鍔╂墜*/
+ public static Integer HIS_ASSISTANT = 0;
+
+ /**his鍚庡彴*/
+ public static Integer HIS_BACKSTAGE = 1;
+
+
}
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
index c00f05c..dc7d8e4 100644
--- 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
@@ -10,15 +10,19 @@
@Data
public class OrderRefundNoteDto {
-
+ //蹇呭～
private String id;
- //鏀粯鎬婚噾棰�
+ //鏀粯鎬婚噾棰� 蹇呭～
private BigDecimal paymentTotal;
- //閫�娆捐矾寰�"
+ // 鏀粯鏂瑰紡缂栧彿 蹇呭～
+ private String paymentNumberNo;
+ //鏀粯鏂瑰紡鍚嶇О 蹇呭～
+ private String paymentName;
+ //閫�娆捐矾寰�" 蹇呭～
private Integer refundroute;
- //閫�娆炬柟寮忕紪鍙�
+ //閫�娆炬柟寮忕紪鍙� 蹇呭～
private String refundNumberNo;
- //閫�娆炬柟寮忓悕绉�
+ //閫�娆炬柟寮忓悕绉� 蹇呭～
private String refundName;
//鍙湁鍦ㄨ浆鍌ㄥ�奸噾鐨勬椂鍊欐墠鏈夎繖鐜╂剰
//閫�娆惧偍鍊奸噾閲戦
diff --git a/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java
new file mode 100644
index 0000000..57d71a0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java
@@ -0,0 +1,56 @@
+package com.hz.his.dto.preOrder;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @ClassName Appointment
+ * @Description 棰勭害淇℃伅琛�
+ * @Author Wrh
+ * @Date 2022/10/18 11:10
+ * @Version 1.0
+ */
+@Data
+public class PreOrderDto extends PageDto {
+
+ /*鐢ㄦ埛id*/
+ private String userId;
+ private String id;
+ /*鐢ㄦ埛鍚嶇О*/
+ private String userName;
+ /*棰勭害寮�濮嬫椂闂�*/
+ private Date startTime;
+ /*棰勭害缁撴潫鏃堕棿*/
+ private Date endTime;
+ /*闂ㄥ簵Id*/
+ private String shopId;
+ /*闂ㄥ簵鍚嶇О*/
+ private String shopName;
+ /*缇庡甯圛d*/
+ private String beauticianId;
+ /*缇庡甯堝悕绉�*/
+ private String beauticianName;
+ /*鏉ユ簮鏍囪瘑锛堣鍗曟爣璇�*/
+ private String commonId;
+ /*鍟嗗搧绫诲瀷*/
+ private String type;
+ /*鎵�灞炲钩鍙癮ppId*/
+ private String platBelongAppId;
+ /*鎵�灞炲钩鍙癈ode*/
+ private String platBelongCode;
+ /*鎵�灞炲钩鍙板悕绉�*/
+ private String platBelongName;
+ /*鏉ユ簮骞冲彴appId*/
+ private String platSourceAppId;
+ /*鏉ユ簮骞冲彴code*/
+ private String platSourceCode;
+ /*鏉ユ簮骞冲彴鍚嶇О*/
+ private String platSourceName;
+
+ //棰勭害椤圭洰
+ List<PreOrderItemDto> preOrderItems;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java
new file mode 100644
index 0000000..481ccb0
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderItemDto.java
@@ -0,0 +1,28 @@
+package com.hz.his.dto.preOrder;
+
+import lombok.Data;
+
+/**
+ * @ClassName Appointment
+ * @Description 棰勭害鍏宠仈椤圭洰琛�
+ * @Author Wrh
+ * @Date 2022/10/18 11:10
+ * @Version 1.0
+ */
+@Data
+public class PreOrderItemDto {
+
+ /* 棰勭害琛↖d(MakeAnAppointment)*/
+ private String appointmentId;
+
+ /* 鐢ㄦ埛椤圭洰id(UserProject)*/
+ private String userProjectId;
+
+ /* 鐢ㄦ埛瀛愰」鐩甶d(UserProjectItem)*/
+ private String userProjectItemId;
+
+ /* 椤圭洰id/鍟嗗搧id锛堝叕鐢ㄦ爣璇嗭級*/
+ private String goodsId;
+ /* 椤圭洰鍚嶇О*/
+ private String goodsName;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/sync/SyncUserCradDto.java b/phis-feign/src/main/java/com/hz/his/dto/sync/SyncUserCradDto.java
new file mode 100644
index 0000000..25ad345
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/sync/SyncUserCradDto.java
@@ -0,0 +1,13 @@
+package com.hz.his.dto.sync;
+
+import lombok.Data;
+
+/**
+ * @Author
+ */
+@Data
+public class SyncUserCradDto {
+
+ /**his鍗″寘id*/
+ private String hisId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPreOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPreOrderService.java
new file mode 100644
index 0000000..6b249df
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipPreOrderService.java
@@ -0,0 +1,53 @@
+package com.hz.his.feign.service.platform;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.preOrder.PreOrderDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
+ */
+@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-preOrder")
+public interface SPhipPreOrderService {
+
+ /**
+ * 鍙栨秷棰勭害
+ */
+ @PostMapping(value = "/pre/order/cancel")
+ Result cancel(@RequestBody PreOrderDto preOrderDto);
+
+ /**
+ * 鏌ョ湅棰勭害鍒楄〃
+ */
+ @PostMapping(value = "/pre/order/list")
+ Result list(@RequestBody PreOrderDto preOrderDto);
+
+ /**
+ * 鏂板棰勭害
+ */
+ @PostMapping(value = "/pre/order/add")
+ Result add(@RequestBody PreOrderDto preOrderDto);
+
+ /**
+ * 淇敼棰勭害
+ */
+ @PostMapping(value = "/pre/order/update")
+ Result update(@RequestBody PreOrderDto preOrderDto);
+
+ /**
+ * 鏌ョ湅棰勭害
+ */
+ @PostMapping(value = "/pre/order/see")
+ Result see(@RequestBody PreOrderDto preOrderDto);
+
+
+ /**
+ * 鍒犻櫎棰勭害
+ */
+ @PostMapping(value = "/pre/order/del")
+ Result del(@RequestBody PreOrderDto preOrderDto);
+
+
+}
\ No newline at end of file
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncExecutionRecordService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncExecutionRecordService.java
index f8e3e08..f5d4488 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncExecutionRecordService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncExecutionRecordService.java
@@ -17,6 +17,6 @@
* @param syncUserProjectItem
* @return
*/
- @PostMapping(value = "/sync/executionRecord/updateUserProjectItm")
+ @PostMapping(value = "/sync/executionRecord/updateUserProjectItem")
Result updateUserProjectItm(SyncUserProjectItem syncUserProjectItem);
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserCard.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserCard.java
new file mode 100644
index 0000000..102aa0e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserCard.java
@@ -0,0 +1,23 @@
+package com.hz.his.feign.service.sync;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.sync.SyncUserCradDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @Author
+ */
+@FeignClient(name="synchro-service",path = "/his_synchro",contextId = "synchro-userCrad")
+public interface SyncUserCard {
+
+
+ /**
+ * 淇敼棰嗗仴鐢ㄦ埛鍗″寘涓哄凡浣滃簾鐘舵��
+ * 娉ㄦ剰涓嶈闅忔剰璋冪敤锛岄渶瑕佺敤鍒板厛鍜屽悓姝ヤ腑蹇冨晢閲�
+ * @param syncUserCradDto
+ * @return
+ */
+ @PostMapping(value = "/sync/user/card/updateUserCard")
+ Result updateUserCard(SyncUserCradDto syncUserCradDto);
+}
--
Gitblit v1.8.0