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

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

@@ -8,6 +8,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 import org.apache.commons.io.FileUtils;
@@ -23,6 +24,7 @@ import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDetailDao;
 import com.ym.mec.biz.dal.dto.StudentInfo;
+import com.ym.mec.biz.dal.entity.CooperationOrgan.OwnershipType;
 import com.ym.mec.biz.dal.entity.Goods;
 import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
@@ -52,6 +54,7 @@ import com.ym.mec.biz.service.VipGroupService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.eseal.ESealPlugin;
 import com.ym.mec.thirdparty.storage.StoragePlugin;
+import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.freemarker.FreemarkerTemplateEngine;
 import com.ym.mec.util.money.MoneyUtil;
 import com.ym.mec.util.pdf.PDFUtil;
@@ -108,33 +111,42 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 	private String contractBaseDir;
 
 	private DateFormat dateFormatOss = new SimpleDateFormat("yyyy/MM/dd");
+	
+	private DateFormat dateFormat1 = new SimpleDateFormat("yyMMddHHmmSS");
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
 		// 注册企业账户
-		String orgName = "武汉长乐长风乐器销售有限公司";
-		String organCode = "91420106333619290A";
+		Map<String, String> organList = new HashMap<String, String>();
+		organList.put("91420106333619290A", "武汉长乐长风乐器销售有限公司");
+		organList.put("91440300326364429H", "深圳大雅乐盟网络教育股份有限公司");
 
-		SysUserTsign sysUserTsign = sysUserTsignService.queryByCardNo(organCode);
+		for (Entry<String, String> organ : organList.entrySet()) {
 
-		if (sysUserTsign == null) {
+			String organCode = organ.getKey();
+			String orgName = organ.getValue();
 
-			String accountId = eSealPlugin.createOrganAccount(orgName, organCode);
+			SysUserTsign sysUserTsign = sysUserTsignService.queryByCardNo(organCode);
 
-			if (StringUtils.isBlank(accountId)) {
-				throw new BizException("创建企业电子存证账户失败");
-			}
+			if (sysUserTsign == null) {
 
-			String sealData = eSealPlugin.createOrganSeal(accountId, "", "");
+				String accountId = eSealPlugin.createOrganAccount(orgName, organCode);
 
-			if (StringUtils.isBlank(sealData)) {
-				throw new BizException("创建电子存证印章失败");
-			}
+				if (StringUtils.isBlank(accountId)) {
+					throw new BizException("创建企业电子存证账户失败");
+				}
 
-			sysUserTsign = new SysUserTsign(-1, accountId, sealData, orgName, organCode);
+				String sealData = eSealPlugin.createOrganSeal(accountId, "", "");
 
-			sysUserTsignService.insert(sysUserTsign);
+				if (StringUtils.isBlank(sealData)) {
+					throw new BizException("创建电子存证印章失败");
+				}
+
+				sysUserTsign = new SysUserTsign(-1, accountId, sealData, orgName, organCode);
+
+				sysUserTsignService.insert(sysUserTsign);
 
+			}
 		}
 	}
 
@@ -209,6 +221,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		Date date = new Date();
 		// 上传到oss
 		String dateStrOss = dateFormatOss.format(date);
+		dateStrOss = dateStrOss + "/" + DateUtil.getHour(date);
 		String pdfFilePath = storagePlugin.uploadFile(dateStrOss, srcFile);
 
 		SysUserContracts sysUserContracts = new SysUserContracts();
@@ -266,9 +279,10 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			}
 			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
+		Date date = new Date();
 
 		// 合成freemarker
-		String srcPdfPath = contractBaseDir + "/courses/" + userId + ".pdf";
+		String srcPdfPath = contractBaseDir + "/courses/" + dateFormat1.format(date) + "/" + userId + ".pdf";
 
 		File srcFile = new File(srcPdfPath);
 
@@ -330,16 +344,27 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		// 生成借款协议PDF
 		try {
 			PDFUtil.renderToPDFByData(ContractServiceImpl.class.getResource("/").getFile(), FileUtils.readFileToString(srcFile), srcPdfPath,
-					"config/fonts/simsun.ttc");
+					"config/fonts/simsun.ttf");
 		} catch (IOException e) {
 			throw new BizException("生成pdf协议失败", e);
 		}
-
+		String organCode = "";
+		if(musicGroup.getOwnershipType() == OwnershipType.OWN){
+			organCode = "91440300326364429H";
+		}else{
+			organCode = "91420106333619290A";
+		}
+		SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
+		if(organTsign == null){
+			throw new BizException("甲方未创建签章");
+		}
+		
+		eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
 		eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
 
