Merge branch 'zx_saas_2023_03' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/OperatingReportNewDao.java

@@ -17,7 +17,7 @@ public interface OperatingReportNewDao extends BaseDAO<Integer, OperatingReportN
     List<OperatingReportNew> sumSellAmount(String month);
 
     //云教练赠送课程服务收入
-    List<Map<Integer,BigDecimal>> sumCloudCourseAmount(@Param("firstDay") String firstDay, @Param("lastDay") String lastDay);
+//    List<Map<Integer,BigDecimal>> sumCloudCourseAmount(@Param("firstDay") String firstDay, @Param("lastDay") String lastDay);
 
     //付费课程收入
     List<Map<Integer,BigDecimal>> sumCourseAmount(@Param("firstDay") String firstDay, @Param("lastDay") String lastDay);
@@ -47,7 +47,7 @@ public interface OperatingReportNewDao extends BaseDAO<Integer, OperatingReportN
     List<Map<Integer,BigDecimal>> sumGroupAmount(@Param("month") String month);
 
     //云教练赠课预收
-    List<Map<Integer,BigDecimal>> sumCloudCoursePreAmount(@Param("lastDay") String lastDay);
+//    List<Map<Integer,BigDecimal>> sumCloudCoursePreAmount(@Param("lastDay") String lastDay);
 
     //付费课程预收
     List<Map<Integer,BigDecimal>> sumCoursePreAmount(@Param("lastDay") String lastDay);

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

@@ -4,6 +4,8 @@ import com.ym.mec.biz.dal.enums.PeriodEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 @Data
 public class MusicGroupPaymentCalenderMember extends MusicGroupPaymentCalenderBase{
     @ApiModelProperty(value = "会员名称", required = false)
@@ -19,4 +21,7 @@ public class MusicGroupPaymentCalenderMember extends MusicGroupPaymentCalenderBa
 
     @ApiModelProperty(value = "自动激活团练宝标识", required = false)
     private Boolean autoActivationFlag = false;
+
+    @ApiModelProperty(value = "团练宝收入实际收入，用于结算经营报表，actualAmount减去收入以及其他费用，剩下的就是课程费用", required = false)
+    private BigDecimal income = BigDecimal.ZERO;
 }

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

@@ -288,12 +288,13 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
         cloudTeacherOrder.setAmount(cloudTeacherFee);
         cloudTeacherOrder.setStudentId(order.getUserId());
         cloudTeacherOrder.setStatus(1);
-        MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(order.getCalenderId());
+        cloudTeacherOrder.setOperatingAmount(calenderMember.getIncome());
+        /*MusicGroupPaymentCalender calender = musicGroupPaymentCalenderDao.get(order.getCalenderId());
         if(calender.getCloudTeacherPaymentFlag()){
             cloudTeacherOrder.setOperatingAmount(BigDecimal.ZERO);
         }else {
             cloudTeacherOrder.setOperatingAmount(cloudTeacherFee);
-        }
+        }*/
         //保存云教练订单
         this.save(cloudTeacherOrder,calenderMember.getAutoActivationFlag());
     }

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

@@ -409,6 +409,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 //获取云教练溢出费用
                 BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
                         calenderMember.getNum(), MemberFeeSettingServiceImpl::getIncome);
+                calenderMember.setIncome(courseIncome);
+                musicGroupPaymentCalenderMemberService.update(calenderMember);
                 //获取云教练溢出费用
                 BigDecimal currentFee = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
                         calenderMember.getNum(), MemberFeeSettingServiceImpl::getCurrentFee);

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

@@ -114,7 +114,7 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 
 		//课程预收
 		//云教练赠课预收
-		Map<Integer, BigDecimal> collect11 = MapUtil.convertIntegerMap(operatingReportNewDao.sumCloudCoursePreAmount(lastDayOfMonth));
+//		Map<Integer, BigDecimal> collect11 = MapUtil.convertIntegerMap(operatingReportNewDao.sumCloudCoursePreAmount(lastDayOfMonth));
 		//云教练赠送，未排课排课资格预收
 		//获取categoryId
 		VipGroupCategory category = vipGroupCategoryDao.getTheory();
@@ -179,7 +179,7 @@ public class OperatingReportNewServiceImpl extends BaseServiceImpl<Integer, Oper
 					add(getAmount(collect10.get(organId))).
 					add(getAmount(collect27.get(organId))).
 					add(getAmount(collect25.get(organId))));
