From 00779ea0f8374e5bbdffc8faa20d65e3c72616c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 19:26:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 9678610..02994b0 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
@@ -6,6 +6,7 @@
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.TGrantVip;
import com.ruoyi.order.api.model.TShoppingOrder;
import com.ruoyi.order.api.model.TVipOrder;
import com.ruoyi.order.api.query.TActivityStatisticsQuery;
@@ -23,9 +24,12 @@
*/
@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);
@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);
/**
* 管理后台 根据t_app_coupon订单购买或者兑换优惠券的订单编号
@@ -56,7 +60,7 @@
* @return
*/
@PostMapping(value = "/t-exchange-order/activityStatistics")
- public R<TActivityVO> activityStatistics(@RequestBody TActivityStatisticsQuery dto);
+ R<TActivityVO> activityStatistics(@RequestBody TActivityStatisticsQuery dto);
@PostMapping(value = "/chargingBill/accountBillList")
@ApiOperation(value = "列表查询", tags = {"管理后台-账户结算账单"})
R<AccountListVO> accountBillList(@RequestBody ChargingListQuery dto);
--
Gitblit v1.7.1