Merge remote-tracking branch 'origin/master'

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

@@ -11,7 +11,7 @@ public class SysUserContracts {
 
 	public enum ContractType implements BaseEnum<String, ContractType> {
 
-		REGISTER("注册"), INSTRUMENT("乐器借用"), COURSES("课程购买"), PRACTICE("网管课购买");
+		REGISTER("注册"), INSTRUMENT("乐器借用"), COURSES("课程购买"), VIP_COURSES("VIP课程购买"), PRACTICE("网管课购买");
 
 		private String desc;
 

mec-biz/src/main/java/com/ym/mec/biz/service/VipGroupService.java

@@ -392,4 +392,9 @@ public interface VipGroupService extends BaseService<Long, VipGroup> {
      */
     List<TeacherBasicDto> findTeacherWithVipGroupOrganAndSubject(Long vipGroupId);
 
+    /**
+     * 更新线上课老师的课酬
+     * @return
+     */
+    boolean updateHistoryTeacherSalaryOfOnline();
 }

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

@@ -382,7 +382,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		SysUserContracts sysUserContracts = new SysUserContracts();
 		sysUserContracts.setCreateTime(date);
-		sysUserContracts.setType(ContractType.REGISTER);
+		sysUserContracts.setType(ContractType.COURSES);
 		sysUserContracts.setUrl(pdfFilePath);
 		sysUserContracts.setUserId(userId);
 
@@ -483,7 +483,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		Date date = new Date();
 
 		// 合成freemarker
-		String srcPdfPath = contractBaseDir + "/courses/" + dateFormat1.format(date) + "/" + userId + ".pdf";
+		String srcPdfPath = contractBaseDir + "/vipCourses/" + dateFormat1.format(date) + "/" + userId + ".pdf";
 
 		File srcFile = new File(srcPdfPath);
 
@@ -545,7 +545,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		SysUserContracts sysUserContracts = new SysUserContracts();
 		sysUserContracts.setCreateTime(date);
-		sysUserContracts.setType(ContractType.REGISTER);
+		sysUserContracts.setType(ContractType.VIP_COURSES);
 		sysUserContracts.setUrl(pdfFilePath);
 		sysUserContracts.setUserId(userId);
 
@@ -622,7 +622,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		Date date = new Date();
 
 		// 合成freemarker
-		String srcPdfPath = contractBaseDir + "/courses/" + dateFormat1.format(date) + "/" + userId + ".pdf";
+		String srcPdfPath = contractBaseDir + "/goods/" + dateFormat1.format(date) + "/" + userId + ".pdf";
 
 		File srcFile = new File(srcPdfPath);
 
@@ -712,7 +712,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		SysUserContracts sysUserContracts = new SysUserContracts();
 		sysUserContracts.setCreateTime(date);
-		sysUserContracts.setType(ContractType.REGISTER);
+		sysUserContracts.setType(ContractType.INSTRUMENT);
 		sysUserContracts.setUrl(pdfFilePath);
 		sysUserContracts.setUserId(userId);
 
@@ -876,7 +876,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		} catch (IOException e) {
 			throw new BizException("生成pdf协议失败", e);
 		}
-		String organCode = "91440300326364429H";
+		/*String organCode = "91440300326364429H";
 		SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
 		if (organTsign == null) {
 			throw new BizException("甲方未创建签章");
@@ -886,7 +886,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		if (sysUserTsign != null) {
 			eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
-		}
+		}*/
 
 		// 上传到oss
 		String dateStrOss = dateFormatOss.format(date);

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

@@ -2726,4 +2726,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
 		return teacherByOrganAndSubject;
 	}
+
+	@Override
+	public boolean updateHistoryTeacherSalaryOfOnline() {
+		//查询所有含有线上课的课程组，线上课节数，实付金额
+		
+		return false;
+	}
 }