Merge branch 'developer' into 'master'

Developer

See merge request !81

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/qo/StoreListQo.java

@@ -19,8 +19,25 @@ public class StoreListQo extends BasePageInfo {
     private String countyId;
     private Integer storeType;
     private List<String> storeIdList;
+    private List<String> notStoreIdList;
     private String storeId;
 
+    public List<String> getStoreIdList() {
+        return storeIdList;
+    }
+
+    public void setStoreIdList(List<String> storeIdList) {
+        this.storeIdList = storeIdList;
+    }
+
+    public List<String> getNotStoreIdList() {
+        return notStoreIdList;
+    }
+
+    public void setNotStoreIdList(List<String> notStoreIdList) {
+        this.notStoreIdList = notStoreIdList;
+    }
+
     public String getStoreGroupId() {
         return storeGroupId;
     }

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

@@ -213,6 +213,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         RedisUtil.lock(key, 10L);
         String taskLock = getTaskLock(wxEnterpriseId);
         if (StringUtils.isNotBlank(taskLock)) {
+            RedisUtil.unlock(key);
             return null;
         }
         TabHaobanSyncTask tabHaobanSyncTask = new TabHaobanSyncTask();