From dde6983def69577df7b97e3aefbcc06f24a1abf4 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 08 一月 2024 16:03:10 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test

---
 crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 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 434de47..565ee25 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
@@ -45,15 +45,21 @@
     Result userBuyList(@RequestBody FOrderPageDto dto);
 
     /**
-     * 绉垎璁㈠崟纭
+     * 绉垎璁㈠崟纭鏁版嵁
      */
-    @RequestMapping("/order/integral/confirm-order")
+    @RequestMapping("/order/integral-crm/confirm-order")
     Result integralOrderConfirm(@RequestBody OrderConfirmVo orderConfirmVo);
+
+    /**
+     * 绉垎璁㈠崟涓嬪崟缁勫悎鏁版嵁
+     */
+    @RequestMapping("/order/integral/get/add-data")
+    Result getAddOrderData(@RequestBody OrderAddVo orderAddVo);
 
     /**
      * 绉垎璁㈠崟涓嬪崟
      */
-    @RequestMapping("/order/integral/add")
+    @RequestMapping("/order/integral-crm/add")
     Result integralOrderAdd(@RequestBody OrderAddVo orderAddVo);
 
 }

--
Gitblit v1.8.0