Merge remote-tracking branch 'origin/dev-group-1119' into dev-merge-1119

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

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

@@ -11,10 +11,7 @@ import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
 import com.pica.cloud.account.account.server.exception.AccountException;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
-import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
-import com.pica.cloud.account.account.server.mapper.AccountMapper;
-import com.pica.cloud.account.account.server.mapper.AgreementLogEntityMapper;
-import com.pica.cloud.account.account.server.mapper.PUserRoleMapper;
+import com.pica.cloud.account.account.server.mapper.*;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.RegisterService;
 import com.pica.cloud.account.account.server.util.*;
@@ -37,6 +34,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
+import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 
 @Service
@@ -93,6 +91,7 @@ public class RegisterServiceImpl implements RegisterService {
 
     @Override
     public LoginResult register(BaseRequest baseRequest,QueryMobileEntity queryMobileEntity) {
+        String requestId = UUID.randomUUID().toString();
         //接入新旭事务一致性
         String batchNo = IntactUtils.getUUID();
         intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_1,"baseRequest:"+ JSON.toJSONString(baseRequest)+",queryMobileEntity:"+JSON.toJSONString(queryMobileEntity));
@@ -191,9 +190,9 @@ public class RegisterServiceImpl implements RegisterService {
                     redisClient.del(nxKey);
                     intactUtil.sendIntact(batchNo,"register",com.pica.cloud.foundation.completeness.contract.constants.CommonConstants.INTACT_CONTENT_LOG_STATUS_3,"baseRequest:"+ JSON.toJSONString(baseRequest)+",queryMobileEntity:"+JSON.toJSONString(queryMobileEntity));
 
-                    logger.info("@@@update doctor tag: {}", userId);
+                    logger.info("@@@update doctor profiles by id: requestId-{}, doctorId-{}", requestId, userId);
                     PicaResponse<Integer> updateDoctorProfilesResp = transportDoctorClient.updateDoctorProfilesById(
-                            userId.intValue(), Lists.newArrayList(new StickerProfileDto(Integer.valueOf(stickerId), "1")), null);
+                            userId.intValue(), Lists.newArrayList(new StickerProfileDto(Integer.valueOf(stickerId), "1")), requestId, null);
                     if (updateDoctorProfilesResp.getData() != null && updateDoctorProfilesResp.getData().equals(0)) {
                         logger.error("update doctor tag failed");
                     }