From 60c85a79c395e96292d795650f7564bd5e622ce6 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期三, 19 十月 2022 16:32:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java | 14 ++++--
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncUserCard.java | 23 +++++++++++
phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentDto.java | 36 ++++++++++++++++++
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
6 files changed, 95 insertions(+), 8 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentDto.java b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentDto.java
new file mode 100644
index 0000000..7edd7d2
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/appointment/AppointmentDto.java
@@ -0,0 +1,36 @@
+package com.hz.his.dto.appointment;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 棰勭害dto
+ *
+ * @Author: zhouxiang
+ * @Date: 2022/10/19/11:26
+ * @Description:
+ */
+@Data
+public class AppointmentDto extends PageDto {
+ //棰勭害spa鍙傛暟
+ //鐢ㄦ埛Id
+ private String userId;
+ //棰勭害鏃堕棿娈靛紑濮� yyy-MM-dd HH:mm:ss
+ private String startTime;
+ //棰勭害鏃堕棿娈电粨鏉� yyy-MM-dd HH:mm:ss
+ private String endTime;
+ //闂ㄥ簵Id
+ private String shopId;
+ //缇庡甯圛d
+ private String beauticianId;
+ //鏉ユ簮鏍囪瘑锛堣鍗曟爣璇嗭級
+ private String commonId;
+ //鍟嗗搧绫诲瀷(OrderGoodsConstants)
+ private String type;
+ //棰勭害椤圭洰鏁扮粍
+ private List preOrderItems;
+ //spa棰勭害鏍囪瘑
+ private String id;
+}
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/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/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