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 |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 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 7f3df17..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,6 +1,7 @@
 package com.hz.crm.feign;
 
 import com.hx.resultTool.Result;
+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;
@@ -11,7 +12,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="crm-platform-service",path = "/crmp",contextId = "crm-order")
+@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-order")
 public interface FOderService {
 
     /**鍙栨秷璁㈠崟*/
@@ -25,4 +26,20 @@
      */
     @RequestMapping("/order/refund")
     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