From dcf2c39ca10e6b7e91a7970cd784a5bf07a55207 Mon Sep 17 00:00:00 2001
From: heheng <heheng@123456>
Date: Tue, 18 Feb 2025 16:41:52 +0800
Subject: [PATCH] merge
---
exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayController.java | 56 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayController.java b/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayController.java
index 9b84a40..615d394 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayController.java
@@ -1,16 +1,20 @@
package com.gkhy.exam.pay.controller;
+import com.alibaba.fastjson2.JSONObject;
import com.gkhy.exam.pay.dto.rep.CoalPayRepDto;
import com.gkhy.exam.pay.dto.rep.CoalPayStudentRep;
-import com.gkhy.exam.pay.dto.req.CoalPayDto;
-import com.gkhy.exam.pay.dto.req.CoalPayReq;
-import com.gkhy.exam.pay.dto.req.CoalPayStudentReq;
-import com.gkhy.exam.pay.dto.req.CoalPayTypeReq;
+import com.gkhy.exam.pay.dto.req.*;
import com.gkhy.exam.pay.entity.CoalPayStudent;
+import com.gkhy.exam.pay.entity.PayReqData;
import com.gkhy.exam.pay.service.CoalPayService;
+import com.gkhy.exam.pay.utils.BillSignException;
+import com.gkhy.exam.pay.utils.PayUtils;
+import com.gkhy.exam.pay.utils.ResultVo;
+import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.utils.RandomUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -18,6 +22,9 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
@RestController
@@ -76,13 +83,6 @@
return toAjax(coalPayService.updateCoalPayType(coalPayTypeReq));
}
-// /**
-// * 修改煤矿缴费
-// */
-// @PostMapping("/updatePayCompany")
-// public AjaxResult updatePay(@RequestBody ){
-// return toAjax(coalPayService.updatePay());
-// }
/**
* 删除煤矿缴费管理
*/
@@ -95,22 +95,36 @@
/**
* 个人缴费接口
*/
- @PostMapping("/findStudent")
+ @GetMapping("/findStudent")
+ @Anonymous
@ApiOperation(value ="H5个人缴费查询")
- public AjaxResult findStudent(@RequestBody CoalPayStudentReq coalPayStudent){
- List<CoalPayStudentRep> coalPayStudentReps = coalPayService.selectCoalPay(coalPayStudent);
+ public AjaxResult findStudent(@RequestParam("idCard") String idCard,@RequestParam("phone") String phone){
+ List<CoalPayStudentRep> coalPayStudentReps = coalPayService.selectCoalPay(idCard,phone);
return success(coalPayStudentReps);
+ }
+
+ @GetMapping("/personPay")
+ @ApiOperation(value = "个人缴费接口")
+ @Anonymous
+ public AjaxResult payMoney(@RequestParam("coalPayId") Long coalPayId,@RequestParam("studentId") Long studentId){
+ return success(coalPayService.personPayMoney(coalPayId,studentId));
+ }
+
+ @PostMapping("/teamPay")
+ @Anonymous
+ @ApiOperation(value = "批量缴费")
+ public AjaxResult teamMoney(@RequestBody CoalTeamPayReq coalTeamPayReq){
+ return success(coalPayService.teamPayMoney(coalTeamPayReq));
}
-// @PostMapping("/personPay")
-// @ApiOperation(value = "个人缴费接口")
-// public void payFees(){
-//
-// }
-
-
+ @PostMapping("/topay")
+ @Anonymous
+ @ApiOperation(value = "缴费测试")
+ public AjaxResult toPay() throws IOException, BillSignException {
+ return success(coalPayService.topay());
+ }
--
Gitblit v1.9.2