update

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

@@ -914,6 +914,24 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
         if (!CollectionUtils.isEmpty(userContracts)) {
             return;
         }
+        
+		TenantInfo tenantInfo = tenantInfoService.get(studentInfo.getTenantId());
+		if(tenantInfo == null){
+			throw new BizException("机构信息不存在");
+		}
+		
+		params.put("compayName", tenantInfo.getName());
+		params.put("sealPicture", "");
+        
+		if (studentInfo.getTenantId() == 1) {
+			if (OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
+				params.put("compayName", "深圳大雅乐盟网络教育股份有限公司");
+				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png");
+			} else {
+				params.put("compayName", "武汉长乐长风乐器销售有限公司");
+				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/clcf.png");
+			}
+		}
 
         templateEngine.render(params, "product" + ownershipType.getContractVersion() + ".ftl", srcFile);
 
@@ -935,10 +953,6 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 				organCode = "91420106333619290A";
 			}
 		} else {
-			TenantInfo tenantInfo = tenantInfoService.get(user.getTenantId());
-			if(tenantInfo == null){
-				throw new BizException("机构信息不存在");
-			}
 			organCode = tenantInfo.getTsignCode();
 		}
         SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
@@ -1000,7 +1014,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
         Map<String, Object> result = new HashMap<>();
         result.put("courseViewType", CourseViewTypeEnum.COURSE_FEE);
         CourseViewTypeEnum ownershipType = CourseViewTypeEnum.COURSE_FEE;
-
+		
         if (StringUtils.isBlank(musicGroupId)) {
             params.put("ownershipType", "OWN");
             MusicGroup userLastNormalMusicGroup = studentRegistrationDao.getUserLastNormalMusicGroup(userId);
@@ -1021,6 +1035,24 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
         if (Objects.nonNull(courseViewType)) {
             ownershipType = courseViewType;
         }
+        
+		TenantInfo tenantInfo = tenantInfoService.get(studentInfo.getTenantId());
+		if(tenantInfo == null){
+			throw new BizException("机构信息不存在");
+		}
+		
+		params.put("compayName", tenantInfo.getName());
+		params.put("sealPicture", "");
+        
+		if (studentInfo.getTenantId() == 1) {
+			if (OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
+				params.put("compayName", "深圳大雅乐盟网络教育股份有限公司");
+				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png");
+			} else {
+				params.put("compayName", "武汉长乐长风乐器销售有限公司");
+				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/clcf.png");
+			}
+		}
 
         templateEngine.render(params, "product" + ownershipType.getContractVersion() + ".ftl", srcFile);
 
@@ -1092,6 +1124,24 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
 
         CourseViewTypeEnum courseViewType = CourseViewTypeEnum.COURSE_FEE;
         params.put("ownershipType", "OWN");
+        
+		TenantInfo tenantInfo = tenantInfoService.get(studentInfo.getTenantId());
+		if(tenantInfo == null){
+			throw new BizException("机构信息不存在");
+		}
+		
+		params.put("compayName", tenantInfo.getName());
+		params.put("sealPicture", "");
+        
+		if (studentInfo.getTenantId() == 1) {
+			if (OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
+				params.put("compayName", "深圳大雅乐盟网络教育股份有限公司");
+				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/cachet.png");
+			} else {
+				params.put("compayName", "武汉长乐长风乐器销售有限公司");
+				params.put("sealPicture", "https://daya-online.oss-cn-beijing.aliyuncs.com/website/clcf.png");
+			}
+		}
 
         List<SysUserContracts> userContracts = sysUserContractsService.getUserContractWithType(userId, ContractType.PRODUCT, 2);
         if (!CollectionUtils.isEmpty(userContracts)) {
@@ -1108,7 +1158,17 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
             return BaseController.failed("生成产品协议失败");
         }
 
-        String organCode = "91440300326364429H";
+        String organCode = "";
+        
+		if (user.getTenantId() == 1) {
+			if (OwnershipType.OWN.name().equals(params.get("ownershipType"))) {
+				organCode = "91440300326364429H";
+			} else {
+				organCode = "91420106333619290A";
+			}
+		} else {
+			organCode = tenantInfo.getTsignCode();
+		}
 
         SysUserTsign organTsign = sysUserTsignService.queryByCardNo(organCode);
         if (organTsign == null) {

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

@@ -295,28 +295,35 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
                 StudentPaymentOrder st = (StudentPaymentOrder) clazz;
                 merNos = st.getMerNos();
                 amount = amountTo.apply(st.getActualAmount());
-            } else if (clazz instanceof TenantOrderRecord) {
+
+                // 实时分账
+    			if (amount.doubleValue() > 0) {
+    				List<Map<String, Object>> divMemberList = new ArrayList<>();
+    				Map<String, Object> divMember = new HashMap<>();
+    				divMember.put("member_id", merNos);
+    				divMember.put("amount", amount);
+    				divMember.put("fee_flag", "Y");
+    				divMemberList.add(divMember);
+
+    				Map<String, Object> divMember1 = new HashMap<>();
+    				divMember1.put("member_id", merNos);
+    				divMember1.put("amount", payParam.getAmount().subtract(amount));
+    				divMember1.put("fee_flag", "N");
+    				divMemberList.add(divMember1);
+    				
+    				paymentParams.put("div_members", JsonUtil.toJSONString(divMemberList));
+    			}
+            } else if (clazz instanceof TenantOrderRecord) {//向平台支付，不分账
                 TenantOrderRecord tor = (TenantOrderRecord) clazz;
                 merNos = tor.getMerNos();
                 amount = amountTo.apply(tor.getActualAmount());
-            } else if (clazz instanceof TenantPaymentOrder) {
+            } /*else if (clazz instanceof TenantPaymentOrder) {
                 TenantPaymentOrder tpo = (TenantPaymentOrder) clazz;
                 merNos = tpo.getMerNos();
                 amount = amountTo.apply(tpo.getActualAmount());
-            } else {
+            } */else {
                 throw new BizException("订单[{}]找不到", payParam.getOrderNo());
             }
-
-            // 实时分账
-			if (amount.doubleValue() > 0) {
-				List<Map<String, Object>> divMemberList = new ArrayList<>();
-				Map<String, Object> divMember = new HashMap<>();
-				divMember.put("member_id", merNos);
-				divMember.put("amount", amount);
-				divMember.put("fee_flag", "Y");
-				divMemberList.add(divMember);
-				paymentParams.put("div_members", JsonUtil.toJSONString(divMemberList));
-			}
         }
 
         //手续费收取模式：O-商户手续费账户扣取手续费，I-交易金额中扣取手续费；值为空时，默认值为I；若为O时，分账对象列表中不支持传入手续费承担方

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

