From 3bf508c26ca8e8837197e358f5b4802d3ca59844 Mon Sep 17 00:00:00 2001
From: chenjiahe <763432473@qq.com>
Date: 星期一, 08 一月 2024 16:26:07 +0800
Subject: [PATCH] Merge branch 'master-prod-new' into master-test
---
crm-platform-feign/src/main/java/com/hz/crm/feign/FOderService.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 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 b5a7fa6..9c16821 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
@@ -4,6 +4,9 @@
import com.hz.crm.dto.FOrderPageDto;
import com.hz.crm.dto.OrderStatusDto;
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;
@@ -37,9 +40,33 @@
Result list(@RequestBody(required = false) FOrderPageDto dto);
/**
- * 涓撳尯璁㈠崟
+ * 鐢ㄦ埛璐拱璁㈠崟鍒楄〃
*/
- @RequestMapping("/order/list/zone/orderNo")
- Result zoneOrderNoList(@RequestBody FOrderPageDto dto);
+ @RequestMapping("/order/user/buy/list")
+ Result userBuyList(@RequestBody FOrderPageDto dto);
+
+ /**
+ * 绉垎璁㈠崟纭鏁版嵁
+ */
+ @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-crm/add")
+ Result integralOrderAdd(@RequestBody OrderAddVo orderAddVo);
+
+ /**
+ * 璁㈠崟鏀粯
+ */
+ @RequestMapping("/pay/unify-create")
+ Result orderPay(@RequestBody OrderPayVo orderPayVo);
}
--
Gitblit v1.8.0