Merge branch 'feature/企微许可账号购买' into 'master'

非空判断

See merge request !1116

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

@@ -137,6 +137,14 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
             try {
                 TabHaobanStaff handover = staffService.selectById(dto.getHandoverStaffId());
                 TabHaobanStaff takeover = staffService.selectById(dto.getTakeoverStaffId());
+                if(null == handover) {
+                    logger.info("handover is null={}",dto.getHandoverStaffId());
+                    return;
+                }
+                if(null == takeover) {
+                    logger.info("takeover is null={}",dto.getTakeoverStaffId());
+                    return;
+                }
                 QywxTransferCustomerDTO customerDTO = qywxUserApiService.transferResult(qwDTO.getThirdCorpid(), config.getWxSuiteid(), handover.getWxUserId(), takeover.getWxUserId(), true);
                 if (customerDTO.getErrcode() != 0) {
                     return;

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

@@ -170,6 +170,9 @@ public class KafkaMessageServiceImpl implements MessageListener<String, GicRecor
      */
     private void dealStoreGroup(GroupSyncPojo syncPojo) {
         logger.info("门店分组变更binlog监听:{}", JSONObject.toJSONString(syncPojo));
+        if(null != syncPojo && (null == syncPojo.getOldStatus() || null == syncPojo.getStatus())) {
+            return ;
+        }
         //删除 同步绑定门店
         if (syncPojo!= null && syncPojo.getOldStatus() == 1 && syncPojo.getStatus() == 0) {
             logger.info("门店分组变更，同步绑定门店：{}", JSONObject.toJSONString(syncPojo));