Merge branch 'zx_saas_0208_contracts' of http://git.dayaedu.com/yonge/mec into dev

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

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

@@ -1,84 +1,22 @@
 package com.ym.mec.biz.service.impl;
 
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
 import com.microsvc.toolkit.middleware.oss.OssPluginContext;
 import com.microsvc.toolkit.middleware.oss.impl.TencentOssPlugin;
-import com.ym.mec.common.dto.RealnameAuthenticationDto;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
-
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.CertificateTypeEnum;
-import com.ym.mec.biz.dal.dao.EmployeeDao;
-import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDao;
-import com.ym.mec.biz.dal.dao.MusicGroupStudentFeeDao;
-import com.ym.mec.biz.dal.dao.StudentDao;
-import com.ym.mec.biz.dal.dao.StudentRegistrationDao;
-import com.ym.mec.biz.dal.dao.SysUserContractsDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.CirculationUser;
 import com.ym.mec.biz.dal.dto.OAFinancialDto;
 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;
-import com.ym.mec.biz.dal.entity.MusicGroupStudentFee;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectGoodsGroup;
-import com.ym.mec.biz.dal.entity.MusicGroupSubjectPlan;
-import com.ym.mec.biz.dal.entity.Organization;
-import com.ym.mec.biz.dal.entity.StudentRegistration;
-import com.ym.mec.biz.dal.entity.Subject;
-import com.ym.mec.biz.dal.entity.SysUserContracts;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.entity.SysUserContracts.ContractType;
-import com.ym.mec.biz.dal.entity.SysUserTsign;
-import com.ym.mec.biz.dal.entity.TenantConfig;
-import com.ym.mec.biz.dal.entity.TenantContractTemplate;
-import com.ym.mec.biz.dal.entity.TenantInfo;
-import com.ym.mec.biz.dal.entity.VipGroup;
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.KitGroupPurchaseTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
-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.OrganizationService;
-import com.ym.mec.biz.service.StudentRegistrationService;
-import com.ym.mec.biz.service.SubjectService;
-import com.ym.mec.biz.service.SysUserContractsService;
-import com.ym.mec.biz.service.SysUserTsignService;
-import com.ym.mec.biz.service.TenantConfigService;
-import com.ym.mec.biz.service.TenantContractTemplateService;
-import com.ym.mec.biz.service.TenantInfoService;
-import com.ym.mec.biz.service.VipGroupService;
+import com.ym.mec.biz.service.*;
+import com.ym.mec.common.dto.RealnameAuthenticationDto;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.thirdparty.eseal.ESealPlugin;
 import com.ym.mec.thirdparty.user.realname.RealnameAuthenticationPluginContext;
@@ -86,8 +24,30 @@ 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;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.PostConstruct;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class ContractServiceImpl implements ContractService {
@@ -252,7 +212,7 @@ public class ContractServiceImpl implements ContractService {
                     realnameAuthenticationPluginContext.getRealnameAuthenticationPlugin(LinkfaceRealnameAuthenticationPlugin.getName()).verify(realName, idCardNo);
                 }*/
 
-                accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
+                /*accountId = eSealPlugin.createUserAccount(realName, idCardNo, mobileNo);
 
                 if (StringUtils.isBlank(accountId)) {
                     throw new BizException("创建电子存证账户失败");
@@ -262,7 +222,7 @@ public class ContractServiceImpl implements ContractService {
 
                 if (StringUtils.isBlank(sealData)) {
                     throw new BizException("创建电子存证印章失败");
-                }
+                }*/
             }
 
             sysUserTsign = new SysUserTsign(userId, accountId, sealData, realName, idCardNo, user.getTenantId());
@@ -931,12 +891,12 @@ public class ContractServiceImpl implements ContractService {
 
         SysUserTsign sysUserTsign = sysUserTsignService.get(userId);
         if (sysUserTsign == null) {
-            try {
-                sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+            sysUserTsign = register(userId, user.getRealName(), user.getIdCardNo(), user.getPhone());
+            /*try {
             } catch (Exception e) {
                 logger.error("用户电子签章注册失败", e);
                 return;
-            }
+            }*/
         }
         Date date = new Date();
 
@@ -1198,14 +1158,14 @@ public class ContractServiceImpl implements ContractService {
             }
             SysUserTsign sysUserTsign = sysUserTsignService.get(user.getId());
             if (sysUserTsign == null) {
-                try {
-                    sysUserTsign = register(user.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
+                sysUserTsign = register(user.getId(), user.getRealName(), user.getIdCardNo(), user.getPhone());
+                /*try {
                 } catch (Exception e) {
                     logger.error("用户电子签章注册失败", e);
                     continue;
-                }
+                }*/
             }
-            sysUserTsigns.add(sysUserTsign);
+//            sysUserTsigns.add(sysUserTsign);
         }
 
         Date date = new Date();

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

@@ -610,20 +610,22 @@
     </update>
 
     <select id="queryStudentInfo" resultMap="StudentInfo">
-        SELECT
-        u.*,
-        sr.name_,
-        sr.current_class_,
-        sr.current_grade_,
-        sr.actual_subject_id_,
-        sr.parents_name_,
-        s.name_ subject_name_
+        SELECT sut.name_ real_name_,
+               sut.card_no_ id_card_no_,
+               u.*,
+               sr.name_,
+               sr.current_class_,
+               sr.current_grade_,
+               sr.actual_subject_id_,
+               sr.parents_name_,
+               s.name_ subject_name_
         FROM sys_user u
-        LEFT JOIN student_registration sr ON u.id_ = sr.user_id_
-        LEFT JOIN subject s ON sr.actual_subject_id_ = s.id_
+                 LEFT JOIN student_registration sr ON u.id_ = sr.user_id_
+                 LEFT JOIN subject s ON sr.actual_subject_id_ = s.id_
+                 LEFT JOIN sys_user_tsign sut ON sut.user_id_ = u.id_
         WHERE u.id_ = #{userId}
         ORDER BY sr.create_time_ DESC
-        limit 1
+            limit 1
     </select>
 
     <select id="queryByUserIdAndMusicGroupId" resultMap="StudentRegistration">