Merge branch 'dev-20191224-registerSource' into 'release'

Dev 20191224 register source



See merge request !7

server/src/main/java/com/pica/cloud/account/account/server/service/impl/AccountServiceImpl.java

@@ -102,6 +102,7 @@ public class AccountServiceImpl implements AccountService {
             account.setModifyId(0L);
             account.setAcctId(acctId);
             account.setCreatTime(currentTime);
+            account.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_H5.getCode());
             account.setModifyTime(currentTime);
             account.setFirstLoginTime(currentTime);
             account.setLastLoginTime(currentTime);

server/src/main/java/com/pica/cloud/account/account/server/service/impl/DoctorServiceImpl.java

@@ -131,6 +131,7 @@ public class DoctorServiceImpl implements DoctorService {
         doctor.setCreatId(doctorId.intValue());
         doctor.setCreatTime(currentTime);
         doctor.setModifyTime(new Date());
+        doctor.setRegisterSource(AccountTypeEnum.DEVICE_TYPE_ADMIN.getCode());
         doctor.setDeleteFlag(1);
         doctorMapper.insertSelective(doctor);
         return doctor.getId();

server/src/main/java/com/pica/cloud/account/account/server/service/impl/RegisterServiceImpl.java

@@ -2,7 +2,6 @@ package com.pica.cloud.account.account.server.service.impl;
 
 import com.pica.cloud.account.account.common.req.OCINRequest;
 import com.pica.cloud.account.account.server.entity.*;
-import com.pica.cloud.account.account.server.enums.AccountAgreementEnum;
 import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
@@ -27,7 +26,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.concurrent.ExecutorService;
 
 @Service
@@ -133,6 +131,7 @@ public class RegisterServiceImpl implements RegisterService {
                         account.setModifyTime(currentTime);
                         account.setFirstLoginTime(currentTime);
                         account.setLastLoginTime(currentTime);
+                        account.setRegisterSource(sourceType);
                         account.setPassword(password);
                         if (!StringUtils.isBlank(password)){
                             account.setEntireFlag(3);
@@ -254,6 +253,7 @@ public class RegisterServiceImpl implements RegisterService {
             account.setModifyTime(currentTime);
             account.setFirstLoginTime(currentTime);
             account.setLastLoginTime(currentTime);
+            account.setRegisterSource(sourceType);
             account.setPassword("");
             account.setName(name);
             accountMapper.insertSelective(account);