同步优化初步3-同步成员

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/PreDealLogMapper.java

@@ -48,7 +48,8 @@ public interface PreDealLogMapper {
      * @param pDataId
      * @return
      */
-    List<TabHaobanPreDealLog> listByPDataId(@Param("taskId") String taskId, @Param("dataId") String pDataId, @Param("status") int status);
+    List<TabHaobanPreDealLog> listByPDataId(@Param("taskId") String taskId, @Param("dataId") String pDataId
+            , @Param("status") int status, @Param("dataType") int dataType);
 
     /**
      * 更新状态

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/PreDealServiceImpl.java

 package com.gic.haoban.manage.service.service.impl;
 
 import com.gic.haoban.manage.api.enums.PreDealStatusEnum;
+import com.gic.haoban.manage.api.enums.PreDealTypeEnum;
 import com.gic.haoban.manage.service.dao.mapper.PreDealLogMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanPreDealLog;
 import com.gic.haoban.manage.service.service.PreDealService;
@@ -36,7 +37,7 @@ public class PreDealServiceImpl implements PreDealService {
 
     @Override
     public List<TabHaobanPreDealLog> listByPDataId(String taskId, String pDataId, int status) {
-        return preDealLogMapper.listByPDataId(taskId, pDataId, status);
+        return preDealLogMapper.listByPDataId(taskId, pDataId, status, PreDealTypeEnum.group.getVal());
     }
 
     @Override

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

@@ -61,6 +61,7 @@ public class GroupSyncOperation implements BaseSyncOperation {
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
+        logger.info("处理单条部门分组：{}", JSONObject.toJSONString(dealParamMqDTO));
         DepartmentDTO departmentDTO = departmentApiService.selectByRelatedId(dataPre.getDataId());
         if (departmentDTO != null) {
             logger.info("已经同步过了:{}", dataPre.getDataId());

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

@@ -66,6 +66,7 @@ public class StoreSyncOperation implements BaseSyncOperation {
 
     @Override
     public void dealSingleByMq(DealParamMqDTO dealParamMqDTO, TabHaobanPreDealLog dataPre) {
+        logger.info("处理单条门店：{}", JSONObject.toJSONString(dealParamMqDTO));
         DepartmentDTO departmentDTO = departmentApiService.selectByRelatedId(dataPre.getDataId());
         if (departmentDTO != null) {
             logger.info("已经同步过了:{}", dataPre.getDataId());

haoban-manage3-service/src/main/resources/mapper/PreDealLogMapper.xml

@@ -164,7 +164,7 @@
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_pre_deal_log
-        where task_id = #{taskId} and p_data_id=#{dataId}
+        where task_id = #{taskId} and p_data_id=#{dataId} and data_type=#{dataType}
         <if test="status!=-1">
             and status_flag=#{status}
         </if>