From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 fc54b0f..9678610 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
@@ -2,11 +2,16 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.ExchangeBackDto;
import com.ruoyi.common.core.dto.ExchangeDto;
import com.ruoyi.order.api.factory.OrderFallbackFactory;
+import com.ruoyi.order.api.model.ChargingListQuery;
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.AccountListVO;
import com.ruoyi.order.api.vo.TActivityVO;
+import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -34,11 +39,16 @@
public R<Long> getExchangeById(@RequestParam("goodId") Integer goodId,@RequestParam("userId") Long userId,@RequestParam("goodType") Integer goodType);
@PostMapping("/t-exchange-order/create")
- public R<Long> exchangeCreate(@RequestBody ExchangeDto exchangeDto);
+ public R<ExchangeBackDto> 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);
+ @PostMapping("/t-vip-order/callBack")
+ public R vipCallBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo);
+
/**
* 管理后台 活动费用统计
@@ -47,5 +57,8 @@
*/
@PostMapping(value = "/t-exchange-order/activityStatistics")
public R<TActivityVO> activityStatistics(@RequestBody TActivityStatisticsQuery dto);
+ @PostMapping(value = "/chargingBill/accountBillList")
+ @ApiOperation(value = "列表查询", tags = {"管理后台-账户结算账单"})
+ R<AccountListVO> accountBillList(@RequestBody ChargingListQuery dto);
}
--
Gitblit v1.7.1