-			operatingReportNew.setCoursePrepaidFee(getAmount(collect11.get(organId)).add(getAmount(collect12.get(organId))).
+			operatingReportNew.setCoursePrepaidFee(getAmount(collect12.get(organId)).
 					add(getAmount(collect20.get(organId))).add(getAmount(collect21.get(organId))).add(getAmount(collect23.get(organId))));
 			operatingReportNew.setSalePrepaidFee(getAmount(collect13.get(organId)));
 			operatingReportNew.setOtherPrepaidFee(getAmount(collect14.get(organId)));

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

@@ -16,6 +16,7 @@
 		<result column="optional_flag_" property="optionalFlag" />
 		<result column="actual_amount_" property="actualAmount" />
 		<result column="original_amount_" property="originalAmount" />
+		<result column="income_" property="income" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
         <result column="tenant_id_" property="tenantId"/>
@@ -35,9 +36,9 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderMember" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_member (calender_id_,name_,num_,period_,
-		member_rank_setting_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_,tenant_id_,auto_activation_flag_)
+		member_rank_setting_id_,optional_flag_,actual_amount_,original_amount_,create_time_,update_time_,tenant_id_,auto_activation_flag_,income_)
 		VALUES(#{calenderId},#{name},#{num},#{period,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{memberRankSettingId},#{optionalFlag},#{actualAmount},
-		       #{originalAmount},NOW(),NOW(),#{tenantId},#{autoActivationFlag})
+		       #{originalAmount},NOW(),NOW(),#{tenantId},#{autoActivationFlag},#{income})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -67,6 +68,9 @@
 		<if test="originalAmount != null">
 		original_amount_ = #{originalAmount},
 		</if>
+		<if test="income != null">
+			income_ = #{income},
+		</if>
 		<if test="name != null">
 		name_ = #{name},
 		</if>

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

@@ -129,8 +129,9 @@
 		update operating_report_cloud orc
 		left join (
 		select orc.calender_id_,MIN(cs.class_date_) start_date_ from operating_report_cloud orc
-		LEFT JOIN cloud_teacher_free_course ctf ON ctf.calender_id_ = orc.calender_id_
-		LEFT JOIN course_schedule cs ON cs.id_ = ctf.course_id_
+		left join music_group_payment_calender mgpc ON mgpc.id_ = orc.calender_id_
+		left join course_schedule_student_payment cssp ON cssp.batch_no_ = mgpc.batch_no_
+		left join course_schedule cs ON cs.id_ = cssp.course_schedule_id_
 		where orc.month_flag_ = false AND orc.settlement_flag_ = false AND orc.start_date_ IS NULL
 		AND cs.class_date_ <= #{lastDay}
 		group by orc.calender_id_) mc ON orc.calender_id_ = mc.calender_id_
@@ -186,12 +187,6 @@
 		      (DATE_FORMAT(spo.pay_time_,'%Y-%m') = #{month} AND (mg.musical_instruments_provide_status_ IS NULL OR mg.musical_instruments_provide_status_ = 1))
 		group by so.organ_id_
 	</select>
-	<select id="sumCloudCourseAmount" resultType="java.util.Map">
-		SELECT cs.organ_id_ 'key',SUM(ctf.cost_) 'value' FROM cloud_teacher_free_course ctf
-		LEFT JOIN course_schedule cs ON cs.id_ = ctf.course_id_
-		where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0 AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_)
-		AND cs.class_date_ BETWEEN #{firstDay} AND #{lastDay} group by cs.organ_id_;
-	</select>
 	<select id="sumCourseAmount" resultType="java.util.Map">
 		SELECT cs.organ_id_ 'key',SUM(cssp.actual_price_) 'value' FROM course_schedule cs
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_
@@ -240,13 +235,6 @@
 		from operating_report_cloud orc
 		where orc.cloud_price_ > 0 AND orc.month_flag_ = true AND DATE_FORMAT(orc.create_time_,'%Y-%m') = #{month} group by orc.organ_id_;
 	</select>
-	<select id="sumCloudCoursePreAmount" resultType="java.util.Map">
-		SELECT cs.organ_id_ 'key',SUM(ctf.cost_) 'value' FROM cloud_teacher_free_course ctf
-		LEFT JOIN course_schedule cs ON cs.id_ = ctf.course_id_
-		where cs.del_flag_ = 0 AND cs.is_lock_ = 0 AND cs.pre_course_flag_ = 0
-		AND (cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_) AND cs.class_date_ > #{lastDay}
-		group by cs.organ_id_;
-	</select>
 	<select id="sumCoursePreAmount" resultType="java.util.Map">
 		SELECT cs.organ_id_ 'key',SUM(cssp.actual_price_) 'value' FROM course_schedule cs
 		LEFT JOIN course_schedule_student_payment cssp ON cssp.course_schedule_id_ = cs.id_