Merge branch 'feature/0529-live' of http://git.dayaedu.com/yonge/mec into feature/0529-live

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

@@ -24,7 +24,8 @@ public interface VipGroupDefaultClassesUnitPriceDao extends BaseDAO<Integer, Vip
      */
     VipGroupDefaultClassesUnitPrice getByVipGroupCategory(@Param("vipGroupCategoryId") Integer vipGroupCategoryId,
                                                           @Param("organId") Integer organId,
-                                                          @Param("groupType") String groupType);
+                                                          @Param("groupType") String groupType,
+                                                          @Param("tenantId") Integer tenantId);
 
 
     int updateByVipGroupCategory(VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice);

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

@@ -16,6 +16,7 @@ public class SysUserContracts extends BaseEntity {
 		INSTRUMENT("乐器借用"),
 		COURSES("课程购买"),
 		VIP_COURSES("VIP课程购买"),
+		LIVE_COURSES("直播课程购买"),
 		PRACTICE("网管课购买"),
 		PRODUCT("产品");
 

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

@@ -597,16 +597,22 @@ public class ContractServiceImpl implements ContractService {
 
         // 查询参数信息
         StudentInfo studentInfo = studentRegistrationService.queryStudentInfo(userId);
-        params.put("studentInfo", studentInfo);
-
-        // 课程类型
-        params.put("classesType", "VIP课");
 
         // 课程费用
         VipGroup vipGroup = vipGroupService.get(vipGroupId);
         if (vipGroup == null) {
             throw new BizException("VIP课找不到");
         }
+        String classesType = "VIP课";
+        String vipCourses = "vipCourses/";
+        ContractType contractType = ContractType.VIP_COURSES;
+        if("LIVE".equals(vipGroup.getGroupType())){
+            classesType = "直播课";
+            vipCourses = "liveCourses/";
+            contractType = ContractType.LIVE_COURSES;
+        }
+        params.put("studentInfo", studentInfo);
+        params.put("classesType", classesType);
         params.put("courseFee", vipGroup.getTotalPrice().doubleValue());
 
         // 收费形式
@@ -638,12 +644,12 @@ public class ContractServiceImpl implements ContractService {
 
         // 上传到oss
         String dateStrOss = dateFormatOss.format(date);
-        dateStrOss = "vipCourses/" + dateStrOss + "/" + DateUtil.getHour(date);
+        dateStrOss = vipCourses + dateStrOss + "/" + DateUtil.getHour(date);
         String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
 
         SysUserContracts sysUserContracts = new SysUserContracts();
         sysUserContracts.setCreateTime(date);
-        sysUserContracts.setType(ContractType.VIP_COURSES);
+        sysUserContracts.setType(contractType);
         sysUserContracts.setUrl(pdfFilePath);
         sysUserContracts.setUserId(userId);
 

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

@@ -32,7 +32,7 @@ public class VipGroupDefaultClassesUnitPriceServiceImpl extends BaseServiceImpl<
 			throw new BizException("请选择分部");
 		}
 		VipGroupDefaultClassesUnitPrice byVipGroupCategory = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(bean.getVipGroupCategoryId(),
-				bean.getOrganId(), bean.getGroupType());
+				bean.getOrganId(), bean.getGroupType(),null);
 		if(null!=byVipGroupCategory){
 			return vipGroupDefaultClassesUnitPriceDao.updateByVipGroupCategory(bean);
 		}else{
@@ -42,7 +42,7 @@ public class VipGroupDefaultClassesUnitPriceServiceImpl extends BaseServiceImpl<
 
 	@Override
 	public BigDecimal getAmount(Integer categoryId,Integer organId, BigDecimal courseNum) {
-		VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = Optional.ofNullable(vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(categoryId,organId, "VIP")).
+		VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = Optional.ofNullable(vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(categoryId,organId, "VIP",null)).
 				orElseThrow(()->new BizException("课程单价设置错误"));
 		return vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice().multiply(courseNum);
 	}

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

@@ -949,7 +949,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
 
         VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(vipGroup.getVipGroupApplyBaseInfo().getVipGroupCategoryId(),
-                vipGroup.getVipGroupApplyBaseInfo().getOrganId(), vipGroup.getVipGroupApplyBaseInfo().getGroupType());
+                vipGroup.getVipGroupApplyBaseInfo().getOrganId(), vipGroup.getVipGroupApplyBaseInfo().getGroupType(),null);
 
         if (Objects.isNull(vipGroupDefaultClassesUnitPrice)) {
             vipGroupApplyBaseInfoDto.setAuditStatus(AuditStatusEnum.ING);
@@ -2766,7 +2766,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                         vipGroup.setStatus(VipGroupStatusEnum.PROGRESS);
                         classGroup.setDelFlag(0);
                         VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(vipGroup.getVipGroupCategoryId(),
-                                vipGroup.getOrganId(), vipGroup.getGroupType());
+                                vipGroup.getOrganId(), vipGroup.getGroupType(),null);
                         //生成课表
                         List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class);
                         classGroup.setTotalClassTimes(courseSchedules.size());
