From 05739399f7719a97cf89580357dd4807487fc28a Mon Sep 17 00:00:00 2001
From: fhx <308050795@qq.com>
Date: 星期一, 14 八月 2023 15:55:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-test' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundNoteDto.java | 16 ++++------------
phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java | 9 +++++++++
phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java | 5 +++++
3 files changed, 18 insertions(+), 12 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
index dc7d8e4..d34e59f 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
@@ -7,31 +7,23 @@
/**
* @Author
*/
-
@Data
public class OrderRefundNoteDto {
- //蹇呭～
- private String id;
+ //閫�娆炬柟寮忔�昏〃鏍囪瘑锛屽繀瑕�
+ private String refundRecordMethodId;
+
//鏀粯鎬婚噾棰� 蹇呭～
private BigDecimal paymentTotal;
// 鏀粯鏂瑰紡缂栧彿 蹇呭～
private String paymentNumberNo;
//鏀粯鏂瑰紡鍚嶇О 蹇呭～
private String paymentName;
+
//閫�娆捐矾寰�" 蹇呭～
private Integer refundroute;
//閫�娆炬柟寮忕紪鍙� 蹇呭～
private String refundNumberNo;
//閫�娆炬柟寮忓悕绉� 蹇呭～
private String refundName;
- //鍙湁鍦ㄨ浆鍌ㄥ�奸噾鐨勬椂鍊欐墠鏈夎繖鐜╂剰
- //閫�娆惧偍鍊奸噾閲戦
- private BigDecimal refundStoredTotal;
- //閫�娆剧姸鎬�
- private Integer refundStatus;
- //澶囨敞
- private String remarks;
- //绾夸笅閫�娆惧嚟璇佸浘鐗囧湴鍧� 鏍煎紡鈥滃浘鐗囦竴锛屽浘鐗囦簩鈥�
- private String imageList;
}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
index 3d35463..12dc6c9 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/project/ProjectDto.java
@@ -11,4 +11,9 @@
public class ProjectDto extends PageDto {
/**鏇存柊鏃堕棿*/
private String editTime;
+
+ /**浠锋牸鏌ヨ 鏈�灏忎环鏍� 鏈�澶т环鏍�*/
+ private String minPrice;
+ private String maxPrice;
+
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
index ffc34d8..48bb0f4 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java
@@ -10,6 +10,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
+import java.util.Map;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -99,4 +100,12 @@
@PostMapping(value = "/project/check/medical")
Result checkMedicalIitems(@RequestBody ProjectDto projectDto);
+ /**
+ * his鍔╂墜锛岄棬搴楀姪鎵� 寮�鍗曟椂 浣跨敤鏌ヨ椤圭洰鍒楄〃
+ * @param projectDto
+ * @return
+ */
+ @PostMapping(value = "/project/list/by/type")
+ List<Map<String, Object>> getProjectByTypeId(@RequestBody ProjectDto projectDto);
+
}
\ No newline at end of file
--
Gitblit v1.8.0