Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec

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

@@ -2019,20 +2019,20 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if (cloudTeacherAmount != null) {
                 Date nowDate = new Date();
                 List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrder(userId, musicGroupId);
+                BigDecimal orderAmount = BigDecimal.ZERO;
                 if(cloudTeacherOrders.size() > 0){
                     List<CloudTeacherOrder> quitCloudTeacherOrders = new ArrayList<>();
-                    BigDecimal orderAmount = BigDecimal.ZERO;
                     for (CloudTeacherOrder cloudTeacherOrder : cloudTeacherOrders) {
                         if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(nowDate) > 0) {
                             quitCloudTeacherOrders.add(cloudTeacherOrder);
                             orderAmount = orderAmount.add(cloudTeacherOrder.getAmount());
                         }
                     }
-                    if (cloudTeacherAmount.compareTo(orderAmount) > 0) {
-                        throw new BizException("云教练退费金额不能大于原始订单金额");
-                    }
                     cloudTeacherOrderService.quitCloudTeacherOrders(quitCloudTeacherOrders, cloudTeacherAmount);
                 }
+                if (cloudTeacherAmount.compareTo(orderAmount) > 0) {
+                    throw new BizException("云教练退费金额不能大于原始订单金额");
+                }
                 amount = amount.add(cloudTeacherAmount);
                 //清除学员云教练
                 studentService.cleanMember(userId);
@@ -2269,20 +2269,20 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (cloudTeacherAmount != null) {
             Date nowDate = new Date();
             List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrder(userId, musicGroupId);
+            BigDecimal orderAmount = BigDecimal.ZERO;
             if(cloudTeacherOrders.size() > 0){
                 List<CloudTeacherOrder> quitCloudTeacherOrders = new ArrayList<>();
-                BigDecimal orderAmount = BigDecimal.ZERO;
                 for (CloudTeacherOrder cloudTeacherOrder : cloudTeacherOrders) {
                     if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(nowDate) > 0) {
                         quitCloudTeacherOrders.add(cloudTeacherOrder);
                         orderAmount = orderAmount.add(cloudTeacherOrder.getAmount());
                     }
                 }
-                if (cloudTeacherAmount.compareTo(orderAmount) > 0) {
-                    throw new BizException("云教练退费金额不能大于原始订单金额");
-                }
                 cloudTeacherOrderService.quitCloudTeacherOrders(quitCloudTeacherOrders, cloudTeacherAmount);
             }
+            if (cloudTeacherAmount.compareTo(orderAmount) > 0) {
+                throw new BizException("云教练退费金额不能大于原始订单金额");
+            }
             amount = amount.add(cloudTeacherAmount);
             //清除学员云教练
             studentService.cleanMember(userId);