From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java | 42 ++++++++++++------------------------------
1 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
index e61da57..21d1e0d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -9,13 +9,13 @@
import com.sandu.ximon.admin.param.PayParam;
import com.sandu.ximon.admin.pay.alipay.UsrAlipayConfigService;
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
+import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.C3ChargingService;
import com.sandu.ximon.admin.service.C3mChargingChargeService;
import com.sandu.ximon.admin.service.C3mOrderService;
-import com.sandu.ximon.admin.utils.AliPayUtils;
import com.sandu.ximon.dao.domain.C3mCharging;
import com.sandu.ximon.dao.domain.C3mOrder;
-import com.sandu.ximon.dao.enums.OrderType;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import me.chanjar.weixin.common.error.WxErrorException;
import org.springframework.web.bind.annotation.*;
@@ -38,6 +38,7 @@
private final UsrAlipayConfigService alipayConfigService;
private final WxFastPayService wxPayService;
private final C3mChargingChargeService c3mChargingChargeService;
+ private final PermissionConfig permissionConfig;
/**
@@ -45,8 +46,11 @@
*
* @return
*/
- @PostMapping("/refond")
- public ResponseVO<Object> refond(@RequestBody PayParam params) {
+ @PostMapping("/refund")
+ public ResponseVO<Object> refund(@RequestBody PayParam params) {
+ if (!permissionConfig.check(MenuEnum.C3_REFUND.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (params.getOutTradeNo().isEmpty() || params.getOutTradeNo() == null) {
throw new BusinessException("閫�娆惧弬鏁颁笉鑳戒负绌�");
}
@@ -85,35 +89,10 @@
String s = WxFastPayService.parseWxAmount(c3mOrderEntity.getTotalAmount().toString());
//鐢熸垚寰俊棰勪粯璁㈠崟
- SortedMap<Object, Object> result = wxPayService.miniAppPay(request,"鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", c3mOrderEntity.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
+ SortedMap<Object, Object> result = wxPayService.miniAppPay(request, "鎵爜鍏呯數鏀粯(C3鍏呯數妗�)", c3mOrderEntity.getOutTradeNo(), Integer.valueOf(s), param.getPoleId(), param.getOpenId());
return ResponseUtil.success(result);
}
-
- /**
- * 璁㈠崟鐘舵�佹煡璇� 寰俊鏀粯
- *
- * @param param
- * @return
- */
- @RequestMapping("/queryOrder")
- public ResponseVO<Object> queryOrder(@RequestBody PayParam param) {
- if (param.getOrderId() == null) {
- throw new BusinessException("璇疯緭鍏ユ纭殑璁㈠崟id");
- }
- C3mOrder order = c3mOrderService.getById(param.getOrderId());
- if (order == null) {
- throw new BusinessException("璁㈠崟涓嶅瓨鍦�");
- }
- if ((OrderType.ALIPAY.getCode()).equals(order.getOrderType())) {
- return ResponseUtil.success(AliPayUtils.alipayQuery(order.getOutTradeNo(), param.getPoleId()));
- } else if ((OrderType.WXPAY.getCode()).equals(order.getOrderType())) {
- return ResponseUtil.success(wxPayService.WxOrderQuery(param.getPoleId(), order.getOutTradeNo()));
- } else {
- return ResponseUtil.success("鏀粯鏂瑰紡寮傚父");
- }
-
- }
/**
* 璁㈠崟鍒楄〃
@@ -129,6 +108,9 @@
@RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "orderStatus", required = false) Integer orderStatus,
@RequestParam(value = "timeType", required = false) Integer timeType) {
+ if (!permissionConfig.check(MenuEnum.ORDER_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.successPage(c3mOrderService.orderList(baseConditionVO, keyword, orderStatus, timeType));
}
--
Gitblit v1.9.3