feat：乐团改造

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

@@ -1603,19 +1603,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
             studentRegistrationDao.update(studentRegistration);
             
-            //操作人
-            SysUser operator = sysUserFeignService.queryUserInfo();
-
-            BigDecimal price = courseScheduleStudentPaymentDao.countFinishCoursePriceWithMusicGroup(musicGroupId, GroupType.MUSIC, userId);
-            BigDecimal subtractAmount = studentRegistration.getSurplusCourseFee();
-            if(Objects.isNull(price)){
-                price = new BigDecimal(0);
-            }
-            subtractAmount = subtractAmount.subtract(price);
-            if(BigDecimal.ZERO.compareTo(subtractAmount)<0){
-                studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, subtractAmount.negate(), reason, operator.getId());
-            }
-            
             //更新服务指标、运营指标
             int remainCourseNum = courseScheduleStudentPaymentDao.countStudentNotStartCourseNumWithCourseType(userId, null);
             if(remainCourseNum == 0){
@@ -1633,6 +1620,19 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             //删除用户购买的课程记录
             musicGroupPaymentStudentCourseDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
 
+            //操作人
+            SysUser operator = sysUserFeignService.queryUserInfo();
+
+            BigDecimal price = courseScheduleStudentPaymentDao.countFinishCoursePriceWithMusicGroup(musicGroupId, GroupType.MUSIC, userId);
+            BigDecimal subtractAmount = studentRegistration.getSurplusCourseFee();
+            if(Objects.isNull(price)){
+                price = new BigDecimal(0);
+            }
+            subtractAmount = subtractAmount.subtract(price);
+            if(BigDecimal.ZERO.compareTo(subtractAmount)<0){
+                studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, subtractAmount.negate(), reason, operator.getId());
+            }
+
             BigDecimal amount = new BigDecimal(0);
 
             // 判断乐器是否是租赁
@@ -1753,19 +1753,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
         studentRegistrationDao.update(studentRegistration);
         
-        //操作人
-        SysUser operator = sysUserFeignService.queryUserInfo();
-
-        BigDecimal price = courseScheduleStudentPaymentDao.countFinishCoursePriceWithMusicGroup(musicGroupId, GroupType.MUSIC, userId);
-        BigDecimal subtractAmount = studentRegistration.getSurplusCourseFee();
-        if(Objects.isNull(price)){
-            price = new BigDecimal(0);
-        }
-        subtractAmount = subtractAmount.subtract(price);
-        if(BigDecimal.ZERO.compareTo(subtractAmount)<0){
-            studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, subtractAmount.negate(), reason, operator.getId());
-        }
-        
         //更新服务指标、运营指标
         int remainCourseNum = courseScheduleStudentPaymentDao.countStudentNotStartCourseNumWithCourseType(userId, null);
         if(remainCourseNum == 0){
@@ -1784,6 +1771,19 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         //删除用户购买的课程记录
         musicGroupPaymentStudentCourseDetailDao.deleteByUserIdAndMusicGroupId(userId, musicGroupId);
 
+        //操作人
+        SysUser operator = sysUserFeignService.queryUserInfo();
+
+        BigDecimal price = courseScheduleStudentPaymentDao.countFinishCoursePriceWithMusicGroup(musicGroupId, GroupType.MUSIC, userId);
+        BigDecimal subtractAmount = studentRegistration.getSurplusCourseFee();
+        if(Objects.isNull(price)){
+            price = new BigDecimal(0);
+        }
+        subtractAmount = subtractAmount.subtract(price);
+        if(BigDecimal.ZERO.compareTo(subtractAmount)<0){
+            studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, subtractAmount.negate(), reason, operator.getId());
+        }
+
         BigDecimal amount = new BigDecimal(0);
 
         // 判断乐器是否是租赁