From a41e23347029bf69a3f59438749658252de81d2e Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 15 十月 2024 09:41:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 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 4058a9c..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,5 +1,6 @@
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;
@@ -56,8 +57,10 @@
@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")
+// R change(@RequestBody PointChangeDto points);
+ @PostMapping("/t-app-user/user/points/change/down")
+ R changeDown(@RequestBody PointChangeDto points);
/**
* 通过手机号查询用户
@@ -66,4 +69,28 @@
*/
@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