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

alien-store/src/main/java/shop/alien/store/service/impl/PerformanceListServiceImpl.java

@@ -990,7 +990,9 @@ public class PerformanceListServiceImpl implements PerformanceListService {
 
             // 转换为VO列表
             for (StoreStaffConfig staff : staffList) {
-                if (staff == null || !CommonConstant.DELETE_FLAG_UNDELETE.equals(staff.getDeleteFlag())) {
+                if (staff == null || !CommonConstant.DELETE_FLAG_UNDELETE.equals(staff.getDeleteFlag())
+                        ||!"1".equals(staff.getStatus()) ||!CommonConstant.ONLINE_STATUS.equals(staff.getOnlineStatus())
+                        ) {
                     continue;
                 }
 

alien-store/src/main/java/shop/alien/store/util/CommonConstant.java

@@ -112,4 +112,11 @@ public class CommonConstant {
     public static final String RATING_LIKE = "11";
     public static final String COMMENT_LIKE = "12";
     public static final String DYNAMIC_LIKE = "13";
+
+
+    /**
+     * 上线状态，0：上线，2：下线
+     */
+    public static final Integer ONLINE_STATUS = 0;
+    public static final Integer OFFLINE_STATUS = 1;
 }