-		Date date = new Date();
 		// 上传到oss
 		String dateStrOss = dateFormatOss.format(date);
+		dateStrOss = dateStrOss + "/" + DateUtil.getHour(date);
 		String pdfFilePath = storagePlugin.uploadFile(dateStrOss, srcFile);
 
 		SysUserContracts sysUserContracts = new SysUserContracts();
@@ -441,9 +466,10 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			}
 			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
+		Date date = new Date();
 
 		// 合成freemarker
-		String srcPdfPath = contractBaseDir + "/courses/" + userId + ".pdf";
+		String srcPdfPath = contractBaseDir + "/courses/" + dateFormat1.format(date) + "/" + userId + ".pdf";
 
 		File srcFile = new File(srcPdfPath);
 
@@ -487,12 +513,19 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		} catch (IOException e) {
 			throw new BizException("生成pdf协议失败", e);
 		}
+		String organCode = "91440300326364429H";
+		SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
+		if(organTsign == null){
+			throw new BizException("甲方未创建签章");
+		}
+		
+		eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
 
 		eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
 
-		Date date = new Date();
 		// 上传到oss
 		String dateStrOss = dateFormatOss.format(date);
+		dateStrOss = dateStrOss + "/" + DateUtil.getHour(date);
 		String pdfFilePath = storagePlugin.uploadFile(dateStrOss, srcFile);
 
 		SysUserContracts sysUserContracts = new SysUserContracts();
@@ -570,9 +603,10 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 			}
 			sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
 		}
+		Date date = new Date();
 
 		// 合成freemarker
-		String srcPdfPath = contractBaseDir + "/goods/" + userId + ".pdf";
+		String srcPdfPath = contractBaseDir + "/courses/" + dateFormat1.format(date) + "/" + userId + ".pdf";
 
 		File srcFile = new File(srcPdfPath);
 
@@ -639,12 +673,24 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 		} catch (IOException e) {
 			throw new BizException("生成pdf协议失败", e);
 		}
+		String organCode = "";
+		if(musicGroup.getOwnershipType() == OwnershipType.OWN){
+			organCode = "91440300326364429H";
+		}else{
+			organCode = "91420106333619290A";
+		}
+		SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
+		if(organTsign == null){
+			throw new BizException("甲方未创建签章");
+		}
+		
+		eSealPlugin.organSign(organTsign.getSealData(), srcPdfPath, srcPdfPath);
 
 		eSealPlugin.userSign(sysUserTsign.getAccountId(), sysUserTsign.getSealData(), srcPdfPath, srcPdfPath);
 
-		Date date = new Date();
 		// 上传到oss
 		String dateStrOss = dateFormatOss.format(date);
+		dateStrOss = dateStrOss + "/" + DateUtil.getHour(date);
 		String pdfFilePath = storagePlugin.uploadFile(dateStrOss, srcFile);
 
 		SysUserContracts sysUserContracts = new SysUserContracts();
@@ -693,7 +739,8 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
 		double depositFee = 0d;
 		if (kitGroupPurchaseTypeEnum == KitGroupPurchaseTypeEnum.LEASE) {
-			StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findMusicGroupApplyOrderByStatus(userId, musicGroupId, DealStatusEnum.WAIT_PAY);
+			StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService
+					.findMusicGroupApplyOrderByStatus(userId, musicGroupId, DealStatusEnum.WAIT_PAY);
 
 			if (studentPaymentOrder == null) {
 				MusicGroupSubjectPlan musicGroupSubjectPlan = musicGroupSubjectPlanService.findSubjectPlan(musicGroupId, subjectId);

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

@@ -786,14 +786,14 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
                     studentRegistration.getParentsName(), studentPaymentOrder.getActualAmount());
 
 //            //生成课程协议
-//            contractService.transferMusicGroupCoursesContract(studentRegistration.getUserId(),studentRegistration.getMusicGroupId());
-//            //商品协议(租赁时候有)
-//            if(musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)){
-//                StudentPaymentOrderDetail applyOrderMusical = studentPaymentOrderDetailService.findApplyOrderMusical(studentPaymentOrder.getId());
-//                if(applyOrderMusical != null && applyOrderMusical.getGoodsIdList() != null && !applyOrderMusical.getGoodsIdList().equals("")){
-//                    contractService.transferGoodsContract(studentPaymentOrder.getUserId(),studentPaymentOrder.getMusicGroupId(),applyOrderMusical.getGoodsIdList(),musicOneSubjectClassPlan.getKitGroupPurchaseType());
-//                }
-//            }
+            contractService.transferMusicGroupCoursesContract(studentRegistration.getUserId(),studentRegistration.getMusicGroupId());
+            //商品协议(租赁时候有)
+            if(musicOneSubjectClassPlan.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)){
+                StudentPaymentOrderDetail applyOrderMusical = studentPaymentOrderDetailService.findApplyOrderMusical(studentPaymentOrder.getId());
+                if(applyOrderMusical != null && applyOrderMusical.getGoodsIdList() != null && !applyOrderMusical.getGoodsIdList().equals("")){
+                    contractService.transferGoodsContract(studentPaymentOrder.getUserId(),studentPaymentOrder.getMusicGroupId(),applyOrderMusical.getGoodsIdList(),musicOneSubjectClassPlan.getKitGroupPurchaseType());
+                }
+            }
         }
 
 

