Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -70,6 +70,26 @@ public class VipGroupActivity {
 
 	private Integer enable;
 
+	private Integer onlineClassJoinGradientRewards;
+
+	private Integer offlineClassJoinGradientRewards;
+
+	public Integer getOnlineClassJoinGradientRewards() {
+		return onlineClassJoinGradientRewards;
+	}
+
+	public void setOnlineClassJoinGradientRewards(Integer onlineClassJoinGradientRewards) {
+		this.onlineClassJoinGradientRewards = onlineClassJoinGradientRewards;
+	}
+
+	public Integer getOfflineClassJoinGradientRewards() {
+		return offlineClassJoinGradientRewards;
+	}
+
+	public void setOfflineClassJoinGradientRewards(Integer offlineClassJoinGradientRewards) {
+		this.offlineClassJoinGradientRewards = offlineClassJoinGradientRewards;
+	}
+
 	public String getPaymentReadonlyFlag() {
 		return paymentReadonlyFlag;
 	}

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

@@ -935,7 +935,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 						break;
 					case RATIO_DISCOUNT:
 //						results.put("onlineTeacherSalary",onlineClassesUnitPrice.multiply((vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSettlementValue())).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).setScale(0,BigDecimal.ROUND_HALF_UP));
-						results.put("onlineTeacherSalary",totalPrice.divide(totalClassNum, RoundingMode.HALF_UP).multiply(vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSettlementValue()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).setScale(0,BigDecimal.ROUND_HALF_UP));
+
+						results.put("onlineTeacherSalary",totalPrice.multiply(new BigDecimal(vipGroupCategory.getStudentNum())).divide(totalClassNum, RoundingMode.HALF_UP).multiply(vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSettlementValue()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).setScale(0,BigDecimal.ROUND_HALF_UP));
+
 						break;
 					case FIXED_SALARY:
 						results.put("onlineTeacherSalary",vipGroupSalarySettlementDto.getOnlineSalarySettlement().getSettlementValue().setScale(0, BigDecimal.ROUND_HALF_UP));
@@ -968,7 +970,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 						break;
 					case RATIO_DISCOUNT:
 //						results.put("offlineTeacherSalary",offlineClassesUnitPrice.multiply(vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSettlementValue()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).setScale(0,BigDecimal.ROUND_HALF_UP));
-						results.put("offlineTeacherSalary",totalPrice.divide(totalClassNum, RoundingMode.HALF_UP).multiply(vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSettlementValue()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).setScale(0,BigDecimal.ROUND_HALF_UP));
+
+						results.put("offlineTeacherSalary",totalPrice.multiply(new BigDecimal(vipGroupCategory.getStudentNum())).divide(totalClassNum, RoundingMode.HALF_UP).multiply(vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSettlementValue()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).setScale(0,BigDecimal.ROUND_HALF_UP));
+
 						break;
 					case FIXED_SALARY:
 						results.put("offlineTeacherSalary",vipGroupSalarySettlementDto.getOfflineSalarySettlement().getSettlementValue().setScale(0, BigDecimal.ROUND_HALF_UP));

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

@@ -608,7 +608,10 @@
 	
 	<select id="queryOnlineCourseByGroupType" resultMap="CourseScheduleTeacherSalary">
 		SELECT csts.*  FROM `course_schedule_teacher_salary` csts LEFT JOIN `course_schedule` cs on csts.`course_schedule_id_` = cs.`id_` 
-		WHERE cs.`group_type_` = #{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} and cs.`teach_mode_` = 'ONLINE'
+		left join vip_group vg on vg.id_ = csts.music_group_id_ and csts.group_type_ = 'VIP'
+		left join vip_group_category vgc on vgc.id_ = vg.vip_group_category_id_
+		left join teacher t on t.id_ = csts.user_id_ 
+		WHERE cs.`group_type_` = 'VIP' and cs.`teach_mode_` = 'ONLINE' and vgc.name_ = '1v1' and t.job_nature_ = 'FULL_TIME'
 	</select>
 
     <select id="isTeacher" resultType="java.lang.Boolean">

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

@@ -28,7 +28,9 @@
 		<result column="salary_settlement_json_" property="salarySettlementJson" />
 		<result column="vip_group_category_names_" property="vipGroupCategoryNames"/>
 		<result property="enable" column="enable"/>
-		<result property="del_flag_" column="delFlag"/>
+		<result property="delFlag" column="del_flag_"/>
+		<result property="onlineClassJoinGradientRewards" column="online_class_join_gradient_rewards_"/>
+		<result property="offlineClassJoinGradientRewards" column="offline_class_join_gradient_rewards_"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -48,8 +50,8 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO vip_group_activity (id_,name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,attribute1_,attribute2_,attribute3_,salary_readonly_flag_,give_class_pay_salary_flag_,create_time_,update_time_,salary_settlement_json_,del_flag_,payment_readonly_flag_)
-		VALUES(#{id},#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},#{type},#{attribute1},#{attribute2},#{attribute3},#{salaryReadonlyFlag},#{giveClassPaySalaryFlag},now(),now(),#{salarySettlementJson},#{delFlag},#{paymentReadonlyFlag})
+		INSERT INTO vip_group_activity (id_,name_,description_,vip_group_category_id_list_,start_time_,end_time_,organ_id_,courses_start_time_,courses_end_time_,type_,attribute1_,attribute2_,attribute3_,salary_readonly_flag_,give_class_pay_salary_flag_,create_time_,update_time_,salary_settlement_json_,del_flag_,payment_readonly_flag_,online_class_join_gradient_rewards_,offline_class_join_gradient_rewards_)
+		VALUES(#{id},#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},#{type},#{attribute1},#{attribute2},#{attribute3},#{salaryReadonlyFlag},#{giveClassPaySalaryFlag},now(),now(),#{salarySettlementJson},#{delFlag},#{paymentReadonlyFlag},#{onlineClassJoinGradientRewards},#{offlineClassJoinGradientRewards})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -115,6 +117,12 @@
 			<if test="paymentReadonlyFlag != null">
 				payment_readonly_flag_ = #{paymentReadonlyFlag},
 			</if>
+			<if test="onlineClassJoinGradientRewards!=null">
+				online_class_join_gradient_rewards_=#{onlineClassJoinGradientRewards},
+			</if>
+			<if test="offlineClassJoinGradientRewards!=null">
+				offline_class_join_gradient_rewards_=#{offlineClassJoinGradientRewards},
+			</if>
 			</set> WHERE id_ = #{id}
 	</update>