From 466b7ae4a0b12089d716030b024c8dcd0b29b02f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 04 九月 2024 11:03:06 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
index a408ac7..f7c1da1 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -1,9 +1,12 @@
package com.ruoyi.account.api.feignClient;
+import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
+import com.ruoyi.account.api.model.TAppUserAddress;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.account.api.factory.AppUserFallbackFactory;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.PointChangeDto;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -27,6 +30,13 @@
*/
@PostMapping(value = "/t-app-user/user/getUserByIds")
public R<List<TAppUser>> getUserByIds(@RequestBody List<Long> appUserIds);
+ /**
+ * 远程调用 通过地址id 查询地址信息
+ * @param id
+ * @return
+ */
+ @GetMapping(value = "/t-app-user-address/getAddressById/{id}")
+ public R<TAppUserAddress> getAddressById(@PathVariable("id") Long id);
/**
@@ -36,11 +46,20 @@
*/
@PostMapping(value = "/t-app-user/user/getUserById/{id}")
R<TAppUser> getUserById(@PathVariable("id") Long id);
+
+
+ @PostMapping(value = "/t-app-user/user/coupon/getById")
+ R<TAppCoupon> couponGetById(@RequestParam("id")Long id);
@PostMapping("/t-app-user/user/updateAppUser")
R updateAppUser(@RequestBody TAppUser appUser);
+
+ @PostMapping("/t-app-user/user/points/change")
+ R change(@RequestBody PointChangeDto points);
+ @PostMapping("/t-app-user/user/points/change/down")
+ R changeDown(@RequestBody PointChangeDto points);
/**
* 通过手机号查询用户
@@ -49,4 +68,10 @@
*/
@GetMapping("/t-app-user/user/selectByPhone")
R<TAppUser> selectByPhone(@RequestParam("phone") String phone);
+ /**
+ * 远程调用 积分兑换订单 退款回退积分
+ * @return
+ */
+ @PostMapping(value = "/t-app-user/refundPoints/{param}")
+ public R refundPoints(@PathVariable("param")String param);
}
--
Gitblit v1.7.1