From b81701324e8db60da4ad46d5f7950dddca702cc7 Mon Sep 17 00:00:00 2001
From: fwq <582742538@qq.com>
Date: 星期一, 11 十二月 2023 17:15:26 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
index dbf299c..75a8180 100644
--- a/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
+++ b/crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java
@@ -1,8 +1,9 @@
package com.hz.crm.feign;
import com.hx.resultTool.Result;
-import com.hz.crm.dto.OrderRefundDto;
+import com.hz.crm.dto.FOrderPageDto;
import com.hz.crm.dto.OrderStatusDto;
+import com.hz.crm.dto.order.refund.RefundDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -11,14 +12,34 @@
/**
* 杩欓噷杩欎釜name 闇�瑕佸～鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙ｅ墠缂�
*/
-@FeignClient(name="crm-platform-service",path = "/crmp",contextId = "crm-order")
+@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-order")
public interface FOderService {
- /*鍙栨秷璁㈠崟*/
+ /**鍙栨秷璁㈠崟*/
@PostMapping(value = "/order/cancel")
Result cancelOrder( @RequestBody(required = false) OrderStatusDto orderStatusDto);
- /*閫�娆�*/
+ /**閫�娆�
+ *
+ * @param refundDto
+ * @return refundReturnDto瀹炰綋杞寲
+ */
@RequestMapping("/order/refund")
- Result refundOrder(@RequestBody(required = false) OrderStatusDto orderStatusDto);
+ Result refundOrder(@RequestBody(required = false) RefundDto refundDto);
+
+
+ /**鏌ヨ鍒楄〃
+ *
+ * @param dto dto
+ * @return refundReturnDto瀹炰綋杞寲
+ */
+ @RequestMapping("/order/list")
+ Result list(@RequestBody(required = false) FOrderPageDto dto);
+
+ /**
+ * 鐢ㄦ埛璐拱璁㈠崟鍒楄〃
+ */
+ @RequestMapping("/order/user/buy/list")
+ Result userBuyList(@RequestBody FOrderPageDto dto);
+
}
--
Gitblit v1.8.0