Merge branch 'feature/zerobuy' into 'master'

fix list group

fix end list

See merge request !49

@@ -147,7 +147,7 @@ module.exports = class extends global.yoho.BaseModel {
                 break;
                 break;
             case 2:
             case 2:
                 where.push('status > 0');
                 where.push('status > 0');
-                where.push('(end_time < :now or is_full > 0)');
+                where.push('(status > 1 or end_time < :now or is_full > 0)');
                 break;
                 break;
             default:
             default:
                 where.push('status = 1 and start_time <= :now and end_time >= :now and is_full = 0');
                 where.push('status = 1 and start_time <= :now and end_time >= :now and is_full = 0');