@@ -87,13 +87,13 @@
 <body style="font-family:'SimSun'">
 <div class="container">
     <h1>《产品与服务协议》</h1>
-    <!-- 甲方：深圳大雅乐盟网络教育股份有限公司 <br/> -->
-    <#if ownershipType == 'OWN'>
+        甲方：${compayName}<br/>
+    <!-- <#if ownershipType == 'OWN'>
         甲方：深圳大雅乐盟网络教育股份有限公司
     <#else>
         甲方：武汉长乐长风乐器销售有限公司
     </#if>
-    <br/>
+    <br/> -->
     <div style="display: flex;">乙方：
         <div style="flex: 1 auto;">
             <div class="iInfo">
@@ -181,28 +181,16 @@
 
     <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">甲方签章：${compayName}<img class="cachet" src="${sealPicture!}" alt="" />
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
             <div class="sign">乙方签章：${studentInfo.realName!}
                 <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">甲方签章：${compayName}
+                <span>日期：${.now?string("yyyy年MM月dd日")}</span>
+            </div>
             <div class="sign">乙方签章：
                 <span>日期：${.now?string("yyyy年MM月dd日")} </span>
             </div>

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

@@ -83,13 +83,13 @@
 <body style="font-family:'SimSun'">
     <div class="container">
         <h1>《产品与服务协议》</h1>
-        <!-- 甲方：深圳大雅乐盟网络教育股份有限公司 <br/> -->
-        <#if ownershipType == 'OWN'>
+                            甲方：${compayName} <br/>
+        <!-- <#if ownershipType == 'OWN'>
 		甲方：深圳大雅乐盟网络教育股份有限公司
 		<#else>
 		甲方：武汉长乐长风乐器销售有限公司
 		</#if>
-		<br/>
+		<br/> -->
         <div style="display: flex;">乙方：
             <div style="flex: 1 auto;">
                 <div class="iInfo">
@@ -177,28 +177,16 @@
 
         <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="" />
+            <div class="sign">甲方签章：${compayName}<img class="cachet" src="${sealPicture!}" 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.realName!}
                 <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">甲方签章：武汉长乐长风乐器销售有限公司
+            <div class="sign">甲方签章：${compayName}
                 <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/product4.ftl

@@ -83,13 +83,13 @@
 <body style="font-family:'SimSun'">
     <div class="container">
         <h1>《产品与服务协议》</h1>
-        <!-- 甲方：深圳大雅乐盟网络教育股份有限公司 <br/> -->
-        <#if ownershipType == 'OWN'>
+                            甲方：${compayName} <br/>
+        <!-- <#if ownershipType == 'OWN'>
 		甲方：深圳大雅乐盟网络教育股份有限公司
 		<#else>
 		甲方：武汉长乐长风乐器销售有限公司
 		</#if>
-		<br/>
+		<br/> -->
         <div style="display: flex;">乙方：
             <div style="flex: 1 auto;">
                 <div class="iInfo">
@@ -179,28 +179,16 @@
 
         <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="" />
+            <div class="sign">甲方签章：${compayName}<img class="cachet" src="${sealPicture!}" 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.realName!}
                 <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">甲方签章：武汉长乐长风乐器销售有限公司
+            <div class="sign">甲方签章：${compayName}
                 <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/mybatis/IndexErrDataRecordMapper.xml

@@ -306,7 +306,7 @@
 	</select>
 
 	<select id="getWithOrganMonthUserStr" resultMap="IndexErrDataRecord">
-		SELECT * FROM index_err_data_record WHERE tenant_id_ = #{tenantId} and CONCAT(generate_time_, organ_id_, deal_user_id_) IN
+		SELECT * FROM index_err_data_record WHERE CONCAT(generate_time_, organ_id_, deal_user_id_) IN
 		<foreach collection="omuStrings" item="omuString" open="(" close=")" separator=",">
 			#{omuString}
 		</foreach>

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

@@ -73,6 +73,7 @@
         <result column="organ_id_" property="organId"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
+        <result column="tenant_id_" property="tenantId"/>
         <result column="lock_flag_" property="lockFlag"/>
         <result column="del_flag_" property="delFlag" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="wx_openid_" property="wxOpenid"/>