Merge remote-tracking branch 'origin/master'

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

@@ -5,6 +5,7 @@ import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 public interface TeacherDefaultVipGroupSalaryDao extends BaseDAO<Long, TeacherDefaultVipGroupSalary> {
 
@@ -20,7 +21,8 @@ public interface TeacherDefaultVipGroupSalaryDao extends BaseDAO<Long, TeacherDe
      * 根据教师编号删除vip课课酬设置
      * @param userId
      */
-    void delByTeacherId(Integer userId);
+    void delByTeacherId(@Param("userId") Integer userId,
+                        @Param("categoryIds") Set<Integer> categoryIds);
 
     /**
      * 批量新增
@@ -31,4 +33,4 @@ public interface TeacherDefaultVipGroupSalaryDao extends BaseDAO<Long, TeacherDe
     List<TeacherDefaultVipGroupSalary> queryByUserId(Integer userId);
     
     List<TeacherDefaultVipGroupSalary> queryByUserIdList(@Param("userIdList") List<Integer> userIdList);
-}
+}

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

@@ -282,16 +282,16 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			paymentStudentNumData.setPercent(BigDecimal.ZERO);
 			convertStudentNumData.setPercent(BigDecimal.ZERO);
 		}else{
-			studentNumData.setPercent(studentNumData.getActivateNum().divide(preStudentNumData.getActivateNum()).multiply(new BigDecimal(100)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN));
+			studentNumData.setPercent(studentNumData.getActivateNum().divide(preStudentNumData.getActivateNum(), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN));
 			if(studentNumData.getActivateNum().compareTo(BigDecimal.ZERO)==0){
 				paymentStudentNumData.setPercent(BigDecimal.ZERO);
 				convertStudentNumData.setPercent(BigDecimal.ZERO);
 			}else{
-				paymentStudentNumData.setPercent(paymentStudentNumData.getActivateNum().divide(studentNumData.getActivateNum()).multiply(new BigDecimal(100)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN));
+				paymentStudentNumData.setPercent(paymentStudentNumData.getActivateNum().divide(studentNumData.getActivateNum(), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN));
 				if(paymentStudentNumData.getActivateNum().compareTo(BigDecimal.ZERO)==0){
 					convertStudentNumData.setPercent(BigDecimal.ZERO);
 				}else{
-					convertStudentNumData.setPercent(convertStudentNumData.getActivateNum().divide(paymentStudentNumData.getActivateNum()).multiply(new BigDecimal(100)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN));
+					convertStudentNumData.setPercent(convertStudentNumData.getActivateNum().divide(paymentStudentNumData.getActivateNum(), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN));
 				}
 			}
 		}
@@ -302,7 +302,11 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 		convertData.add(convertStudentNumData);
 		IndexBaseDto indexBaseData = new IndexBaseDto(IndexDataType.STUDENT_CONVERSION, IndexDataType.STUDENT_CONVERSION.getMsg());
 		indexBaseData.setIndexMonthData(convertData, currentMonth);
-		indexBaseData.setPercent(convertStudentNumData.getPercent());
+		if(paymentStudentNumData.getActivateNum().compareTo(BigDecimal.ZERO)==0){
+			indexBaseData.setPercent(convertStudentNumData.getPercent());
+		}else{
+			indexBaseData.setPercent(convertStudentNumData.getActivateNum().divide(paymentStudentNumData.getActivateNum(), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(100)).setScale(CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_DOWN));
+		}
 		result.add(indexBaseData);
 	}
 

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

@@ -111,7 +111,7 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 			if (salaryMap.size() > 0) {
 
 				// 根据教师编号删除
-				teacherDefaultVipGroupSalaryDao.delByTeacherId(salary.getUserId());
+				teacherDefaultVipGroupSalaryDao.delByTeacherId(salary.getUserId(), vipGroupCategoryIds);
 				// 新增
 				teacherDefaultVipGroupSalaryDao.batchAdd(teacherDefaultVipGroupSalaries);
 
@@ -174,9 +174,6 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 								}else if(TeachModeEnum.OFFLINE.equals(ts.getCourseSchedule().getTeachMode())&&teachModeSalaryMap.containsKey("offlineTeacherSalary")){
 									ts.setExpectSalary(teachModeSalaryMap.get("offlineTeacherSalary"));
 								}
-								if(!vipGroupCategory.getMusicTheory()){
-									ts.setExpectSalary(tdms.getOfflineClassesSalary());
-								}
 								list.add(ts);
 							}
 						}

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

@@ -72,6 +72,12 @@
 	</delete>
     <delete id="delByTeacherId">
         DELETE FROM teacher_default_vip_group_salary WHERE user_id_ = #{userId}
+        <if test="categoryIds!=null and categoryIds.size()>0">
+            AND vip_group_category_id_ IN
+            <foreach collection="categoryIds" item="categoryId" open="(" close=")" separator=",">
+                #{categoryId}
+            </foreach>
+        </if>
     </delete>
 
     <!-- 分页查询 -->