Merge remote-tracking branch 'origin/developer' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageListener.java

@@ -15,6 +15,7 @@ import org.springframework.kafka.listener.MessageListener;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 
 /**
@@ -62,6 +63,11 @@ public class InteractRecordMessageListener implements MessageListener<String, St
             return;
         }
         dataConvert(recordMessageBO);
+        String clerkId = recordMessageBO.getClerkId();
+        if (Objects.equals(clerkId, "-1")) {
+            log.info("导购为空不处理");
+            return;
+        }
         interactRecordMessageService.dealRecord(recordMessageBO);
     }
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/message/InteractRecordMessageService.java

@@ -169,6 +169,10 @@ public class InteractRecordMessageService {
                     interactRecordBO.getExtendInfo().getExtendOrderInfos().add(extendOrderInfo);
                 }
             }
+            if (StringUtils.isBlank(interactRecordBO.getBizId())) {
+                log.info("bizId为空");
+                return;
+            }
             interactRecordService.saveOrUpdateInteractRecord(interactRecordBO);
             // 更新销售线索
             if (StringUtils.isNotBlank(interactRecordMessageBO.getMemberId())) {