update

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

@@ -849,7 +849,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             //用户是否在主乐团
             StudentRegistration registration = studentRegistrationDao.getByPhoneAndMusicGroupId(newMusicGroupId, studentRegistration.getParentsPhone());
             if (registration != null) {
-                if(registration.getMusicGroupStatus() != StudentMusicGroupStatusEnum.QUIT){
+                if(registration.getMusicGroupStatus() == StudentMusicGroupStatusEnum.NORMAL){
                     orderFlag = false;
                 }
                 //修改剩余课程余额
@@ -884,20 +884,22 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                 waitPayOrder.setStatus(DealStatusEnum.CLOSE);
                 studentPaymentOrderService.update(waitPayOrder);
             }
-            //生成订单
-            StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
-            studentPaymentOrder.setUserId(registration.getUserId());
-            studentPaymentOrder.setGroupType(GroupType.MUSIC);
-            studentPaymentOrder.setType(OrderTypeEnum.APPLY);
-            studentPaymentOrder.setMusicGroupId(registration.getMusicGroupId());
-            studentPaymentOrder.setClassGroupId(registration.getClassGroupId());
-            studentPaymentOrder.setOrganId(registration.getOrganId());
-            studentPaymentOrder.setRoutingOrganId(registration.getOrganId());
-            studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
-            studentPaymentOrder.setActualAmount(BigDecimal.ZERO);
-            studentPaymentOrder.setPayTime(new Date());
-            studentPaymentOrder.setExpectAmount(BigDecimal.ZERO);
-            studentPaymentOrderService.insert(studentPaymentOrder);
+            if(orderFlag){
+                //生成订单
+                StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
+                studentPaymentOrder.setUserId(registration.getUserId());
+                studentPaymentOrder.setGroupType(GroupType.MUSIC);
+                studentPaymentOrder.setType(OrderTypeEnum.APPLY);
+                studentPaymentOrder.setMusicGroupId(registration.getMusicGroupId());
+                studentPaymentOrder.setClassGroupId(registration.getClassGroupId());
+                studentPaymentOrder.setOrganId(registration.getOrganId());
+                studentPaymentOrder.setRoutingOrganId(registration.getOrganId());
+                studentPaymentOrder.setStatus(DealStatusEnum.SUCCESS);
+                studentPaymentOrder.setActualAmount(BigDecimal.ZERO);
+                studentPaymentOrder.setPayTime(new Date());
+                studentPaymentOrder.setExpectAmount(BigDecimal.ZERO);
+                studentPaymentOrderService.insert(studentPaymentOrder);
+            }
             //主班新增余额日志
             if(amount.doubleValue() != 0d && masterTotalPrice.doubleValue() > 0d){
                 StudentCourseFeeDetail studentCourseFeeDetail = new StudentCourseFeeDetail();