From 4bdc33f61729aa5387df5ef41e04f66dca1a35b0 Mon Sep 17 00:00:00 2001
From: wangrenhuang <wangren_huang@163.com>
Date: 星期二, 04 七月 2023 15:01:30 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java | 19 +++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java | 30 ++++++++++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java | 4 ++++
phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java | 2 +-
4 files changed, 54 insertions(+), 1 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
new file mode 100644
index 0000000..8d3062e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/doctorTime/DoctorTimeDto.java
@@ -0,0 +1,19 @@
+package com.hz.his.dto.doctorTime;
+
+import com.hz.his.dto.PageDto;
+import lombok.Data;
+
+/**
+ * @ClassName DoctorTimeDto
+ * @Description 鍖荤敓鎺掔彮dto
+ * @Author wrh
+ * @Date 2023/7/4 14:40
+ * @Version 1.0
+ */
+@Data
+public class DoctorTimeDto extends PageDto {
+
+ String monthStr;
+ String shopId;
+ String doctorId;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
index bc5dfb3..a0a1f97 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderPHisDto.java
@@ -26,4 +26,8 @@
private List<OrderItemPHisDto> orderItem;
/**寮�鍙戜汉闆嗗悎 闈炲繀濉�*/
private List<OrderDeveloperDto> orderDeveloper;
+
+ /**鍗℃墸涓嶅垽鏂繃鏈熸椂闂达細0鍚�1鏄�*/
+ private Integer cardPass = 0;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
index bdb7374..2af3712 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java
@@ -51,5 +51,5 @@
/**绗笁鏂瑰厬鎹㈢爜*/
private String redemptionCode;
/**缁撹处涔嬪悗鏄惁鐩存帴鍒掓墸锛�0鍚�1鏄�*/
- private Integer directDeduction;
+ private Integer directDeduction = 0;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java
new file mode 100644
index 0000000..438240e
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SDoctorTimeService.java
@@ -0,0 +1,30 @@
+package com.hz.his.feign.service.phis;
+
+import com.hx.resultTool.Result;
+import com.hz.his.dto.doctorTime.DoctorTimeDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+
+/**
+ * @ClassName SActivityController
+ * @Description 娲诲姩瑙勫垯
+ * @Author Wrh
+ * @Date 2022/8/8 17:36
+ * @Version 1.0
+ */
+@FeignClient(name="phis-provider",path = "/p-his-data",contextId = "doctorTime")
+public interface SDoctorTimeService {
+
+ /**
+ * 鑾峰彇鍖荤敓鎺掔彮鍒楄〃
+ * @return Result
+ */
+ @PostMapping(value = "/doctor/time/list")
+ Result list(@RequestBody DoctorTimeDto dto);
+
+
+}
--
Gitblit v1.8.0