test

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

@@ -31,6 +31,7 @@ import com.gic.haoban.manage.service.service.*;
 import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
 import com.gic.haoban.manage.service.task.RouterConstant;
 import com.gic.haoban.task.api.dto.MqMessageQo;
+import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactDTO;
 import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactResultDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
@@ -524,18 +525,32 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             }
         }
     }
-
-
+    
+    // 导购门店转移
     private void moveOrAddClerk(ClerkSyncQDTO clerkSyncQDTO, StaffClerkRelationDTO oldRelationDTO) {
-        //正常的时候
-        String oldClerkId = oldRelationDTO.getClerkId();
-        this.staffClerkRelationService.delBind(oldClerkId, "-1", ChannelCodeEnum.SYNC_UNBIND.getCode(), clerkSyncQDTO.getClerkId());
-        oldRelationDTO.setClerkId(clerkSyncQDTO.getClerkId());
-        oldRelationDTO.setStoreId(clerkSyncQDTO.getStoreId());
-        ServiceResponse response = this.bindCheck(oldRelationDTO, "-1", ChannelCodeEnum.SYNC_BIND.getCode()) ;// this.bindStaffClerk(oldRelationDTO, "-1", ChannelCodeEnum.SYNC_BIND.getCode());
-        logger.info("绑定结果正常：{}，{}", JSONObject.toJSONString(response), oldRelationDTO.getClerkId());
-        if(response==null) {
-            this.staffClerkRelationService.insert(oldRelationDTO) ;
+        boolean flag  = false ; 
+        if(null != RedisUtil.getCache("clerkMoveFlag2022")) {
+            flag = true ;
+        }
+        if(flag) {
+            String oldClerkId = oldRelationDTO.getClerkId();
+            this.staffClerkRelationService.delBind(oldClerkId, "-1", ChannelCodeEnum.SYNC_UNBIND.getCode(), clerkSyncQDTO.getClerkId());
+            // 设置新的ID
+            oldRelationDTO.setClerkId(clerkSyncQDTO.getClerkId());
+            oldRelationDTO.setStoreId(clerkSyncQDTO.getStoreId());
+            ServiceResponse response = this.bindCheck(oldRelationDTO, "-1", ChannelCodeEnum.SYNC_BIND.getCode()) ;
+            logger.info("绑定结果正常：{}，{}", JSONObject.toJSONString(response), oldRelationDTO.getClerkId());
+            if(response==null) {
+                this.staffClerkRelationService.insert(oldRelationDTO) ;
+            }
+        }else {
+            String oldClerkId = oldRelationDTO.getClerkId();
+            this.staffClerkRelationService.delBind(oldClerkId, "-1", ChannelCodeEnum.SYNC_UNBIND.getCode(), null);
+            // 设置新的ID
+            oldRelationDTO.setClerkId(clerkSyncQDTO.getClerkId());
+            oldRelationDTO.setStoreId(clerkSyncQDTO.getStoreId());
+            ServiceResponse resp = this.bindStaffClerk(oldRelationDTO, "-1", ChannelCodeEnum.SYNC_BIND.getCode());
+            logger.info("绑定结果正常：{}，{}", JSONObject.toJSONString(resp), oldRelationDTO.getClerkId());
         }
     }