From cbad982befcf58521b224da1e8898c23c5e0d2c6 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期四, 29 五月 2025 16:49:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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 904e7aa..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
@@ -2,6 +2,7 @@
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;
@@ -24,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查询用户信息
@@ -48,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")
@@ -84,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);
--
Gitblit v1.7.1