From 50dde470ec18f292e8e58547ef1c4a4cbd4138b2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 24 九月 2025 15:08:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/OrderClient.java | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 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 eff0890..8c1ace6 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,13 +2,19 @@
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
+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.TGrantVip;
+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.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -16,24 +22,79 @@
* 后台订单服务
* @author ruoyi
*/
-@FeignClient(contextId = "OrderClient", value = ServiceNameConstants.CONTRACT_ORDER, fallbackFactory = OrderFallbackFactory.class)
+@FeignClient(contextId = "OrderClient", value = ServiceNameConstants.ORDER_SERVICE, fallbackFactory = OrderFallbackFactory.class)
public interface OrderClient {
-
- @PostMapping("/t-exchange-order/getSalesCountByGoodsIds")
- R<List<Integer>> getSalesCountByGoodsId(String goodsIds);
+
+
+ @PostMapping(value = "/t-charging-order/management/give/vip")
+ 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订单购买或者兑换优惠券的订单编号
* @param goodsIds 订单号-商品类型
* @return
*/
- @PostMapping("/t-exchange-order/getCodeByOrderId")
- public R<List<String>> getCodeByOrderId(String goodsIds);
+ @GetMapping("/t-exchange-order/getCodeByOrderId/{goodsIds}")
+ R<List<String>> getCodeByOrderId(@PathVariable("goodsIds")String goodsIds);
+
+
+ //查询已兑换的订单数
+ @PostMapping("/t-exchange-order/getById")
+ R<Long> getExchangeById(@RequestParam("goodId") Integer goodId,@RequestParam("userId") Long userId,@RequestParam("goodType") Integer goodType);
+
+ @PostMapping("/t-exchange-order/create")
+ R<ExchangeBackDto> exchangeCreate(@RequestBody ExchangeDto exchangeDto);
+
+
+ @PostMapping("/t-vip-order/addVipOrder1")
+ R<Long> addVipOrder(@RequestBody TVipOrder vipOrder);
+
+
+ @PostMapping("/t-shopping-order/create")
+ R<TShoppingOrder> shopCreate(@RequestBody ExchangeDto exchangeDto);
+
+
+ @PostMapping("/t-shopping-order/callBack")
+ R callBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo);
+
+
+ @PostMapping("/t-vip-order/callBack")
+ R vipCallBack(@RequestParam("code")String code,@RequestParam("outTradeNo")String outTradeNo);
+
+
+ /**
+ * 会员订单微信退款回调
+ * @param out_refund_no
+ * @param refund_id
+ * @param tradeState
+ * @param success_time
+ */
+ @PostMapping("/t-vip-order/vipWxRefund")
+ void vipWxRefund(@RequestParam("out_refund_no") String out_refund_no,
+ @RequestParam("refund_id") String refund_id,
+ @RequestParam("tradeState") String tradeState,
+ @RequestParam("success_time") String success_time);
+
+
/**
* 管理后台 活动费用统计
* @param
* @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