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

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserTsign.java

@@ -31,13 +31,22 @@ public class SysUserTsign extends BaseEntity {
 		// TODO Auto-generated constructor stub
 	}
 
-	public SysUserTsign(Integer userId, String accountId, String sealData, String name, String cardNo) {
-		this.userId = userId;
-		this.accountId = accountId;
-		this.sealData = sealData;
-		this.name = name;
-		this.cardNo = cardNo;
-	}
+    public SysUserTsign(Integer userId, String accountId, String sealData, String name, String cardNo) {
+        this.userId = userId;
+        this.accountId = accountId;
+        this.sealData = sealData;
+        this.name = name;
+        this.cardNo = cardNo;
+    }
+
+    public SysUserTsign(Integer userId, String accountId, String sealData, String name, String cardNo,Integer tenantId) {
+        this.userId = userId;
+        this.accountId = accountId;
+        this.sealData = sealData;
+        this.name = name;
+        this.cardNo = cardNo;
+        super.setTenantId(tenantId);
+    }
 
 	public void setUserId(Integer userId) {
 		this.userId = userId;
@@ -87,7 +96,7 @@ public class SysUserTsign extends BaseEntity {
 		return this.createTime;
 	}
 
-	@Override
+    @Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/ContractService.java

@@ -24,7 +24,7 @@ public interface ContractService {
 	 */
 	SysUserTsign register(Integer userId, String realName, String idCardNo, String mobileNo);
 
-    void addTsign(String organCode, String orgName);
+    void addTsign(Integer userId,String organCode, String orgName,Integer tenantId);
 
 	/**
 	 * 传递注册协议至第三方公证平台

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

@@ -49,7 +49,6 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.stream.Collectors;
 
 @Service
@@ -74,9 +73,6 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
     private StudentRegistrationDao studentRegistrationDao;
 
     @Autowired
-    private StudentPaymentOrderService studentPaymentOrderService;
-
-    @Autowired
     private MusicGroupSubjectPlanService musicGroupSubjectPlanService;
 
     @Autowired
@@ -89,9 +85,6 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
     private MusicGroupStudentFeeDao musicGroupStudentFeeDao;
 
     @Autowired
-    private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
-
-    @Autowired
     @Lazy
     private VipGroupService vipGroupService;
 
@@ -138,13 +131,14 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
     public void afterPropertiesSet() throws Exception {
         // 注册企业账户
         Map<String, String> organList = new HashMap<String, String>();
-        organList.put("91420106333619290A", "武汉长乐长风乐器销售有限公司");
-        organList.put("91440300326364429H", "深圳大雅乐盟网络教育股份有限公司");
+        organList.put("91420106333619290A", "2,武汉长乐长风乐器销售有限公司");
+        organList.put("91440300326364429H", "1,深圳大雅乐盟网络教育股份有限公司");
 
         organList.forEach((code, name) -> {
             SysUserTsign sysUserTsign = sysUserTsignService.queryByCardNo(code);
             if (Objects.isNull(sysUserTsign)) {
-                addTsign(code, name);
+                String[] nameSplit = name.split(",");
+                addTsign(Integer.parseInt(nameSplit[0]), code, nameSplit[1], 1);
             }
         });
     }
@@ -153,7 +147,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
      * 校验企业营业信息，不存在则添加一个
      */
     @Override
-    public void addTsign(String organCode, String orgName) {
+    public void addTsign(Integer userId, String organCode, String orgName, Integer tenantId) {
         Optional.ofNullable(organCode).orElseThrow(() -> new BizException("营业执照编号不能为空!"));
         Optional.ofNullable(orgName).orElseThrow(() -> new BizException("营业名称不能为空"));
 
@@ -167,7 +161,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
             throw new BizException("创建电子存证印章失败");
         }
 
-        SysUserTsign sysUserTsign = new SysUserTsign(-1, accountId, sealData, orgName, organCode);
+        SysUserTsign sysUserTsign = new SysUserTsign(-userId, accountId, sealData, orgName, organCode, tenantId);
         sysUserTsignService.insert(sysUserTsign);
     }
 

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

@@ -349,7 +349,7 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         Lists.partition(collectMenuId, 50)
                 .forEach(idList -> employeeService.batchInsertRoleMenu(roleId, idList, tenantId));
         //添加签章信息
-        contractService.addTsign(tenantInfo.getTsignCode(), tenantInfo.getTsignName());
+        contractService.addTsign(tenantInfo.getUserId(),tenantInfo.getTsignCode(), tenantInfo.getTsignName(), tenantId);
 
         Date now = new Date();