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

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

@@ -13,8 +13,6 @@ public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGrou
 
     int batchInstert(List<VipGroupDefaultClassesCycle> vipGroupDefaultClassesCycles);
 
-    int deleteAllByOrgan(Long organId);
-
     int deleteAll();
 
     /**
@@ -31,19 +29,15 @@ public interface VipGroupDefaultClassesCycleDao extends BaseDAO<Integer, VipGrou
 
     int countAll();
 
-    List<VipGroupDefaultClassesCycle> findAllByOrgan(@Param("organId") Long organId);
-
     List<VipGroupDefaultClassesCycle> findAllCycle();
 
     /**
      * @describe 根据乐团获取指定课次课排课范围
      * @author Joburgess
      * @date 2019/10/29
-     * @param organId: 部门编号
      * @param classTimes: 课次
      * @return com.ym.mec.biz.dal.entity.VipGroupDefaultClassesCycle
      */
-    VipGroupDefaultClassesCycle findByOrganAndClassTimes(@Param("organId") Long organId,
-                                                         @Param("classTimes") Integer classTimes);
+    VipGroupDefaultClassesCycle findByOrganAndClassTimes(@Param("classTimes") Integer classTimes);
 
 }

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

@@ -352,8 +352,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Map payMap = payService.getPayMap(
                 orderAmount,
                 orderNo,
-                "http://mstudev.dayaedu.com/api-student/studentOrder/notify",
-                "http://mstudev.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
+                "http://mstutest.dayaedu.com/api-student/studentOrder/notify",
+                "http://mstutest.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
                 "测试订单",
                 "测试订单");
         
@@ -492,8 +492,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         Map payMap = payService.getPayMap(
                 orderAmount,
                 orderNo,
-                "http://mstudev.dayaedu.com/api-student/studentOrder/notify",
-                "http://mstudev.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
+                "http://mstutest.dayaedu.com/api-student/studentOrder/notify",
+                "http://mstutest.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
                 "测试订单",
                 "测试订单");
         

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

@@ -9,7 +9,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Objects;
 
 @Service
 public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Long, TeacherDefaultVipGroupSalary>  implements TeacherDefaultVipGroupSalaryService {
@@ -24,7 +26,12 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 
 	@Override
 	public TeacherDefaultVipGroupSalary findByTeacherAndCategory(Integer userId, Long categoryId) {
-		return teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(userId,categoryId);
+		TeacherDefaultVipGroupSalary byTeacherAndCategory = teacherDefaultVipGroupSalaryDao.findByTeacherAndCategory(userId, categoryId);
+		if(Objects.isNull(byTeacherAndCategory)){
+			byTeacherAndCategory.setOfflineClassesSalary(new BigDecimal(0));
+			byTeacherAndCategory.setOnlineClassesSalary(new BigDecimal(0));
+		}
+		return byTeacherAndCategory;
 	}
 
 	@Override
@@ -38,4 +45,4 @@ public class TeacherDefaultVipGroupSalaryServiceImpl extends BaseServiceImpl<Lon
 			teacherDefaultVipGroupSalaryDao.batchAdd(teacherDefaultVipGroupSalaries);
 		}
 	}
-}
+}

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

@@ -175,10 +175,13 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				throw new BizException("课时安排时间超出范围!");
 			}
 		}else{
-			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(Long.parseLong(sysUser.getOrganId()), totalClassTimes);
-			int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
-			if(month>vipGroupDefaultClassesCycle.getMonth()){
-				throw new BizException("课时安排时间超出范围!");
+			VipGroupDefaultClassesCycle vipGroupDefaultClassesCycle = vipGroupDefaultClassesCycleDao.findByOrganAndClassTimes(totalClassTimes);
+			
+			if (vipGroupDefaultClassesCycle != null) {
+				int month = DateUtil.monthsBetween(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
+				if (month > vipGroupDefaultClassesCycle.getMonth()) {
+					throw new BizException("课时安排时间超出范围!");
+				}
 			}
 		}
 
@@ -993,8 +996,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			Map<String,Object> payMap = payService.getPayMap(
 					amount,
 					orderNo,
-					"http://mstudev.dayaedu.com/api-student/studentOrder/notify",
-					"http://mstudev.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
+					"http://mstutest.dayaedu.com/api-student/studentOrder/notify",
+					"http://mstutest.dayaedu.com/#/paymentresult?orderNo=" + orderNo,
 					"vip课购买",
 					vipGroup.getName());
 			studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));

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

@@ -74,9 +74,6 @@ create_time_ = #{createTime},
 	<delete id="delete" >
 		DELETE FROM vip_group_default_classes_cycle WHERE id_ = #{id} 
 	</delete>
-	<delete id="deleteAllByOrgan" >
-		DELETE FROM vip_group_default_classes_cycle WHERE organ_id_=#{organId}
-	</delete>
 	<delete id="deleteAll" >
 		DELETE FROM vip_group_default_classes_cycle
 	</delete>
@@ -121,16 +118,6 @@ create_time_ = #{createTime},
 			vip_group_default_classes_cycle
 		LIMIT 1
     </select>
-	<select id="findAllByOrgan" resultMap="VipGroupDefaultClassesCycle">
-		SELECT
-			*
-		FROM
-			vip_group_default_classes_cycle
-		<if test="organId!=null">
-			WHERE organ_id_=#{organId}
-		</if>
-		ORDER BY max_class_times_
-	</select>
 	<select id="findAllCycle" resultMap="VipGroupDefaultClassesCycle">
 		SELECT
 			*
@@ -144,8 +131,7 @@ create_time_ = #{createTime},
 		FROM
 			vip_group_default_classes_cycle
 		WHERE
-			organ_id_ = #{organId}
-			AND #{classTimes} &gt;= min_class_times_
+			#{classTimes} &gt;= min_class_times_
 			AND #{classTimes} &lt;= max_class_times_
     </select>
 </mapper>