From f9cb0f3f384279b2cbe87c35dde3ba573a0197f3 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期四, 24 四月 2025 16:17:25 +0800
Subject: [PATCH] 煤矿缴费修改
---
exam-system/src/main/java/com/gkhy/exam/pay/service/impl/CoalPayServiceImpl.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
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 d0d98a9..e9c2923 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
@@ -81,12 +81,12 @@
List<CoalCategory> coalCategories = coalCategoryMapper.selectByCoalPayId(pay.getId());
pay.setCoalCategoryList(coalCategories);
//学员数据
- List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayId(pay.getId());
- List<CoalPayStudent> havePay = coalPayStudents.stream()
- .filter(stu -> stu.getPayStatus() != null && stu.getPayStatus() == 1)
- .collect(Collectors.toList());
- pay.setTotalNum(coalPayStudents.size());
- pay.setHavePayNum(havePay.size());
+// List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayId(pay.getId());
+// List<CoalPayStudent> havePay = coalPayStudents.stream()
+// .filter(stu -> stu.getPayStatus() != null && stu.getPayStatus() == 1)
+// .collect(Collectors.toList());
+// pay.setTotalNum(coalPayStudents.size());
+// pay.setHavePayNum(havePay.size());
// coalPayRepDtos.add(coalPayRepDto);
}
return coalPays;
@@ -163,7 +163,7 @@
@Override
public AjaxResult deleteCoalPayByIds(Long[] ids) {
for (Long id : ids) {
- List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayIdAndPayStatus(id, 1);
+ List<CoalPayStudent> coalPayStudents = coalPayStudentService.selectByCoalPayIdAndPayStatus(id,1);
if (!CollectionUtils.isEmpty(coalPayStudents)) {
throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "已有学员完成缴费，请勿删除");
}
@@ -223,6 +223,7 @@
CoalPayStudent coalPayStudent = new CoalPayStudent();
coalPayStudent.setCoalPayId(coalPayTypeReq.getCoalPayId());
coalPayStudent.setPayType(2);
+ coalPayStudent.setGovPayStatus(0);
coalPayStudentService.updateByCoalPayId(coalPayStudent);
}
return i;
@@ -311,6 +312,12 @@
payStudent.setGovPayStatus(2);
payStudent.setPayCode(resultVo.getRespdata().getBillNo());
coalPayStudentService.updateByCoalPayIdAndStatus(payStudent);
+ CoalPay coalPay1 = new CoalPay();
+ coalPay1.setPayCompanyCard(coalTeamPayReq.getPayCompanyCard());
+ coalPay1.setPayCompanyName(coalTeamPayReq.getPayCompanyName());
+ coalPay1.setId(coalTeamPayReq.getCoalPayId());
+ coalPay1.setPayPersonType(2);
+ coalPayMapper.updateCoalPayById(coalPay1);
return resultVo.getRespdata().getOrderId();
} else {
throw new BusinessException(this.getClass(), ResultConstants.BUSINESS_ERROR, "发起支付失败，请稍后重试");
@@ -333,33 +340,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);
--
Gitblit v1.9.2