Merge branch 'cloud_teacher_plus_feature'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -194,7 +194,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         List<String> orderNoList = new ArrayList<String>();
 
         for (StudentPaymentOrder payingOrder : payingOrders) {
-            if (payingOrder.getTransNo() == null && payingOrder.getPaymentAccountNo() != null && payingOrder.getPaymentAccountNo().equals("205") && DateUtil.isSameDay(payingOrder.getCreateTime(), new Date())) {
+            if (payingOrder.getTransNo() == null && "205".equals(payingOrder.getPaymentAccountNo()) && DateUtil.isSameDay(payingOrder.getCreateTime(), new Date())) {
                 continue;
             }
             if (payingOrder.getTransNo() == null) {

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

@@ -519,7 +519,8 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             throw new BizException("排队人数过多，请重试");
         }
         if (paidZeroFlag) {
-            studentPaymentOrder.setPaymentAccountNo(firstPaidZeroFlag ? "200" : "205");
+            String code = firstPaidZeroFlag ? "200" : "205";
+            studentPaymentOrder.setPaymentAccountNo(code);
             studentPaymentOrderService.update(studentPaymentOrder);
         }
         return studentPaymentOrder;