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 | 36 +++++++++++++++++++++++++++++++++++- 1 files changed, 35 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 a4931f3..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 @@ -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; @@ -12,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 { /**鍙栨秷璁㈠崟*/ @@ -35,4 +38,35 @@ */ @RequestMapping("/order/list") Result list(@RequestBody(required = false) 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