From f8724cd2c94519f72ac6803c55689f1c2047134f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 28 十月 2024 15:20:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 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 9812ddd..1646c54 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,15 +1,16 @@
package com.ruoyi.account.api.feignClient;
+import com.ruoyi.account.api.dto.GiveVipDto;
+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.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -30,6 +31,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);
/**
@@ -37,11 +45,52 @@
* @param id
* @return
*/
- @PostMapping(value = "/t-app-user/user/getUserById")
- R<TAppUser> getUserById(Long id);
+ @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/")
- R updateAppUser(TAppUser appUser);
+ @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);
+
+ /**
+ * 通过手机号查询用户
+ * @param phone
+ * @return
+ */
+ @GetMapping("/t-app-user/user/selectByPhone")
+ R<TAppUser> selectByPhone(@RequestParam("phone") String phone);
+ /**
+ * 通过手机号模糊查询用户
+ * @param phone
+ * @return
+ */
+ @GetMapping("/t-app-user/user/selectByPhoneLike")
+ R<List<TAppUser>> selectByPhoneLike(@RequestParam("phone") String phone);
+ /**
+ * 远程调用 积分兑换订单 退款回退积分
+ * @return
+ */
+ @PostMapping(value = "/t-app-user/refundPoints/{param}")
+ public R refundPoints(@PathVariable("param")String param);
+
+ @PostMapping(value = "/t-app-user/user/give/vip")
+ public R giveVip(@RequestBody GiveVipDto giveVipDto);
+
+
+ /**
+ * 获取微信token
+ * @return
+ */
+ @PostMapping("/wxLogin/getWXToken")
+ R<String> getWXToken();
}
--
Gitblit v1.7.1