From 039978dca47d69401c59ae9ce57224b17214aa56 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 26 六月 2023 16:32:30 +0800
Subject: [PATCH] 订单支付申请
---
phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java | 2 ++
phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java | 7 +++++++
phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java | 23 +++++++++++++++++++++++
phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipOrderService.java | 6 ++++++
4 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java
new file mode 100644
index 0000000..49fc2f1
--- /dev/null
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/OrderPayMarketingDto.java
@@ -0,0 +1,23 @@
+package com.hz.his.dto.marketing;
+
+import com.hz.his.dto.order.OrdersTotalDto;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 钀ラ攢鍔╂墜璁㈠崟鏀粯鐢宠鍏ュ弬
+ * @author fwq
+ */
+@Data
+public class OrderPayMarketingDto extends MarketingDto{
+ /*******************蹇呭～椤�(娉ㄦ剰缁ф壙鐨勫叕鍏辩被MarketingDto)*************************/
+ /**璁㈠崟淇℃伅*/
+ private OrdersTotalDto ordersTotalDto;
+ /**璁㈠崟鎶樻墸(鍗曚綅:鐧惧垎姣�)*/
+ private BigDecimal discountNum;
+ /**璁㈠崟椤圭洰淇℃伅*/
+ private List<RefundProjectDto> projectDtoList;
+
+}
diff --git a/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
index 41682b1..d82b1c7 100644
--- a/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
+++ b/phis-feign/src/main/java/com/hz/his/dto/marketing/RefundProjectDto.java
@@ -17,4 +17,6 @@
private String projectName;
/**閫�鐨勬暟閲� 鍟嗗搧/椤圭洰/... - 蹇呭～*/
private Integer refundNum;
+ /**涔扮殑鏁伴噺 鍟嗗搧/椤圭洰/...*/
+ private Integer buyNum;
}
diff --git a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
index 523328a..02c2ae7 100644
--- a/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
+++ b/phis-feign/src/main/java/com/hz/his/feign/service/marketing/MOrderService.java
@@ -4,6 +4,7 @@
import com.hz.his.dto.marketing.OrderCancelDto;
import com.hz.his.dto.marketing.OrderDiscountDto;
import com.hz.his.dto.marketing.OrderPartRefundDto;
+import com.hz.his.dto.marketing.OrderPayMarketingDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -34,4 +35,10 @@
@PostMapping(value = "/order/apply/part/refund")
Result applyPartRefund(@RequestBody OrderPartRefundDto orderPartRefundDto);
+ /**
+ * 璁㈠崟鏀粯鐢宠
+ */
+ @PostMapping(value = "/order/apply/order/pay")
+ Result orderPay(@RequestBody OrderPayMarketingDto orderPayMarketingDto);
+
}
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 13b20dc..6e97dc9 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
@@ -106,6 +106,12 @@
Result marketingAduit(@RequestBody AduitDto dto);
/**
+ * 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鏀粯瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
+ */
+ @PostMapping(value = "/audit/marketing/aduit/pay")
+ Result marketingAduitPay(@RequestBody AduitDto dto);
+
+ /**
* 寮�鏀惧钩鍙�-钀ラ攢鍔╂墜璁㈠崟鍙栨秷瀹℃牳閫氳繃/鎷掔粷鎺ュ彛
*/
@PostMapping(value = "/audit/order/cancel")
--
Gitblit v1.8.0