From 08a2c6855f39dfc17430afedb09b92cdc5047d3e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 15 七月 2025 10:47:27 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 50ce67e..80bb36e 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
@@ -24,10 +24,16 @@
*/
@FeignClient(contextId = "OrderClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = OrderFallbackFactory.class)
public interface OrderClient {
+
+
@PostMapping(value = "/t-charging-order/management/give/vip")
- public R managementGiveVip(@RequestBody TGrantVip grantVip);
+ R managementGiveVip(@RequestBody TGrantVip grantVip);
+
+
@GetMapping("/t-exchange-order/getSalesCountByGoodsIds/{goodsIds}")
R<List<Integer>> getSalesCountByGoodsId(@PathVariable("goodsIds") String goodsIds);
+
+
@GetMapping("/t-exchange-order/getCount")
R<Integer> getSalesCountByGoodsIdgetCount(@RequestParam("goodId") Integer goodId,@RequestParam("goodeType")Integer goodeType,@RequestParam("buyType")Integer buyType);
@@ -37,21 +43,31 @@
* @return
*/
@GetMapping("/t-exchange-order/getCodeByOrderId/{goodsIds}")
- public R<List<String>> getCodeByOrderId(@PathVariable("goodsIds")String goodsIds);
+ R<List<String>> getCodeByOrderId(@PathVariable("goodsIds")String goodsIds);
+
+
//查询已兑换的订单数
@PostMapping("/t-exchange-order/getById")
- public R<Long> getExchangeById(@RequestParam("goodId") Integer goodId,@RequestParam("userId") Long userId,@RequestParam("goodType") Integer goodType);
+ R<Long> getExchangeById(@RequestParam("goodId") Integer goodId,@RequestParam("userId") Long userId,@RequestParam("goodType") Integer goodType);
@PostMapping("/t-exchange-order/create")
- public R<ExchangeBackDto> exchangeCreate(@RequestBody ExchangeDto exchangeDto);
+ R<ExchangeBackDto> exchangeCreate(@RequestBody ExchangeDto exchangeDto);
+
+
@PostMapping("/t-vip-order/addVipOrder1")
- public R<Long> addVipOrder(@RequestBody TVipOrder vipOrder);
+ R<Long> addVipOrder(@RequestBody TVipOrder vipOrder);
+
+
@PostMapping("/t-shopping-order/create")
- public R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto);
+ R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto);
+
+
@PostMapping("/t-shopping-order/callBack")
- public R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo);
+ 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);
+ R vipCallBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo);
/**
@@ -61,6 +77,8 @@
*/
@PostMapping(value = "/t-exchange-order/activityStatistics")
R<TActivityVO> activityStatistics(@RequestBody TActivityStatisticsQuery dto);
+
+
@PostMapping(value = "/chargingBill/accountBillList")
@ApiOperation(value = "列表查询", tags = {"管理后台-账户结算账单"})
R<AccountListVO> accountBillList(@RequestBody ChargingListQuery dto);
--
Gitblit v1.7.1