mec-biz/src/main/resources/config/contracts/courses.ftl

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" style="font-size: 100px;">
+<html lang="en">
 <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -11,55 +11,55 @@
     <style>
         body { margin: 0; }
         header {
-            height: .40rem;
-            line-height: .40rem;
+            height: 40px;
+            line-height: .40px;
             color: #000;
-            font-size: .17rem;
+            font-size: 17px;
             background: #fff;
             box-shadow: 0px 1px 8px 0px rgba(0, 0, 0, 0.07);
             text-align: center;
         }
         header .back {
-            width: .2rem;
-            height: .2rem;
+            width: 20px;
+            height: 20px;
             position: absolute;
-            left: .12rem;
-            top: .1rem;
+            left: 12px;
+            top: 10px;
         }
         .container {
-            padding: .22rem .2rem .3rem;
-            font-size: .14rem;
+            padding: 22px 20px 3px;
+            font-size: 14px;
         }
         h1 {
-            font-size: .16rem;
+            font-size: 16px;
             text-align: center;
         }
         h2 {
-            font-size: .16rem;
+            font-size: 16px;
             font-weight: bold;
-            padding-top: .15rem;
+            padding-top: 15px;
         }
         h3 {
-            font-size: .14rem;
+            font-size: 14px;
             font-weight: bold;
         }
         .signature {
-            display: flex;
-            padding-top: .5rem;
+            padding-top: 50px;
         }
         .signature .sign {
-            flex: 1;
             position: relative;
+            width: 49%;
+            display: inline-block;
         }
         .signature span {
             display: block;
         }
         .signature .cachet {
             position: absolute;
-            top: -.6rem;
+            top: -60px;
             left: 0;
-            width: 1.5rem;
-            height: 1.5rem;
+            width: 150px;
+            height: 150px;
         }
         .iInfo {
             display: flex;
@@ -189,7 +189,7 @@
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
             </#if>
-            <div class="sign">乙方签字：
+            <div class="sign">乙方签章：
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>
         	</#if>

mec-biz/src/main/resources/config/contracts/goods.ftl

@@ -1,5 +1,5 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" style="font-size: 100px;">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head>
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -11,55 +11,55 @@
     <style>
         body { margin: 0; }
         header {
-            height: .40rem;
-            line-height: .40rem;
+            height: 40px;
+            line-height: .40px;
             color: #000;
-            font-size: .17rem;
+            font-size: 17px;
             background: #fff;
             box-shadow: 0px 1px 8px 0px rgba(0, 0, 0, 0.07);
             text-align: center;
         }
         header .back {
-            width: .2rem;
-            height: .2rem;
+            width: 20px;
+            height: 20px;
             position: absolute;
-            left: .12rem;
-            top: .1rem;
+            left: 12px;
+            top: 10px;
         }
         .container {
-            padding: .22rem .2rem .3rem;
-            font-size: .14rem;
+            padding: 22px 20px 3px;
+            font-size: 14px;
         }
         h1 {
-            font-size: .16rem;
+            font-size: 16px;
             text-align: center;
         }
         h2 {
-            font-size: .16rem;
+            font-size: 16px;
             font-weight: bold;
-            padding-top: .15rem;
+            padding-top: 15px;
         }
         h3 {
-            font-size: .14rem;
+            font-size: 14px;
             font-weight: bold;
         }
         .signature {
-            display: flex;
-            padding-top: .5rem;
+            padding-top: 50px;
         }
         .signature .sign {
-            flex: 1;
             position: relative;
+            width: 49%;
+            display: inline-block;
         }
         .signature span {
             display: block;
         }
         .signature .cachet {
             position: absolute;
-            top: -.6rem;
+            top: -60px;
             left: 0;
-            width: 1.5rem;
-            height: 1.5rem;
+            width: 150px;
+            height: 150px;
         }
         .iInfo {
             display: flex;
@@ -168,7 +168,7 @@
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
             </#if>
-            <div class="sign">乙方签字：
+            <div class="sign">乙方签章：
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>
             </#if>

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/eseal/provider/TsignPlugin.java

@@ -228,7 +228,7 @@ public class TsignPlugin implements ESealPlugin, InitializingBean, DisposableBea
 		posBean.setPosPage("1");
 		posBean.setPosType(1);
 		posBean.setWidth(80);
-		posBean.setKey("乙方签字");
+		posBean.setKey("乙方签章");
 		posBean.setPosX(100);
 		posBean.setPosY(0);
 

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/message/provider/JiguangPushPlugin.java

@@ -22,13 +22,13 @@ import com.ym.mec.util.http.HttpUtil;
 public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean {
 
 	@Value("${push.jiguang.appKey:0e7422e1d6e73637e678716a}")
-	private String appKey = "0e7422e1d6e73637e678716a";
+	private String appKey = "7e0282ca92c12c8c45a93bb3";
 
 	@Value("${push.jiguang.masterSecret:c2361016604eab56ab2db2ac}")
-	private String masterSecret = "c2361016604eab56ab2db2ac";
+	private String masterSecret = "d47430e2f4755ef5dc050ac5";
 
 	@Value("${push.jiguang.apns_production:false}")
-	private boolean apns_production = false; // 推送环境 True 表示推送生产环境，False 表示要推送开发环境
+	private boolean apns_production = true; // 推送环境 True 表示推送生产环境，False 表示要推送开发环境
 
 	@Value("${push.jiguang.time_to_live:86400}")
 	private int time_to_live = 86400; // 离线保留时长 秒为单位 默认1天 最大10天
@@ -197,8 +197,13 @@ public class JiguangPushPlugin implements MessageSenderPlugin, InitializingBean
 	}
 
 	public static void main(String[] args) throws IOException {
+		
+		String str = "1048953,1048955,1048958,1048959,1048960,1048961,1048965,1048967,1048970,1048974,1048977,1048981,1048983,1048990,1048993,1048996,1048998,1048999,1049000,1049003,1049005,1049006,1049008,1049009,1049013,1049019,1049024,1049034,1049036,1049038,1049039,1049040,1049042,1049043,1049045,1049048,1049049,1049051,1049053,1049057,1049062,1049066,1049076,1049077,1049079,1049090,1049117,1049118,1049122,1049123,1049149,1049251,1049363,1049368,1049524,1055861,1055862,1055863,1055865,1056784,1084443,1094555,1094575";
+		
+		
 		JiguangPushPlugin plugin = new JiguangPushPlugin();
-		plugin.send("测试标题", "测试内容", "1093192", "");
+		
+		plugin.batchSend("基础技能训练报名通知", "家长您好：经五路小学比赛团乐团基础技能训练已经开始缴费。请您在收到本通知后，点击http://mstuonline.dayaedu.com/#/smallRegister?musicGroupId=19121912014300001 进行缴费，若有疑问请咨询800-8208820", str.split(","), "5?http://mstudev.dayaedu.com/#/smallRegister?musicGroupId=19121912014300001");
 	}
 
 }

pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.ym</groupId>
@@ -257,6 +258,18 @@
 			<resource>
 				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
+				<excludes>
+					<exclude>**/*.ttf</exclude>
+					<exclude>**/*.woff</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>**/*.ttf</include>
+					<include>**/*.woff</include>
+				</includes>
 			</resource>
 		</resources>
 		<pluginManagement>
@@ -298,12 +311,14 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
 				<configuration>
-          <encoding>UTF-8</encoding>
+					<encoding>UTF-8</encoding>
 					<!-- 过滤后缀为pem、pfx的证书文件 -->
 					<nonFilteredFileExtensions>
 						<nonFilteredFileExtension>cer</nonFilteredFileExtension>
 						<nonFilteredFileExtension>pem</nonFilteredFileExtension>
 						<nonFilteredFileExtension>pfx</nonFilteredFileExtension>
+						<nonFilteredFileExtension>ttc</nonFilteredFileExtension>
+						<nonFilteredFileExtension>ttf</nonFilteredFileExtension>
 					</nonFilteredFileExtensions>
 				</configuration>
 			</plugin>
@@ -331,6 +346,6 @@
 		<module>mec-teacher</module>
 		<module>mec-education</module>
 		<module>mec-biz</module>
-	  <module>data_migration</module>
-  </modules>
+		<module>data_migration</module>
+	</modules>
 </project>