From d0c0cac477208b40ef2ca085f1b02cc24fbf03c6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 九月 2024 10:25:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
index 23c8fc9..c0f9cd8 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java
@@ -4,6 +4,8 @@
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.dto.ExchangeDto;
 import com.ruoyi.order.api.factory.OrderFallbackFactory;
+import com.ruoyi.order.api.model.TShoppingOrder;
+import com.ruoyi.order.api.model.TVipOrder;
 import com.ruoyi.order.api.query.TActivityStatisticsQuery;
 import com.ruoyi.order.api.vo.TActivityVO;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -34,6 +36,12 @@
 
     @PostMapping("/t-exchange-order/create")
     public R<Long> exchangeCreate(@RequestBody ExchangeDto exchangeDto);
+    @PostMapping("/t-vip-order//addVipOrder")
+    public R<Long> addVipOrder(@RequestBody TVipOrder vipOrder);
+    @PostMapping("/t-shopping-order/create")
+    public R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto);
+    @PostMapping("/t-shopping-order/callBack")
+    public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo);
 
     /**
      * 管理后台 活动费用统计

--
Gitblit v1.7.1