From e9d4746af2164d4dbff94bd7736b28072b44fc57 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 06 十一月 2024 17:28:18 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 42 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 40 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 0ad197c..904e7aa 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,7 @@
package com.ruoyi.account.api.feignClient;
+import com.ruoyi.account.api.dto.GiveVipDto;
+import com.ruoyi.account.api.dto.SendMessageDTO;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserAddress;
@@ -56,8 +58,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);
/**
* 通过手机号查询用户
@@ -67,9 +71,43 @@
@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();
+
+ /**
+ * 敏感词检测
+ * @param content
+ * @param openid
+ * @return
+ */
+ @PostMapping("/wxLogin/sensitiveWordDetection")
+ R<Boolean> sensitiveWordDetection (@RequestParam("content") String content, @RequestParam("openid") String openid);
+
+ /**
+ * 短信发送
+ * @return
+ */
+ @PostMapping("/t-app-user/sendMessage")
+ R<String> sendMessage(@RequestBody SendMessageDTO sendMessageDTO);
}
--
Gitblit v1.7.1