From 2b8f76b2b39ec7e69d9a59133346776c2297e808 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 九月 2024 16:47:11 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
index 833e422..436a6d1 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/feignClient/OtherClient.java
@@ -1,14 +1,18 @@
package com.ruoyi.other.api.feignClient;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.api.dto.TagListQueryDto;
-import com.ruoyi.account.api.dto.UnitListQueryDto;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.TCompany;
+import com.ruoyi.other.api.domain.TCoupon;
+import com.ruoyi.other.api.domain.TInvoiceType;
import com.ruoyi.other.api.domain.TUserTag;
+import com.ruoyi.other.api.dto.TagListQueryDto;
+import com.ruoyi.other.api.dto.UnitListQueryDto;
import com.ruoyi.other.api.factory.OtherFallbackFactory;
+import com.ruoyi.other.api.vo.CouponListVOVO;
import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -20,8 +24,9 @@
* 商品服务
* @author ruoyi
*/
-@FeignClient(contextId = "UnitClient", value = ServiceNameConstants.CONTRACT_SERVICE, fallbackFactory = OtherFallbackFactory.class)
+@FeignClient(contextId = "UnitClient", value = ServiceNameConstants.OTHER_SERVICE, fallbackFactory = OtherFallbackFactory.class)
public interface OtherClient {
+
//单位分页
@PostMapping(value = "/t-company/unit/page")
R<Page<TCompany>> queryUnitPage(@RequestBody UnitListQueryDto unitListQueryDto);
@@ -30,10 +35,10 @@
R unitAddorUpadate(@RequestBody TCompany tCompany);
//单位删除
@PostMapping(value = "/t-company/unit/delete")
- R unitDelete(@RequestParam Integer id);
+ R unitDelete(@RequestParam("id") Integer id);
@PostMapping(value = "/t-company/unit/detail")
- R<TCompany> unitDetail(@RequestParam Integer id);
+ R<TCompany> unitDetail(@RequestParam("id") Integer id);
//标签分页
@PostMapping(value = "/t-user-tag/page")
@@ -44,18 +49,28 @@
R addorUpdateTag(@RequestBody TUserTag tUserTag);
//删除用户标签
@PostMapping(value = "/t-user-tag/delete")
- R deleteTag(@RequestParam Integer id);
+ R deleteTag(@RequestParam("id") Integer id);
//获取标签Map
@PostMapping(value = "/t-user-tag/getTagMap")
R<Map<Integer, String>> getTagMap(@RequestBody List<Integer> ids);
//获取标签
@PostMapping(value = "/t-user-tag/getById")
- R<TUserTag> getByIdTag(@RequestParam Integer id);
+ R<TUserTag> getByIdTag(@RequestParam("id") Integer id);
@PostMapping(value = "/vip/getVipMap")
R<Map<Integer, String>> getVipMap(@RequestBody List<Integer> ids);
+ /**
+ * 小程序远程调用 获取优惠券信息
+ */
+ @PostMapping(value = "/t-coupon/getCouponInfoByCouponIds")
+ R<List<CouponListVOVO>> getCouponInfoByCouponIds(@RequestBody List<CouponListVOVO> list);
+
+
+ @PostMapping(value = "/t-coupon/getCouponById")
+ R<TCoupon> getCouponById(@RequestParam("id") Integer id);
+
--
Gitblit v1.7.1