From ff169f9a0417b73f0afac554cf2f9d048ac56c80 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 19 八月 2024 20:57:08 +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 | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 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 d07fd62..1550b79 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 @@ -7,6 +7,7 @@ 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.TUserTag; import com.ruoyi.other.api.factory.OtherFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -31,10 +32,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") @@ -45,14 +46,14 @@ 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); @@ -64,6 +65,10 @@ R<List<CouponListVOVO>> getCouponInfoByCouponIds(@RequestBody List<CouponListVOVO> list); + @PostMapping(value = "/t-coupon/getCouponById") + R<TCoupon> getCouponById(@RequestParam("id") Integer id); + + -- Gitblit v1.7.1