门店导入

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -110,7 +110,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
                 clerkLeader.setPositionName("导购");
                 clerkService.update(clerkLeader);
                 clerkDTO.setPositionId(com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID);
-            } else if (clerkLeader == null || clerkLeader.getClerkId().equals(clerkDTO.getClerkId())) {
+            } else if (clerkLeader == null) {
                 clerkDTO.setPositionId(com.gic.store.constant.Constants.CLERK_LEADER_POSITION_ID);
             }
 

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreApiServiceImpl.java

@@ -209,9 +209,9 @@ public class StoreApiServiceImpl implements StoreApiService {
             //修改门店同步到微盟
             updateStoreToWm(storeDTO);
             // 给会员组发通知
-            if (StringUtils.isNotBlank(storeDTO.getBrandIds()) && !StringUtils.equals(existStore.getResult().getBrandIds(), storeDTO.getBrandIds())) {
-                sparkJobApiService.updateStoreBrand(storeDTO.getEnterpriseId(), storeDTO.getStoreInfoId(), Integer.parseInt(existStore.getResult().getBrandIds()), Integer.parseInt(storeDTO.getBrandIds()));
-            }
+//            if (StringUtils.isNotBlank(storeDTO.getBrandIds()) && !StringUtils.equals(existStore.getResult().getBrandIds(), storeDTO.getBrandIds())) {
+//                sparkJobApiService.updateStoreBrand(storeDTO.getEnterpriseId(), storeDTO.getStoreInfoId(), Integer.parseInt(existStore.getResult().getBrandIds()), Integer.parseInt(storeDTO.getBrandIds()));
+//            }
         }
         // 自定义属性
         String error = storeExtendService.saveOrUpdate(storeDTO.getEnterpriseId(), storeDTO.getStoreInfoId(), storeDTO.getStoreExtendList());