From c560f1a14ae1fc468d90e50e6a32d805295875da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 15:35:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java
index 9e54a94..fc8117d 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java
@@ -7,6 +7,7 @@
import com.dsh.course.feignClient.account.model.TAppUser;
import com.dsh.course.feignClient.activity.CouponClient;
import com.dsh.course.feignClient.activity.model.HuiminPayQuery;
+import com.dsh.guns.config.UserExt;
import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.modular.system.model.*;
@@ -48,6 +49,10 @@
private AppUserClient appUserClient;
@Autowired
private VipPaymentClient vipPaymentClient;
+ @Autowired
+ private IUserService userService;
+ @Autowired
+ private IRoleService roleService;
@Autowired
private ITSiteService siteService;
@Autowired
@@ -144,7 +149,7 @@
TAppUser appUser = tAppUsers.stream().filter(e -> e.getId().equals(re.getAppUserId())).findFirst().orElse(null);
if (appUser!=null){
re.setAppUserName(appUser.getName());
- re.setAppUserPhone(appUser.getName());
+ re.setAppUserPhone(appUser.getPhone());
}
}
return res;
@@ -265,9 +270,16 @@
@RequestMapping(value = "/refund")
@ResponseBody
public Object list(@RequestBody VipRefundDto vipRefundDto) {
+ Integer objectId = UserExt.getUser().getObjectId();
+ User user = userService.getById(UserExt.getUser().getId());
+ String roleid = user.getRoleid();
+ Role role = roleService.getById(roleid);
+ if (!role.getName().contains("财务")){
+ return ResultUtil.error("权限不足");
+ }
String code =vipPaymentClient.refund(vipRefundDto);
if (code!=null&& code.equals("200")){
- return ResultUtil.success();
+ return ResultUtil.success("操作成功");
}else{
return ResultUtil.error("退费失败");
}
--
Gitblit v1.7.1