From dec64d47a9a3a3cc133afdf5141744d90fcb49b4 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 01 九月 2025 15:46:42 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TVipDetailController.java | 15 ++++++++++++++-
cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js | 5 ++---
2 files changed, 16 insertions(+), 4 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 7a88661..bd3eb5b 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
@@ -51,6 +51,12 @@
@Autowired
private VipPaymentClient vipPaymentClient;
@Autowired
+ private IUserService userService;
+ @Autowired
+ private IRoleService roleService;
+ @Autowired
+ private ITSiteService siteService;
+ @Autowired
private TOperatorService operatorService;
private String PREFIX = "/system/vipPayment/";
@@ -273,9 +279,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("退费失败");
}
diff --git a/cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js b/cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js
index 5642d72..5105eab 100644
--- a/cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js
+++ b/cloud-server-management/src/main/webapp/static/modular/system/vipPayment/vipPayment.js
@@ -131,9 +131,8 @@
window.location.reload();
layer.closeAll();
},
- error: function(xhr, status, error) {
- var errorMessage = xhr.responseText ? xhr.responseText : "退费失败!";
- Feng.error("退费失败!");
+ error: function(response) {
+ Feng.error("退费失败!原因:"+response.msg);
}
});
}
--
Gitblit v1.7.1