From ea219f4389c52d0bac442c7a351767160c9814c5 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: Mon, 10 Mar 2025 16:26:20 +0800
Subject: [PATCH] 缴费修改
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java | 20 ++++++++++----------
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java | 3 ++-
exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java | 5 +++--
exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml | 24 ++++++++++++++++++++++--
exam-system/src/main/java/com/gkhy/exam/pay/controller/CoalPayController.java | 2 +-
exam-system/src/main/java/com/gkhy/exam/pay/controller/PaymentApiController.java | 2 +-
6 files changed, 39 insertions(+), 17 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 83368bf..bcbd498 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
@@ -47,7 +47,7 @@
}
/**
- * 获取非煤缴费管理详细信息
+ * 获取煤矿缴费管理详细信息
*/
@GetMapping(value = "/{id}")
@ApiOperation(value = "获取煤矿缴费管理详细信息", httpMethod = "GET")
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/controller/PaymentApiController.java b/exam-system/src/main/java/com/gkhy/exam/pay/controller/PaymentApiController.java
index cdc0281..b1c2122 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/controller/PaymentApiController.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/controller/PaymentApiController.java
@@ -36,7 +36,7 @@
paymentService.paySuccess(orderNo, jsonObject.getDate("payTime"));
}
jsonObject1.put("orderNo", orderNo);
- jsonObject1.put("status", Boolean.TRUE);
+ jsonObject1.put("status", "success");
return jsonObject1;
} catch (Exception e) {
log.info("财政回调处理订单发生错误");
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
index 7fde0db..4326ab6 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java
@@ -334,33 +334,33 @@
//订单编号
payReqData.setOrderNo(RandomUtil.generateOrderNumber(1L, "NC"));
//订单总金额
- payReqData.setMoney(BigDecimal.valueOf(56));
+ payReqData.setMoney(BigDecimal.valueOf(203));
//子订单数目
payReqData.setAmount(1);
//缴费人姓名（单位填单位名称）阿克苏地区博安煤矿安全技术服务中心
- payReqData.setPayerName("李州");
+ payReqData.setPayerName("杨治国");
//缴费人证件号（单位填同一信用代码）52652900789893140A
- payReqData.setCertNo("612324197909106056");
+ payReqData.setCertNo("610481199801166233");
//缴款人类型（1个人 2单位）
payReqData.setPayerType(1);
//开票单位社会信用代码12650000MB1A9612XD
- payReqData.setInvoiceSocialCode("11652100MB19019356");
+ payReqData.setInvoiceSocialCode("11650100745216623A");
//开票人
- payReqData.setHandlingPerson("孙乾");
+ payReqData.setHandlingPerson("朱晓明");
//复核人
- payReqData.setChecker("哲霞");
+ payReqData.setChecker("董莹");
//单位编码547185129
- payReqData.setEnterCode("204704695");
+ payReqData.setEnterCode("482911639");
//订单描述（非必填）
- payReqData.setDesc("非煤安全作业考试费_理论-012381");
+ payReqData.setDesc("非煤安全作业实操考试_焊接与热切割作业-012413");
//订单明细
List<PayReqData.Feedata> feedatas1 = new ArrayList<>();
//数量
feedatas.setAmount(1);
//业务代码
- feedatas.setBusCode("DZ012381");
+ feedatas.setBusCode("DZ012413");
//单价
- feedatas.setPrice(BigDecimal.valueOf(56));
+ feedatas.setPrice(BigDecimal.valueOf(203));
PayReqData.Feedata feedata = new PayReqData.Feedata();
// feedata.setBusCode("DZ011574");
// feedata.setAmount(1);
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java
index e1d69bf..bcf6e86 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/service/impl/NonCoalPayServiceImpl.java
@@ -259,9 +259,10 @@
//验证是否有学员已缴费
NonCoalPayStudent nonCoalPayStudent = new NonCoalPayStudent();
nonCoalPayStudent.setNonCoalPayId(id);
+ nonCoalPayStudent.setPayStatus(1L);
List<NonCoalPayStudent> nonCoalPayStudents = nonCoalPayStudentService.selectNonCoalPayStudentList(nonCoalPayStudent);
if (nonCoalPayStudents.size()>0){
- throw new ServiceException("该批次存在学员，请勿删除");
+ throw new ServiceException("该批次存在已缴费学员，请勿删除");
}
return nonCoalPayMapper.deleteNonCoalPayById(id, SecurityUtils.getUsername());
}
diff --git a/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java b/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java
index 1a707b2..5237366 100644
--- a/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java
+++ b/exam-system/src/main/java/com/gkhy/exam/pay/utils/PayUtils.java
@@ -310,6 +310,7 @@
HttpResultVo execute = httpClient.execute(httppost, getResponseHandler());
String stringContent = execute.getStringContent();
ResultVo resultVo = JSONObject.parseObject(stringContent, ResultVo.class);
+ log.info("缴费结果确认，请求参数:"+orderNo);
log.info("请求结果为：" + resultVo);
if (resultVo.getRespcode().equals(CaiZhengConstans.CAI_ZHENG_SUCCESS)) {
return "success";
@@ -417,10 +418,10 @@
header.put("Accept", "application/json;charset=utf-8");
header.put("Content-Type", "application/json;charset=utf-8");
String resultStr = HttpUtil.post(orderUrl, jsonObject);
- System.out.println("发起入参===" + jsonObject);
+ log.info("发起入参===" + jsonObject);
JSONObject result = JSONObject.parseObject(resultStr);
ResultVo resultVo = JSONObject.parseObject(resultStr, ResultVo.class);
- System.out.println("发起回参===" + result);
+ log.info("发起回参===" + result);
result.put("postData", reqdatastr);
JSONObject jsonObject2 = result.getJSONObject("respdata");
String signfile = jsonObject2.getString("fileData");
diff --git a/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml b/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml
index e74de69..f7481ef 100644
--- a/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml
+++ b/exam-system/src/main/resources/mapper/pay/CoalPayStudentMapper.xml
@@ -156,7 +156,27 @@
</select>
<select id="selectByIdcard" resultType="com.gkhy.exam.pay.entity.CoalPayStudent">
- <include refid="selectCoalPayStudentVo"></include>
- where id_card=#{idCard} and phone=#{phone} and del_flag = 0
+ select cps.id,
+ cps.coal_pay_id,
+ cps.name,
+ cps.id_card,
+ cps.phone,
+ cps.sex,
+ cps.pay_code,
+ cps.pay_status,
+ cps.pay_type,
+ cps.order_id,
+ cps.file_data,
+ cps.gov_pay_status,
+ cps.update_by,
+ cps.update_time,
+ cps.create_by,
+ cps.create_time,
+ cps.del_flag,
+ cps.order_no,
+ cps.pay_time
+ from coal_pay_student cps
+ left join coal_pay cp on cps.coal_pay_id = cp.id
+ where cps.id_card=#{idCard} and cps.phone=#{phone} and cps.del_flag = 0 and cp.del_flag = 0
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.2