From 21cc776dfb780d6e2b0335c1542e6d3e898ce8cb Mon Sep 17 00:00:00 2001
From: guang <guang@guang.com>
Date: 星期五, 14 六月 2024 16:43:48 +0800
Subject: [PATCH] Merge branch 'master-stander' of http://1.15.4.62/r/~chenjiahe/crm-platform-feign into master-stander

---
 crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 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 a2ae3a2..5b343dc 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
@@ -6,6 +6,7 @@
 import com.hz.crm.dto.order.refund.RefundDto;
 import com.hz.crm.vo.order.OrderAddVo;
 import com.hz.crm.vo.order.OrderConfirmVo;
+import com.hz.crm.vo.order.OrderPayVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,7 +15,7 @@
 /**
  * 杩欓噷杩欎釜name 闇�瑕佸~鍐� 璇锋眰鐨勬湇鍔℃彁渚涜�呯殑娉ㄥ唽鍒皀acos Server涓婇潰鐨勬湇鍔″悕锛宲ath 鏄姹傛帴鍙e墠缂�
  */
-@FeignClient(name="crm-platform-service",path = "/crm-platform",contextId = "crm-order")
+@FeignClient(name="crm-user",path = "/crm-platform",contextId = "crm-order")
 public interface FOderService {
 
     /**鍙栨秷璁㈠崟*/
@@ -45,9 +46,9 @@
     Result userBuyList(@RequestBody FOrderPageDto dto);
 
     /**
-     * 绉垎璁㈠崟纭
+     * 绉垎璁㈠崟纭鏁版嵁
      */
-    @RequestMapping("/order/integral/confirm-order")
+    @RequestMapping("/order/integral-crm/confirm-order")
     Result integralOrderConfirm(@RequestBody OrderConfirmVo orderConfirmVo);
 
     /**
@@ -59,7 +60,13 @@
     /**
      * 绉垎璁㈠崟涓嬪崟
      */
-    @RequestMapping("/order/integral/add")
+    @RequestMapping("/order/integral-crm/add")
     Result integralOrderAdd(@RequestBody OrderAddVo orderAddVo);
 
+    /**
+     * 璁㈠崟鏀粯
+     */
+    @RequestMapping("/pay/unify-create")
+    Result orderPay(@RequestBody OrderPayVo orderPayVo);
+
 }

--
Gitblit v1.8.0