@@ -4507,7 +4507,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                     Integer tenantId = vipGroup.getTenantId();
                     classGroup.setDelFlag(0);
                     VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(vipGroup.getVipGroupCategoryId(),
-                            vipGroup.getOrganId(), vipGroup.getGroupType());
+                            null, vipGroup.getGroupType(),tenantId);
                     //生成课表
                     List<CourseSchedule> courseSchedules = JSON.parseArray(vipGroup.getCourseSchedulesJson(), CourseSchedule.class);
                     classGroup.setTotalClassTimes(courseSchedules.size());
@@ -4571,7 +4571,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                             } else {
                                 courseScheduleStudentPayment.setExpectPrice(divide);
                             }
-                            courseScheduleStudentPayment.setOriginalPrice(TeachModeEnum.ONLINE.equals(courseSchedule.getTeachMode()) ? vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice() : vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());
+                            courseScheduleStudentPayment.setOriginalPrice(vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());
                             courseScheduleStudentPayment.setActualPrice(courseScheduleStudentPayment.getExpectPrice());
                             courseScheduleStudentPayments.add(courseScheduleStudentPayment);
                         }

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

@@ -121,9 +121,13 @@ create_time_ = #{createTime},
 			vgdcup.*
 		FROM
 			vip_group_default_classes_unit_price_ vgdcup
-		WHERE vgdcup.organ_id_=#{organId} AND vgdcup.vip_group_category_id_=#{vipGroupCategoryId}
-		<!--<if test="groupType != null">
-			AND vgdcup.group_type_ = #{groupType}
-		</if>-->
+		WHERE vgdcup.vip_group_category_id_=#{vipGroupCategoryId}
+		<if test="organId != null">
+			AND vgdcup.organ_id_=#{organId}
+		</if>
+		<if test="tenantId != null">
+			AND vgdcup.tenant_id_=#{tenantId}
+		</if>
+		LIMIT 1
     </select>
 </mapper>

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ActivityUserMapperController.java

@@ -90,7 +90,7 @@ public class ActivityUserMapperController extends BaseController {
         }
 
         VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(applyBaseInfo.getVipGroupCategoryId(),
-                applyBaseInfo.getOrganId(), applyBaseInfo.getGroupType());
+                applyBaseInfo.getOrganId(), applyBaseInfo.getGroupType(),null);
         if(Objects.nonNull(vipGroupDefaultClassesUnitPrice)){
             applyBaseInfo.setOnlineClassesUnitPrice(vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice());
             applyBaseInfo.setOfflineClassesUnitPrice(vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherVipGroupController.java

@@ -207,7 +207,7 @@ public class TeacherVipGroupController extends BaseController {
 		}
 
 		VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(vipGroupApplyDto.getVipGroupApplyBaseInfo().getVipGroupCategoryId(),
-				vipGroupApplyDto.getVipGroupApplyBaseInfo().getOrganId(), vipGroupApplyDto.getVipGroupApplyBaseInfo().getGroupType());
+				vipGroupApplyDto.getVipGroupApplyBaseInfo().getOrganId(), vipGroupApplyDto.getVipGroupApplyBaseInfo().getGroupType(),null);
 		if(Objects.nonNull(vipGroupDefaultClassesUnitPrice)){
 			vipGroupApplyDto.getVipGroupApplyBaseInfo().setOnlineClassesUnitPrice(vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice());
 			vipGroupApplyDto.getVipGroupApplyBaseInfo().setOfflineClassesUnitPrice(vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());

mec-web/src/main/java/com/ym/mec/web/controller/education/EduActivityUserMapperController.java

@@ -88,7 +88,7 @@ public class EduActivityUserMapperController extends BaseController {
         }
 
         VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(applyBaseInfo.getVipGroupCategoryId(),
-                applyBaseInfo.getOrganId(), applyBaseInfo.getGroupType());
+                applyBaseInfo.getOrganId(), applyBaseInfo.getGroupType(),null);
         if(Objects.nonNull(vipGroupDefaultClassesUnitPrice)){
             applyBaseInfo.setOnlineClassesUnitPrice(vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice());
             applyBaseInfo.setOfflineClassesUnitPrice(vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());

mec-web/src/main/java/com/ym/mec/web/controller/education/EduVipGroupManageController.java

@@ -75,7 +75,7 @@ public class EduVipGroupManageController extends BaseController {
             }
 
             VipGroupDefaultClassesUnitPrice vipGroupDefaultClassesUnitPrice = vipGroupDefaultClassesUnitPriceDao.getByVipGroupCategory(vipGroupApplyBaseInfo.getVipGroupCategoryId(),
-                    vipGroupApplyBaseInfo.getOrganId(), vipGroupApplyBaseInfo.getGroupType());
+                    vipGroupApplyBaseInfo.getOrganId(), vipGroupApplyBaseInfo.getGroupType(),null);
             if(Objects.nonNull(vipGroupDefaultClassesUnitPrice)){
                 vipGroupApplyDto.getVipGroupApplyBaseInfo().setOnlineClassesUnitPrice(vipGroupDefaultClassesUnitPrice.getOnlineClassesUnitPrice());
                 vipGroupApplyDto.getVipGroupApplyBaseInfo().setOfflineClassesUnitPrice(vipGroupDefaultClassesUnitPrice.getOfflineClassesUnitPrice());