From a0d2c6cd651c547fd07fb3639a23ca700d3b2091 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 28 九月 2022 17:03:39 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java
index 16d0e92..f1b9713 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/UsrPayConfigController.java
@@ -8,10 +8,13 @@
import com.sandu.ximon.admin.param.AlipayConfigParam;
import com.sandu.ximon.admin.param.WxpayConfigParam;
import com.sandu.ximon.admin.pay.alipay.UsrAlipayConfigService;
-import com.sandu.ximon.admin.pay.alipay.UsrWxPayConfigService;
+import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.dao.domain.AliConfigEntity;
import com.sandu.ximon.dao.domain.WxConfigEntity;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
/**
@@ -27,41 +30,53 @@
private final UsrAlipayConfigService alipayConfigService;
private final UsrWxPayConfigService wxPayConfigService;
+ private PermissionConfig permissionConfig;
/**
* 鏀粯瀹濋厤缃坊鍔�
+ *
* @param configParam
* @return
*/
@PostMapping("/addAliPayConfig")
public ResponseVO<Object> addAliPayConfig(@RequestBody AlipayConfigParam configParam) {
+ if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(alipayConfigService.addAliPayConfig(configParam));
}
/**
* 鏀粯瀹濋厤缃洿鏀�
+ *
* @param configId
* @param configParam
* @return
*/
@PostMapping("/updateAliPayConfig/{configId}")
public ResponseVO<Object> updateAliPayConfig(@PathVariable Integer configId, @RequestBody AlipayConfigParam configParam) {
- return ResponseUtil.success(alipayConfigService.updateAliPayConfig(configId,configParam));
+ if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(alipayConfigService.updateAliPayConfig(configId, configParam));
}
/**
* 鏀粯瀹濋厤缃垹闄�
+ *
* @param configId
* @return
*/
@PostMapping("/deleteAliPayConfig/{configId}")
public ResponseVO<Object> deleteAliPayConfig(@PathVariable Integer configId) {
+ if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(alipayConfigService.deleteAliPayConfig(configId));
}
/**
- *
* @param poleId
* @return
*/
@@ -71,17 +86,21 @@
}
/**
- *閰嶇疆璇︽儏
+ * 閰嶇疆璇︽儏
+ *
* @param configId
* @return
*/
@GetMapping("/getAliPayConfigById/{configId}")
public ResponseVO<Object> getAliPayConfigById(@PathVariable Integer configId) {
- if(configId==null){
+ if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ if (configId == null) {
throw new BusinessException("id鑳戒负绌�");
}
AliConfigEntity byId = alipayConfigService.getById(configId);
- if(byId==null){
+ if (byId == null) {
throw new BusinessException("閰嶇疆id閿欒鎴栭厤缃笉瀛樺湪");
}
return ResponseUtil.success(byId);
@@ -91,83 +110,123 @@
@GetMapping("/aliConfigList")
public ResponseVO<Object> aliConfigList(BaseConditionVO baseConditionVO
, @RequestParam(value = "keyword", required = false) String keyword) {
- return ResponseUtil.success(alipayConfigService.configList(baseConditionVO,keyword));
+ if (!permissionConfig.check(MenuEnum.ALIPAY_CONFIG_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(alipayConfigService.configList(baseConditionVO, keyword));
}
-
-
-
/**
* wx閰嶇疆娣诲姞
+ *
* @param configParam
* @return
*/
@PostMapping("/addWxPayConfig")
- public ResponseVO<Object> addAliPayConfig(@RequestBody WxpayConfigParam configParam) {
+ public ResponseVO<Object> addWxPayConfig(@Validated @RequestBody WxpayConfigParam configParam) {
+ if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(wxPayConfigService.addWxPayConfig(configParam));
}
/**
* wx閰嶇疆鏇存敼
+ *
* @param configId
* @param configParam
* @return
*/
@PostMapping("/updateWxPayConfig/{configId}")
- public ResponseVO<Object> updateAliPayConfig(@PathVariable Long configId, @RequestBody WxpayConfigParam configParam) {
- return ResponseUtil.success(wxPayConfigService.updateWxPayConfig(configId,configParam));
+ public ResponseVO<Object> updateWxPayConfig(@PathVariable Long configId, @Validated @RequestBody WxpayConfigParam configParam) {
+ if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ if(configId==null){
+ throw new BusinessException("id涓嶈兘涓虹┖");
+ }
+ return ResponseUtil.success(wxPayConfigService.updateWxPayConfig(configId, configParam));
}
/**
* wx閰嶇疆鍒犻櫎
+ *
* @param configId
* @return
*/
@PostMapping("/deleteWxPayConfig/{configId}")
public ResponseVO<Object> deleteWxPayConfig(@PathVariable Long configId) {
+ if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ if(configId==null){
+ throw new BusinessException("id涓嶈兘涓虹┖");
+ }
return ResponseUtil.success(wxPayConfigService.deleteWxPayConfig(configId));
}
/**
- *
* @param poleId
- * @return
+ * @return 閫氳繃鐏潌id鑾峰彇閰嶇疆
*/
@GetMapping("/getWxPayConfigByPoleId/{poleId}")
public ResponseVO<Object> getWxPayConfigByPoleId(@PathVariable Long poleId) {
+ if(poleId==null){
+ throw new BusinessException("poleId涓嶈兘涓虹┖");
+ }
return ResponseUtil.success(wxPayConfigService.getConfigByPoleId(poleId));
}
/**
- *閰嶇疆璇︽儏
+ * 閰嶇疆璇︽儏
+ *
* @param configId
* @return
*/
@GetMapping("/getWxPayConfigById/{configId}")
public ResponseVO<Object> getWxPayConfigById(@PathVariable Integer configId) {
- if(configId==null){
+ if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ if (configId == null) {
throw new BusinessException("id鑳戒负绌�");
}
WxConfigEntity byId = wxPayConfigService.getById(configId);
- if(byId==null){
+ if (byId == null) {
throw new BusinessException("閰嶇疆id閿欒鎴栭厤缃笉瀛樺湪");
}
return ResponseUtil.success(byId);
}
+ /**
+ * wx閰嶇疆鍒楄〃
+ *
+ * @param baseConditionVO
+ * @param keyword
+ * @return
+ */
@GetMapping("/WxConfigList")
public ResponseVO<Object> WxConfigList(BaseConditionVO baseConditionVO
, @RequestParam(value = "keyword", required = false) String keyword) {
+ if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return ResponseUtil.success(wxPayConfigService.configList(baseConditionVO,keyword));
+ return ResponseUtil.success(wxPayConfigService.configList(baseConditionVO, keyword));
}
-
-
-
-
+ /**
+ * wx閰嶇疆鐨勫仠鐢�/鍚敤
+ */
+ @PostMapping("/updateWxPayConfigStatus")
+ public ResponseVO<Object> updateWxPayConfigStatus(@RequestBody WxpayConfigParam wxConfigParam) {
+ if (!permissionConfig.check(MenuEnum.WECHAT_CONFIG_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ return ResponseUtil.success(wxPayConfigService.updateState(wxConfigParam.getConfigId(), wxConfigParam.getStatus()));
+ }
}
--
Gitblit v1.9.3