Prechádzať zdrojové kódy

update 进行中乐团新增学生

周箭河 5 rokov pred
rodič
commit
3bcf1d49cf

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRegistrationServiceImpl.java

@@ -693,14 +693,14 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 });
             }
             StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
-            studentPaymentOrderDetail.setPrice(studentAddDto.getTemporaryCourseFee());
+            studentPaymentOrderDetail.setPrice(studentAddDto.getTemporaryCourseFee() == null ? BigDecimal.ZERO : studentAddDto.getTemporaryCourseFee());
             studentPaymentOrderDetail.setType(OrderDetailTypeEnum.COURSE);
             studentPaymentOrderDetails.add(studentPaymentOrderDetail);
             //汇总金额
 
-            BigDecimal reduce = studentPaymentOrderDetails.stream().map(e -> e.getPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
+            BigDecimal reduce = studentPaymentOrderDetails.stream().map(StudentPaymentOrderDetail::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
             MusicGroupStudentFee.PaymentStatus paymentStatus = MusicGroupStudentFee.PaymentStatus.NON_PAYMENT;
-            if (reduce == BigDecimal.ZERO) {
+            if (reduce.compareTo(BigDecimal.ZERO) == 0) {
                 paymentStatus = MusicGroupStudentFee.PaymentStatus.PAID_COMPLETED;
                 studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
                 studentRegistration.setPaymentStatus(PaymentStatusEnum.YES);