From 41c07e4558ed3a1cbdda0711f78cd3a812c06829 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 28 九月 2023 18:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
index 7ac3954..8bf7816 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java
@@ -194,6 +194,9 @@
payment.setId(Long.valueOf(tCoursePackage.getId()));
BigDecimal cashPayment = payment.getCashPayment();
+ if (cashPayment==null){
+ cashPayment = BigDecimal.ZERO;
+ }
Integer totalClassHours = payment.getTotalClassHours();
BigDecimal result = new BigDecimal(0);
if (totalClassHours!=0) {
@@ -555,8 +558,9 @@
if (resultUtil==""||resultUtil==null){
return new ResultUtil<>(0,0,"报名成功");
- }else
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+ }else{
+ return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
+
}
@@ -579,8 +583,8 @@
if (resultUtil==""){
return new ResultUtil<>(0,0,"报名成功");
- }else
- return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);
+ }else{
+ return new ResultUtil<>(0,0,"报名成功，以下学员剩余课时不足"+resultUtil);}
}
//赠课
--
Gitblit v1.7.1