|
|
@@ -1025,7 +1025,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
|
|
|
params.put("isShowVisualSeal", false);
|
|
|
|
|
|
- CourseViewTypeEnum ownershipType = CourseViewTypeEnum.COURSE_lIST;
|
|
|
+ CourseViewTypeEnum ownershipType = CourseViewTypeEnum.COURSE_FEE;
|
|
|
|
|
|
if (StringUtils.isBlank(musicGroupId)) {
|
|
|
params.put("ownershipType", "OWN");
|
|
|
@@ -1123,8 +1123,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
params.put("isShowVisualSeal", true);
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
- result.put("courseViewType", CourseViewTypeEnum.COURSE_lIST);
|
|
|
- CourseViewTypeEnum ownershipType = CourseViewTypeEnum.COURSE_lIST;
|
|
|
+ result.put("courseViewType", CourseViewTypeEnum.COURSE_FEE);
|
|
|
+ CourseViewTypeEnum ownershipType = CourseViewTypeEnum.COURSE_FEE;
|
|
|
|
|
|
if (StringUtils.isBlank(musicGroupId)) {
|
|
|
params.put("ownershipType", "OWN");
|
|
|
@@ -1212,7 +1212,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
|
|
|
params.put("isShowVisualSeal", false);
|
|
|
|
|
|
- CourseViewTypeEnum courseViewType = CourseViewTypeEnum.COURSE_lIST;
|
|
|
+ CourseViewTypeEnum courseViewType = CourseViewTypeEnum.COURSE_FEE;
|
|
|
params.put("ownershipType", "OWN");
|
|
|
|
|
|
List<SysUserContracts> userContracts = sysUserContractsService.getUserContractWithType(userId, ContractType.PRODUCT, 2);
|
|
|
@@ -1337,19 +1337,11 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
eSealPlugin.userSign(executor.getSysUserTsign().getAccountId(), executor.getSysUserTsign().getSealData(), srcPdfPath, srcPdfPath);
|
|
|
}
|
|
|
|
|
|
- // 上传到oss
|
|
|
+ //上传到oss
|
|
|
String dateStrOss = dateFormatOss.format(date);
|
|
|
dateStrOss = "oa/" + dateStrOss + "/" + DateUtil.getHour(date);
|
|
|
String pdfFilePath = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, dateStrOss, srcFile);
|
|
|
|
|
|
-// SysUserContracts sysUserContracts = new SysUserContracts();
|
|
|
-// sysUserContracts.setCreateTime(date);
|
|
|
-// sysUserContracts.setType(ContractType.PRODUCT);
|
|
|
-// sysUserContracts.setUrl(pdfFilePath);
|
|
|
-// sysUserContracts.setUserId(userId);
|
|
|
-// sysUserContracts.setVersion(2);
|
|
|
-//
|
|
|
-// sysUserContractsService.insert(sysUserContracts);
|
|
|
|
|
|
FileUtils.deleteQuietly(srcFile);
|
|
|
|
river