缴费项目修改原价需要审核

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

@@ -85,7 +85,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
     @Autowired
     private SendSeoMessageSource sendSeoMessageSource;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private ImUserFriendService imUserFriendService;
     @Autowired
@@ -128,8 +128,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
     private ImGroupMemberService imGroupMemberService;
     @Autowired
     private MemberFeeSettingService memberFeeSettingService;
-    @Autowired
-    private StudentMusicCourseFeeService studentMusicCourseFeeService;
 
     @Override
     public BaseDAO<Long, MusicGroupPaymentCalender> getDAO() {
@@ -152,10 +150,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         if (musicGroup == null) {
             throw new BizException("乐团查询失败，请检查参数");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            throw new BizException("请登录");
-        }
+        SysUser sysUser = sysUserService.getUser();
         // 所有缴费项目已完成排课才能创建下一个缴费项目
         /*String organBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
         if (StringUtils.isNoneBlank(organBatchNo)) {
@@ -242,10 +237,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             throw new BizException("乐团查询失败，请检查参数");
         });
 
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        checkObjectNull(sysUser, o -> {
-            throw new BizException("请登录");
-        });
+        SysUser sysUser = sysUserService.getUser();
 
         // 不是进行中，只能创建一次缴费
         if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS) {
@@ -344,6 +336,23 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                         .add(activityCurrentAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
                 status = actualTotalAmount.compareTo(currentTotalAmount) == 0 ? NO : AUDITING;
             }
+            if(status != AUDITING){
+                //计算缴费项目原原价
+                BigDecimal originalAmount = musicGroupPaymentCalenderCourseSettingsService.getOriginalAmount(musicGroupPaymentBaseCalender);
+                if(originalAmount.compareTo(BigDecimal.ZERO) == 0 &&
+                        musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList() != null &&
+                        musicGroupPaymentBaseCalender.getMusicGroupPaymentCalenderCourseSettingsList().size() > 0){
+                    status = AUDITING;
+                }else {
+                    BigDecimal memberAmount = musicGroupPaymentCalenderMemberService.getOriginalAmount(musicGroupPaymentBaseCalender);
+                    BigDecimal repairAmount = musicGroupPaymentCalenderRepairService.getOriginalAmount(musicGroupPaymentBaseCalender);
+                    BigDecimal activityAmount = musicGroupPaymentCalenderActivityService.getOriginalAmount(musicGroupPaymentBaseCalender);
+                    BigDecimal currentTotalAmount = originalAmount.add(memberAmount)
+                            .add(repairAmount)
+                            .add(activityAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
+                    status = originalTotalAmount.compareTo(currentTotalAmount) == 0 ? NO : AUDITING;
+                }
+            }
         }
         Date date = new Date();
 
@@ -601,10 +610,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         if (musicGroup == null) {
             throw new BizException("乐团查询失败，请检查参数");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            throw new BizException("请登录");
-        }
+        SysUser sysUser = sysUserService.getUser();
 
         List<Long> calenderIds = musicGroupPaymentCalenderList.stream().map(MusicGroupPaymentCalender::getId).collect(Collectors.toList());
         //删除原来数据
@@ -887,7 +893,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             try {
                 String studentIds = groupPaymentCalenders.get(0).getStudentIds();
                 if (StringUtils.isNotEmpty(studentIds)) {
-                    SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(studentIds));
+                    SysUser sysUser = sysUserService.queryUserById(Integer.parseInt(studentIds));
                     calenderAuditDetailDto.setPhone(sysUser.getPhone());
                     calenderAuditDetailDto.setUsername(sysUser.getUsername());
                 }
@@ -973,12 +979,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                     musicGroup.setStatus(MusicGroupStatusEnum.PRE_APPLY);
                     musicGroup.setUpdateTime(date);
                     musicGroupDao.update(musicGroup);
-                    SysUser sysUser = sysUserFeignService.queryUserInfo();
-                    if (sysUser == null || sysUser.getId() == null) {
-                        throw new BizException("请重新登录");
-                    }
                     //记录操作日志
-                    musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目通过（费用审核中 -> 预报名）", sysUser.getId(), ""));
+                    musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroup.getId(), "报名缴费项目通过（费用审核中 -> 预报名）",sysUserService.getUserId(), ""));
                     this.createPreImGroup(musicGroup);
                 }
             } else if (calender.getPaymentType() == ADD_STUDENT) {
@@ -1053,10 +1055,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void auditRefuse(String batchNs, String auditMemo) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null || sysUser.getId() == null) {
-            throw new BizException("请重新登录");
-        }
+        SysUser sysUser = sysUserService.getUser();
         String[] split = batchNs.split(",");
         Date date = new Date();
         
@@ -1130,7 +1129,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         if (calenders.size() == 0) {
             throw new BizException("缴费批次不存在");
         }
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        SysUser sysUser = sysUserService.getUser();
         Date date = new Date();
         calenders.forEach(e -> {
             if (e.getPaymentType() == ADD_STUDENT) {