update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupPaymentBaseCalender.java

@@ -57,6 +57,9 @@ public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "缴费项目显示状态", required = false)
 	private String paymentItemShowState;
 	
+	@ApiModelProperty(value = "是否显示销售价", required = false)
+	private Boolean isShowSalePrice;
+	
 	public Boolean getConfirmCreate() {
 		return confirmCreate;
 	}
@@ -193,4 +196,12 @@ public class MusicGroupPaymentBaseCalender {
 		this.paymentItemShowState = paymentItemShowState;
 	}
 
+	public Boolean getIsShowSalePrice() {
+		return isShowSalePrice;
+	}
+
+	public void setIsShowSalePrice(Boolean isShowSalePrice) {
+		this.isShowSalePrice = isShowSalePrice;
+	}
+
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalender.java

@@ -205,6 +205,9 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 	
 	@ApiModelProperty(value = "缴费项目显示状态", required = false)
 	private String paymentItemShowState;
+	
+	@ApiModelProperty(value = "是否显示销售价", required = false)
+	private Boolean isShowSalePrice;
 
 	public Boolean getCloudTeacherPaymentFlag() {
 		return cloudTeacherPaymentFlag;
@@ -502,6 +505,14 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 		this.paymentItemShowState = paymentItemShowState;
 	}
 
+	public Boolean getIsShowSalePrice() {
+		return isShowSalePrice;
+	}
+
+	public void setIsShowSalePrice(Boolean isShowSalePrice) {
+		this.isShowSalePrice = isShowSalePrice;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -238,28 +238,28 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             throw new BizException("请登录");
         });
 
-        if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS && musicGroup.getStatus() != MusicGroupStatusEnum.PRE_BUILD_FEE) {
-            throw new BizException("创建缴费失败：已存在缴费项目");
+        if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
+            throw new BizException("只有‘草稿’状态才能创建报名缴费");
         }
         // 所有缴费项目已完成排课才能创建下一个缴费项目
-        String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, null);
+        /*String orignBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null, null);
         if (!musicGroupPaymentBaseCalender.getConfirmCreate() && StringUtils.isNoneBlank(orignBatchNo)) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return BaseController.failed(HttpStatus.MULTI_STATUS,"当前乐团存在未排课的缴费项目，请再次确认操作");
-        }
+            return BaseController.failed(HttpStatus.MULTI_STATUS, "当前乐团存在未排课的缴费项目，请再次确认操作");
+        }*/
 
         // 不是进行中，只能创建一次缴费
