From 50dfdaf4e3220e7c1f93a189879ea92bb8f46b4c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 六月 2025 17:58:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 18 ++++++++++++++++--
1 files changed, 16 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 e07ceb3..a175afa 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,6 +1,8 @@
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.dto.UploadPdfDTO;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserAddress;
@@ -23,6 +25,9 @@
@ApiOperation(value = "管理后台-根据手机号查询用户ids", tags = {"管理后台-活动费用统计"})
@PostMapping(value = "/t-app-user/user/getUserIdsByPhone")
public R<List<Long>> getUserIdsByPhone(@RequestParam("phone") String phone);
+ @ApiOperation(value = "管理后台-开票发送邮件", tags = {"管理后台-开票发送邮件"})
+ @PostMapping(value = "/t-app-user/uploadPdf")
+ public R uploadPdf(@RequestBody UploadPdfDTO dto);
/**
* 根据用户id查询用户信息
@@ -47,6 +52,8 @@
*/
@PostMapping(value = "/t-app-user/user/getUserById/{id}")
R<TAppUser> getUserById(@PathVariable("id") Long id);
+ @PostMapping(value = "/t-app-user/user/getAllUser")
+ R<List<TAppUser>> getAllUser();
@PostMapping(value = "/t-app-user/user/coupon/getById")
@@ -83,7 +90,7 @@
@PostMapping(value = "/t-app-user/refundPoints/{param}")
public R refundPoints(@PathVariable("param")String param);
- @PostMapping(value = "/t-app-user/user/give/vip")
+ @PostMapping(value = "/t-app-user/user/give/vip1")
public R giveVip(@RequestBody GiveVipDto giveVipDto);
@@ -93,7 +100,7 @@
*/
@PostMapping("/wxLogin/getWXToken")
R<String> getWXToken();
-
+
/**
* 敏感词检测
* @param content
@@ -102,4 +109,11 @@
*/
@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