商户判断

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

@@ -142,18 +142,17 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
             entity.setRemark("区经/未配置主门店");
         } else {
             String storeId = mainStore.getStoreId();
-            StoreDTO store = this.storeService.getStore(storeId);
-            if (null != store && !store.getEnterpriseId().equals(entity.getEnterpriseId())) {
-                entity.setRemark("主门店不在任务商户下");
-            } else {
-                StaffClerkRelationDTO clerk = this.staffClerkRelationService.getOneBindByStoreId(staffId, storeId);
-                if (null != clerk) {
+            StaffClerkRelationDTO clerk = this.staffClerkRelationService.getOneBindByStoreId(staffId, storeId);
+            if (null != clerk) {
+                if (clerk.getEnterpriseId().equals(entity.getEnterpriseId())) {
+                    entity.setRemark("主门店不在任务商户下");
+                } else {
                     entity.setClerkId(clerk.getClerkId());
                     entity.setStoreId(mainStore.getStoreId());
-                } else {
-                    entity.setRemark("无关联导购");
-                    logger.info("导购关联数据不存在,staffid={},storeid={}", staffId, mainStore.getStoreId());
                 }
+            } else {
+                entity.setRemark("无关联导购");
+                logger.info("导购关联数据不存在,staffid={},storeid={}", staffId, mainStore.getStoreId());
             }
         }
         this.groupChatPlanOwnerLogMapper.update(entity);
@@ -183,7 +182,7 @@ public class GroupChatPlanOwnerLogServiceImpl implements GroupChatPlanOwnerLogSe
             BasePageInfo basePageInfo) {
         String clerkId = qdto.getClerkId();
         ClerkDTO clerk = this.clerkService.getclerkById(clerkId);
-        if(null == clerk) {
+        if (null == clerk) {
             logger.info("导购不存在");
             return new Page<ChatOwnerTotalDTO>();
         }