From 0bfe0ee18e302123944a2a33ba5760a8a3da25f7 Mon Sep 17 00:00:00 2001
From: zhangxu <3%usVi4iXbVkhI1c>
Date: 星期二, 13 十二月 2022 15:26:10 +0800
Subject: [PATCH] Merge branch 'master-zhangxu' into master-test
---
phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java | 11 ++++++++++-
phis-feign/src/main/java/com/hz/his/dto/order/OrderRefundDto.java | 4 +++-
2 files changed, 13 insertions(+), 2 deletions(-)
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 e80517e..c86229e 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
@@ -2,6 +2,7 @@
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -30,7 +31,8 @@
//闈炲繀濉� 閲嶅彂鏍囪瘑
private String resendRecordId;
-
+ /** 閫�娆鹃噾棰� */
+ private BigDecimal totalAmount;
/** 閫�娆句俊鎭泦鍚� 蹇呭～ */
private List<OrderCouponRefunDto> couponList;
/** 鎿嶄綔浜鸿鑹瞚d 蹇呭～*/
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
index e97ce7a..4832cd4 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/sync/SyncOrderService.java
@@ -25,7 +25,7 @@
@GetMapping(value = "/sync/order/getOrderById")
Result getOrderById(@RequestParam("orderId") String orderId);
- /**
+ /**
* 淇敼棰嗗仴璁㈠崟涓轰綔搴熻鍗�
* 娉ㄦ剰涓嶈闅忔剰璋冪敤锛岄渶瑕佺敤鍒板厛鍜屽悓姝ヤ腑蹇冨晢閲�
* @param syncOrderDto
@@ -42,5 +42,14 @@
*/
@PostMapping(value = "/sync/order/refundOrder")
Result refundOrder(SyncOrderDto syncOrderDto);
+ /**
+ * 淇敼棰嗗缓璁㈠崟涓洪儴鍒嗛��娆剧姸鎬�
+ * 娉ㄦ剰涓嶈闅忔剰璋冪敤锛岄渶瑕佺敤鍒板厛鍜屽悓姝ヤ腑蹇冨晢閲�
+ * @param syncOrderDto
+ * @return
+ */
+ @PostMapping(value = "/sync/order/partialRefund")
+ Result partialRefund(SyncOrderDto syncOrderDto);
+
}
--
Gitblit v1.8.0