From 5e449fc5834aff0e4100a9defd93b5cb3c82b4cb Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期一, 28 十一月 2022 17:15:34 +0800
Subject: [PATCH] Merge branch 'master' into master-test
---
phis-feign/src/main/java/com/hz/his/dto/order/OrderCouponRefunDto.java | 12 ++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 13 ++++++++++---
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 20 ++++++++++++++++++++
3 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderCouponRefunDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCouponRefunDto.java
new file mode 100644
index 0000000..c2bf35b
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderCouponRefunDto.java
@@ -0,0 +1,12 @@
+package com.hz.his.dto.order;
+
+/**
+ * @Author
+ */
+public class OrderCouponRefunDto {
+
+ /** 璁㈠崟浣跨敤浼樻儬鍗穒d */
+ private String orderCouponId;
+ /** 浼樻儬鏍囬 */
+ private String orderCouponTitle;
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
index 9d9e63b..e80517e 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java
@@ -30,4 +30,24 @@
//闈炲繀濉� 閲嶅彂鏍囪瘑
private String resendRecordId;
+
+ /** 閫�娆句俊鎭泦鍚� 蹇呭～ */
+ private List<OrderCouponRefunDto> couponList;
+ /** 鎿嶄綔浜鸿鑹瞚d 蹇呭～*/
+ private String roleId;
+ /** 鏄惁闇�瑕佸鎵� (0鍚� 1鏄�) 蹇呭～*/
+ private Integer isApproval;
+
+ /** 鏄惁鑷姩鐢熸垚閫�娆惧崟 (0鍚� 1鏄�) 蹇呭～*/
+ private Integer isRefund;
+
+ /** 骞冲彴鏉ユ簮 鍥犱负鏄痟is鍔╂墜鍙栨秷璁㈠崟鐨勮瘽灏辫鑷姩纭閫�娆惧崟 蹇呭～*/
+ 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/feign/service/platform/SPhipOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
index 072d795..8428468 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java
@@ -4,9 +4,9 @@
import com.hz.his.dto.aduit.AduitDto;
import com.hz.his.dto.order.*;
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.RequestHeader;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
@@ -124,4 +124,11 @@
Result orderPayMoney(@RequestBody PayDto dto);
+ /**
+ * 寮�鏀惧钩鍙�-閮ㄥ垎閫�娆�
+ * data 瀹炰綋杞寲鐢� CancelOrderReturnDto
+ */
+ @PostMapping(value = "/order/partial/refund")
+ Result partialRefund(@RequestBody OrderRefundDto orderRefundDto);
+
}
\ No newline at end of file
--
Gitblit v1.8.0