缴费项目截止时间逻辑调整

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

@@ -33,6 +33,7 @@ import com.ym.mec.common.tenant.TenantContextHolder;
 import com.ym.mec.mall.MallFeignService;
 import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -192,7 +193,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
         PaymentCalenderStatusEnum status = musicGroupPaymentCalenderDto.getStatus();
 
-        Date date = new Date();
         String batchNo = idGeneratorService.generatorId() + "";
 
         MusicGroupPaymentDateRange musicGroupPaymentDateRange = musicGroupPaymentDateRangeList.get(0);
@@ -211,14 +211,14 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         musicGroupPaymentCalender.setStartPaymentDate(musicGroupPaymentDateRange.getStartPaymentDate());
         musicGroupPaymentCalender.setStudentIds(musicGroupPaymentCalenderDto.getStudentIds());
         musicGroupPaymentCalender.setOperator(sysUser.getId());
-        musicGroupPaymentCalender.setCreateTime(date);
-        musicGroupPaymentCalender.setUpdateTime(date);
         musicGroupPaymentCalender.setStatus(status);
         musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
         if (musicGroupPaymentCalender.getStatus() != AUDITING) {
+            Date date = new Date();
+            Date day = DateUtil.stringToDate(DateUtil.format(date, DateUtil.DEFAULT_PATTERN), DateUtil.DEFAULT_PATTERN);
             if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
-            } else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
+            } else if (day.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OVER);
             } else {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.NO);
@@ -763,9 +763,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         musicGroupPaymentCalender.setStatus(status);
         musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
         if (musicGroupPaymentCalender.getStatus() != AUDITING) {
+            Date day = DateUtil.stringToDate(DateUtil.format(date, DateUtil.DEFAULT_PATTERN), DateUtil.DEFAULT_PATTERN);
             if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
-            } else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
+            } else if (day.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OVER);
             } else {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.NO);
@@ -1028,6 +1029,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             
             for (MusicGroupPaymentCalender musicGroupPaymentCalender : musicGroupPaymentCalenders) {
                 //如果是报名项目，将乐团改为审核中，缴费项目修改状态，审核状态改为审核通过
+                Date day = DateUtil.stringToDate(DateUtil.format(date, DateUtil.DEFAULT_PATTERN), DateUtil.DEFAULT_PATTERN);
                 if (musicGroupPaymentCalender.getPayUserType() == SCHOOL) {
                     if (musicGroupPaymentCalender.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) > 0) {
                         musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
@@ -1036,7 +1038,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                     }
                 } else if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
                     musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
-                } else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
+                } else if (day.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
                     musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OVER);
                 } else {
                     musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.NO);
@@ -1593,8 +1595,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         List<MusicGroupPaymentCalender> musicGroupPaymentCalenderList = musicGroupPaymentCalenderDao.queryByPaymentStatus(null, statusList, PayUserType.STUDENT.getCode());
 
         List<MusicGroupPaymentCalender> updateMusicGroupPaymentCalenderList = new ArrayList<MusicGroupPaymentCalender>();
+        Date day = DateUtil.stringToDate(DateUtil.format(date, DateUtil.DEFAULT_PATTERN), DateUtil.DEFAULT_PATTERN);
         for (MusicGroupPaymentCalender mgpc : musicGroupPaymentCalenderList) {
-            if (mgpc.getDeadlinePaymentDate() != null && date.after(mgpc.getDeadlinePaymentDate()) && mgpc.getStatus() == PaymentCalenderStatusEnum.OPEN) {
+            if (mgpc.getDeadlinePaymentDate() != null && day.after(mgpc.getDeadlinePaymentDate()) && mgpc.getStatus() == PaymentCalenderStatusEnum.OPEN) {
                 // “进行中”更新至“已结束”
                 mgpc.setUpdateTime(date);
                 mgpc.setStatus(PaymentCalenderStatusEnum.OVER);

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

@@ -447,12 +447,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());
 				insertMusicGroupPaymentCalenderDetailList.add(musicGroupPaymentCalenderDetail);
 			}
-			if (insertMusicGroupPaymentCalenderDetailList.size() > 0) {
+			if (CollectionUtils.isNotEmpty(insertMusicGroupPaymentCalenderDetailList)) {
 				musicGroupPaymentCalenderDetailDao.batchInsert(insertMusicGroupPaymentCalenderDetailList);
                 //创建学生课排课分钟数
                 Map<Integer, Long> userCalenderDetailMap = new HashMap<>(insertMusicGroupPaymentCalenderDetailList.size());
-                insertMusicGroupPaymentCalenderDetailList.stream().forEach(e -> userCalenderDetailMap.put(e.getUserId(), e.getId()));
-                Set<Integer> userIdList = studentBasicList.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
+                insertMusicGroupPaymentCalenderDetailList.forEach(e -> userCalenderDetailMap.put(e.getUserId(), e.getId()));
+                Set<Integer> userIdList = studentBasicList.stream().map(StudentImportDto::getUserId).collect(Collectors.toSet());
                 musicGroupPaymentStudentCourseDetailService.batchInsert(userIdList,musicGroupPaymentCalender,userCalenderDetailMap);
 			}
 		}
@@ -1814,7 +1814,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if(musicGroupPaymentCalenderList == null || musicGroupPaymentCalenderList.size() == 0){
             	throw new BizException("没有审核中的缴费项目");
             }
-
+			Date day = DateUtil.stringToDate(DateUtil.format(date, DateUtil.DEFAULT_PATTERN), DateUtil.DEFAULT_PATTERN);
             musicGroupPaymentCalenderList.forEach(t -> {
                 if (t.getPayUserType() == SCHOOL) {
                     if (t.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) > 0) {
@@ -1824,7 +1824,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                     }
                 } else if (date.after(t.getStartPaymentDate())) {
                     t.setStatus(PaymentCalenderStatusEnum.OPEN);
-                } else if (date.after(t.getDeadlinePaymentDate())) {
+                } else if (day.after(t.getDeadlinePaymentDate())) {
                     t.setStatus(PaymentCalenderStatusEnum.OVER);
                 } else {
                     t.setStatus(PaymentCalenderStatusEnum.NO);

mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentCalenderMapper.xml

@@ -64,14 +64,14 @@
             keyColumn="id_" keyProperty="id">
         INSERT INTO music_group_payment_calender
         (name_,music_group_id_,music_group_organization_course_settings_id_,pay_user_type_,reject_reason_,start_payment_date_,deadline_payment_date_,status_,expect_num_,
-        actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,
+        actual_num_,memo_,is_give_music_network_,payment_valid_start_date_,payment_valid_end_date_,
         payment_pattern_,payment_type_,payment_amount_,batch_no_,audit_memo_,operator_,attribute1_,
          attribute2_,student_ids_,member_payment_amount_,member_rank_setting_id_,member_valid_date_
          ,original_member_payment_amount_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_,
          cloud_teacher_payment_flag_,payment_item_show_state_,is_show_sale_price_,calender_fee_type_,calender_fee_json_,contract_url_)
         VALUES(#{name},#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{rejectReason},#{startPaymentDate},#{deadlinePaymentDate},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{expectNum},#{actualNum},#{memo},#{isGiveMusicNetwork},now(),now(),
+        #{expectNum},#{actualNum},#{memo},#{isGiveMusicNetwork},
         #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{paymentAmount},#{batchNo},#{auditMemo},#{operator},#{attribute1},#{attribute2},#{studentIds},
                #{memberPaymentAmount},#{memberRankSettingId},#{memberValidDate},#{originalMemberPaymentAmount},