From 727c30f11ede5b3c82ead6e09e5e077c0e7519f1 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Wed, 05 Feb 2025 13:02:21 +0800
Subject: [PATCH] Merge branch 'dev-20250116' of https://sinanoaq.cn:8888/r/swspkmas into dev-20250116
---
exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java b/exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java
index 8d11c9a..7d54b50 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/controller/NonCoalPayController.java
@@ -20,7 +20,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -90,7 +89,7 @@
* 新增非煤缴费管理
*/
@PostMapping("/add")
- @PreAuthorize("@ss.hasPermi('noncoal:nonpay:add')")
+ //@PreAuthorize("@ss.hasPermi('noncoal:nonpay:add')")
@ApiOperation(value = "新增非煤缴费管理")
public AjaxResult add(@Validated @RequestBody NonCoalPayReqDto nonCoalPay) {
return toAjax(nonCoalPayService.insertNonCoalPay(nonCoalPay));
@@ -206,4 +205,18 @@
return success(nonCoalPayStudentService.sendOrder(id, payType));
}
+
+ @PostMapping("/queryOrder")
+ @ApiOperation(value = "查询是否生成缴费订单")
+ @Anonymous
+ @RepeatSubmit
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", dataTypeClass = Long.class, value = "个人缴费学员数据id,团队缴费数据id", required = true),
+ @ApiImplicitParam(name = "payType", dataTypeClass = String.class, value = "1个人2是团队", required = true),
+ })
+ public AjaxResult queryOrder(@RequestParam("id") Long id, @RequestParam("payType") String payType) {
+ return success(nonCoalPayStudentService.sendOrder(id, payType));
+ }
+
+
}
--
Gitblit v1.9.2