Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/task/KafkaMessageServiceImpl.java

@@ -90,7 +90,6 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
 
                 StaffClerkRelationDTO clerkRelationDTO = staffClerkRelationService.getByClerkId(syncPojo.getClerkId());
                 if (clerkRelationDTO != null) {
-
                     logger.info("更新关联信息1:{}",syncPojo.getClerkId());
                     staffClerkRelationService.updateByClerkId(relationDTO);
                     return;
@@ -98,10 +97,8 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
                 StaffClerkRelationDTO bindRelationDTO = staffClerkRelationService.getOneBindCodeNoStatus(syncPojo.getEnterpriseId(), syncPojo.getClerkCode());
                 if (null == bindRelationDTO) {
                     logger.info("没有关联导购，不需要操作:{}", syncPojo.getClerkId());
-
                     return;
                 }
-
                 logger.info("走新增逻辑:{}",syncPojo.getClerkId());
                 //走新增逻辑
                 moveOrAddClerk(syncPojo,bindRelationDTO);
@@ -120,7 +117,7 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
             relationDTO.setClerkId(syncPojo.getClerkId());
             relationDTO.setStoreId(syncPojo.getStoreId());
             ServiceResponse response = staffClerkRelationApiService.bindStaffClerk(relationDTO, "-1", ChannelCodeEnum.SYNC_BIND.getCode());
-            logger.info("绑定结果正常：{}",JSONObject.toJSONString(response));
+            logger.info("绑定结果正常：{}，{}",JSONObject.toJSONString(response),relationDTO.getClerkId());
         }else {//删除状态 需要判断是否近段时间有操作删除 2分组内有更新 判断是转移操作
             Date timeDiff = DateUtils.addMinutes(new Date(), -2);
             if(relationDTO.getUpdateTime().after(timeDiff)){
@@ -128,7 +125,7 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
                 relationDTO.setClerkId(syncPojo.getClerkId());
                 relationDTO.setStoreId(syncPojo.getStoreId());
                 ServiceResponse response = staffClerkRelationApiService.bindStaffClerk(relationDTO, "-1", ChannelCodeEnum.SYNC_BIND.getCode());
-                logger.info("绑定结果：{}",JSONObject.toJSONString(response));
+                logger.info("绑定结果：{},{}",JSONObject.toJSONString(response),relationDTO.getClerkId());
             }
         }
     }