-        if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS) {
+        /*if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS) {
             List<MusicGroupPaymentCalender> list = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
             if (list.size() > 0) {
                 throw new BizException("创建失败，已经存在缴费信息");
             }
-        }
+        }*/
         //进行中加学员拓展信息
         CalenderAddStudent calenderAddStudent = musicGroupPaymentBaseCalender.getCalenderAddStudent();
         MusicGroupPaymentCalender musicGroupPaymentCalender = new MusicGroupPaymentCalender();
         //判断缴费项目类型
-        if (musicGroup.getStatus() == MusicGroupStatusEnum.PRE_BUILD_FEE) {
+        if (musicGroup.getStatus() == MusicGroupStatusEnum.DRAFT) {
             musicGroupPaymentBaseCalender.setPaymentType(MUSIC_APPLY);
         } else {
             if (calenderAddStudent != null && calenderAddStudent.getStudentIds() != null) {
@@ -300,8 +300,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 .add(repairActualAmount)
                 .add(activityActualAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
 
-        PaymentCalenderStatusEnum status;
-        if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
+        PaymentCalenderStatusEnum status = PaymentCalenderStatusEnum.DRAFT;
+        /*if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
             status = AUDITING;
         } else {
             //计算项目原现价
@@ -320,10 +320,11 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                         .add(activityCurrentAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
                 status = actualTotalAmount.compareTo(currentTotalAmount) == 0 ? NO : AUDITING;
             }
-        }
+        }*/
 
         Date date = new Date();
 
+        musicGroupPaymentCalender.setIsShowSalePrice(musicGroupPaymentBaseCalender.getIsShowSalePrice());
         musicGroupPaymentCalender.setDeadlinePaymentDate(musicGroupPaymentBaseCalender.getDeadlinePaymentDate());
         musicGroupPaymentCalender.setMemo(musicGroupPaymentBaseCalender.getMemo());
         musicGroupPaymentCalender.setMusicGroupId(musicGroupId);
@@ -340,7 +341,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
         musicGroupPaymentCalender.setPaymentItemShowState(musicGroupPaymentBaseCalender.getPaymentItemShowState());
 
-        if (musicGroupPaymentCalender.getStatus() != AUDITING) {
+        /*if (musicGroupPaymentCalender.getStatus() != AUDITING) {
             if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
             } else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {
@@ -348,7 +349,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             } else {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.NO);
             }
-        }
+        }*/
 
         // 设置批次号
         String batchNo = idGeneratorService.generatorId() + "";
@@ -403,15 +404,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 
         // 如果是报名，需要修改乐团状态
         if (musicGroupPaymentBaseCalender.getPaymentType() == MUSIC_APPLY) {
-            if (status != AUDITING) {
-                musicGroup.setStatus(MusicGroupStatusEnum.APPLY);
-                // 记录操作日志
-                musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（创建缴费中 -> 报名中）", sysUser.getId(), ""));
-            } else {
-                musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
-                // 记录操作日志
-                musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（创建缴费 -> 费用审核中）", sysUser.getId(), ""));
-            }
+        	// 记录操作日志
+            musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功", sysUser.getId(), ""));
+            
             musicGroup.setUpdateTime(date);
             musicGroupDao.update(musicGroup);
         }

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

@@ -1551,6 +1551,10 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "提交审核（草稿 -> 审核中）", sysUser.getId(), ""));
         musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
         musicGroupDao.update(musicGroup);
+        
+        //修改乐团报名缴费项目状态
+        //musicGroupDao
+        
         sendSeoMessageSource.sendSeoMessage(musicGroup.getOrganId(), new SysUserRoleEnum[]{ORGAN_MANAGER},
                 null, null, MessageTypeEnum.BACKSTAGE_CREATE_MUSIC_GROUP_APPLY, sysUser.getRealName(), musicGroup.getName());
     }

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

@@ -40,6 +40,7 @@
         <result column="current_total_amount_" property="currentTotalAmount"/>
         <result column="original_total_amount_" property="originalTotalAmount"/>
         <result column="payment_item_show_state_" property="paymentItemShowState"/>
+        <result column="is_show_sale_price_" property="isShowSalePrice"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -60,14 +61,14 @@
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,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_)
+         ,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_)
         VALUES(#{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(),
         #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{paymentAmount},#{batchNo},#{auditMemo},#{operator},#{attribute1},#{attribute2},#{studentIds},
                #{memberPaymentAmount},#{memberRankSettingId},#{memberValidDate},#{originalMemberPaymentAmount},
-               #{currentTotalAmount},#{originalTotalAmount},#{tenantId},#{organId},#{cloudTeacherPaymentFlag},#{paymentItemShowState})
+               #{currentTotalAmount},#{originalTotalAmount},#{tenantId},#{organId},#{cloudTeacherPaymentFlag},#{paymentItemShowState},#{isShowSalePrice})
     </insert>
 
 
@@ -160,6 +161,9 @@
             <if test="paymentItemShowState != null">
                 payment_item_show_state_ = #{paymentItemShowState},
             </if>
+            <if test="isShowSalePrice != null">
+                is_show_sale_price_ = #{isShowSalePrice},
+            </if>
         </set>
         WHERE id_ = #{id} and tenant_id_ = #{tenantId}
     </update>
@@ -246,6 +250,9 @@
 	            <if test="item.paymentItemShowState != null">
 	                payment_item_show_state_ = #{item.paymentItemShowState},
 	            </if>
+	            <if test="item.isShowSalePrice != null">
+	                is_show_sale_price_ = #{item.isShowSalePrice},
+	            </if>
 	        </set>
 	        WHERE id_ = #{item.id} and tenant_id_ = #{item.tenantId}
 		</foreach>