update:协议

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

@@ -22,6 +22,7 @@ import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
 import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
 import com.ym.mec.biz.dal.dto.StudentInfo;
 import com.ym.mec.biz.dal.entity.Goods;
+import com.ym.mec.biz.dal.entity.MusicGroup;
 import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender;
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
 import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
@@ -33,6 +34,7 @@ import com.ym.mec.biz.dal.entity.SysUserTsign;
 import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.service.ContractService;
 import com.ym.mec.biz.service.GoodsService;
+import com.ym.mec.biz.service.MusicGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectGoodsGroupService;
 import com.ym.mec.biz.service.MusicGroupSubjectPlanService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
@@ -92,6 +94,9 @@ public class ContractServiceImpl implements ContractService {
 
 	@Autowired
 	private GoodsService goodsService;
+	
+	@Autowired
+	private MusicGroupService musicGroupService;
 
 	@Value("${contract.baseDir:/var/pdf}")
 	private String contractBaseDir;
@@ -278,6 +283,13 @@ public class ContractServiceImpl implements ContractService {
 		}
 		
 		params.put("isShowVisualSeal", false);
+		
+		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+		if(musicGroup == null){
+			throw new BizException("乐团信息没找到");
+		}
+		
+		params.put("ownershipType", musicGroup.getOwnershipType().name());
 
 		templateEngine.render(params, "courses.ftl", srcFile);
 
@@ -361,6 +373,13 @@ public class ContractServiceImpl implements ContractService {
 		}
 		
 		params.put("isShowVisualSeal", true);
+		
+		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+		if(musicGroup == null){
+			throw new BizException("乐团信息没找到");
+		}
+		
+		params.put("ownershipType", musicGroup.getOwnershipType().name());
 
 		templateEngine.render(params, "courses.ftl", srcFile);
 
@@ -548,6 +567,13 @@ public class ContractServiceImpl implements ContractService {
 		params.put("depositFeeFmt", MoneyUtil.toChinese(musicGroupSubjectPlan.getDepositFee().toString()));
 		
 		params.put("isShowVisualSeal", false);
+		
+		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+		if(musicGroup == null){
+			throw new BizException("乐团信息没找到");
+		}
+		
+		params.put("ownershipType", musicGroup.getOwnershipType().name());
 
 		templateEngine.render(params, "goods.ftl", srcFile);
 
@@ -618,6 +644,13 @@ public class ContractServiceImpl implements ContractService {
 		params.put("depositFeeFmt", MoneyUtil.toChinese(musicGroupSubjectPlan.getDepositFee().toString()));
 		
 		params.put("isShowVisualSeal", true);
+		
+		MusicGroup musicGroup = musicGroupService.get(musicGroupId);
+		if(musicGroup == null){
+			throw new BizException("乐团信息没找到");
+		}
+		
+		params.put("ownershipType", musicGroup.getOwnershipType().name());
 
 		templateEngine.render(params, "goods.ftl", srcFile);
 

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

@@ -76,7 +76,11 @@
     <div class="container">
         <h1>课程服务协议</h1>
         <!-- 甲方：深圳大雅乐盟网络教育股份有限公司 <br/> -->
+        <#if ownershipType == 'OWN'>
        甲方：深圳大雅乐盟网络教育股份有限公司 <br/>
+       <#else>
+       甲方：武汉长乐长风乐器销售有限公司 <br/>
+       </#if>
         <div style="display: flex;">乙方：
             <div style="flex: 1 auto;">
                 <div class="iInfo">
@@ -157,16 +161,28 @@
         
         <div class="signature">
         	<#if isShowVisualSeal>
+        	<#if ownershipType == 'OWN'>
             <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司<img class="cachet" src="https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png" alt="" />
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
+            <#else>
+            <div class="sign">甲方签章：武汉长乐长风乐器销售有限公司<img class="cachet" src="https://daya-online.oss-cn-beijing.aliyuncs.com/website/clcf.png" alt="" />
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
+            </#if>
             <div class="sign">乙方签字：${studentInfo.parentsName!}
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>
         	<#else>
+        	<#if ownershipType == 'OWN'>
             <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
+            <#else>
+            <div class="sign">甲方签章：武汉长乐长风乐器销售有限公司
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
+            </#if>
             <div class="sign">乙方签字：
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>

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

@@ -75,7 +75,11 @@
 <body style="font-family:'SimSun'">
     <div class="container">
         <h1>《乐器借用协议》</h1>
+        <#if ownershipType == 'OWN'>
         甲方：深圳大雅乐盟网络教育股份有限公司 <br/>
+        <#else>
+        甲方：武汉长乐长风乐器销售有限公司 <br/>
+        </#if>        
         <div style="display: flex;">乙方：
             <div style="flex: 1 auto;">
                 <div class="iInfo">
@@ -136,16 +140,28 @@
         4、双方因履行本协议而相互发出或者提供的所有通知、文件、资料，均以本协议中所列明的电话、APP推送消息送达，乙方如果变更电话号码的，应当自变更后1日内通知甲方且获得甲方确认，甲方通过电话、APP方式无法联系乙方或者甲方认为必要时，甲方也可以通过特快专递至乙方住址的方式向乙方发出上述任何通知、文件、资料等，并在甲方寄出特快专递后第5日视为送达成功。
         <div class="signature">
         	<#if isShowVisualSeal>
+        	<#if ownershipType == 'OWN'>
             <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司<img class="cachet" src="https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png" alt="" />
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
+            <#else>
+            <div class="sign">甲方签章：武汉长乐长风乐器销售有限公司<img class="cachet" src="https://daya-online.oss-cn-beijing.aliyuncs.com/website/clcf.png" alt="" />
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
+            </#if>
             <div class="sign">乙方签字：${studentInfo.parentsName!}
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>
         	<#else>
+        	<#if ownershipType == 'OWN'>
             <div class="sign">甲方签章：深圳大雅乐盟网络教育股份有限公司
                 <span>日期：${.now?string("yyyy年MM月dd日")}</span>
             </div>
+            <#else>
+            <div class="sign">甲方签章：武汉长乐长风乐器销售有限公司
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
+            </#if>
             <div class="sign">乙方签字：
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>