diff --git a/src/main/java/com/kiisoo/ic/activity/controller/ActivityScheduleController.java b/src/main/java/com/kiisoo/ic/activity/controller/ActivityScheduleController.java
index 32597b4..cfa63fd 100644
--- a/src/main/java/com/kiisoo/ic/activity/controller/ActivityScheduleController.java
+++ b/src/main/java/com/kiisoo/ic/activity/controller/ActivityScheduleController.java
@@ -55,6 +55,21 @@ public class ActivityScheduleController extends BaseController {
             return fail();
         }
     }
+    @ApiOperation(value = "所有活动池分页")
+    @GetMapping(value = "/list/page")
+    public Map<String, Object> listPage(String categoryCode) {
+        try {
+            LambdaQueryWrapper<PmnActivitySchedule> wrapper = null;
+            if(categoryCode != null) {
+                wrapper = Wrappers.<PmnActivitySchedule>lambdaQuery().eq(PmnActivitySchedule::getCategoryCode, categoryCode);
+            }
+            List<PmnActivitySchedule> list = pmnActivityScheduleDOMapper.selectList(wrapper);
+            return data(list);
+        } catch (Exception e) {
+            log.error("查询出错", e);
+            return fail();
+        }
+    }
 
     @ApiOperation(value = "新增或修改活动池")
     @PostMapping(value = "/save")
diff --git a/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java b/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java
index 3de79ea..e061638 100644
--- a/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java
+++ b/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java
@@ -46,7 +46,7 @@ public class GenerateQRCodeListener {
         try {
             PmnActivityInstance instance = event.instance();
             ActivityInstanceVO activityInstanceVO = event.instanceVO();
-            List<Long> storeIds = new ArrayList<>();
+            Set<Long> storeIds = new HashSet<>();
             for (PoiStore store : activityInstanceVO.getStores()) {
                 PrivilageOrganizational org = poiStoreDOMapper.findStoreCompany(store.getId());
                 PmnActivityStoreRelation pmnActivityStoreRelation = new PmnActivityStoreRelation();
@@ -54,7 +54,11 @@ public class GenerateQRCodeListener {
                 pmnActivityStoreRelation.setStoreId(store.getId());
                 pmnActivityStoreRelation.setInstanceId(instance.getId());
                 pmnActivityStoreRelation.setCreateTime(new Date());
-                pmnActivityStoreRelation.setStatus(instance.getStatus().intValue());
+                int status = 1;
+                if(instance.getStatus() > 2) {
+                    status = 2;
+                }
+                pmnActivityStoreRelation.setStatus(status);
                 pmnActivityStoreRelation.setCaseId(instance.getId());
                 pmnActivityStoreRelation.setOrgId(org.getId());
                 pmnActivityStoreRelationService.saveOrUpdate(pmnActivityStoreRelation, Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, instance.getId()).eq(PmnActivityStoreRelation::getStoreId, store.getId()));
@@ -68,7 +72,7 @@ public class GenerateQRCodeListener {
             log.info("staffs: {}", staffs);
             List<PoiStoreStaff> fails = new LinkedList<>();
             staffs.stream().collect(
-                    Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(staff ->        staff.getStoreId()))), ArrayList::new)).forEach(item -> {
+                    Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(staff -> staff.getStoreId()))), ArrayList::new)).forEach(item -> {
                 PmnPromotionSrc save = pmnPromotionSrcService.createCode(item, instance.getId());
                 if (save == null) {
                     fails.add(item);
diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java
index 1381e36..6f735d7 100644
--- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java
@@ -121,10 +121,13 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
             PromotionSrcVO vo = new PromotionSrcVO();
             BeanUtils.copyProperties(src, vo);
             ActivityInstanceVO instance = pmnActivityInstanceService.getVO(src.getInstanceId());
-            if (
-                    !((instance.getBeginTime().compareTo(new Date()) == -1 || instance.getBeginTime().compareTo(new Date()) == 0) &&
-                            instance.getEndTime().compareTo(new Date()) == 1
-                    )) {
+//            if (
+//                    !((instance.getBeginTime().compareTo(new Date()) == -1 || instance.getBeginTime().compareTo(new Date()) == 0) &&
+//                            instance.getEndTime().compareTo(new Date()) == 1
+//                    )) {
+//                continue;
+//            }
+            if(src.getExpiredTime().compareTo(new Date()) == -1) {
                 continue;
             }
             vo.setInstanceVO(instance);
@@ -173,7 +176,7 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
             if (staff.getType().equals(1L)) {
                 promoterId = staff.getStoreId();
             }
-            PmnPromotionSrc src = getOne(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getPromoterId, promoterId).eq(PmnPromotionSrc::getType, staff.getType()).eq(PmnPromotionSrc::getInstanceId, instanceId));
+            PmnPromotionSrc src = getOne(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getPromoterId, promoterId).eq(PmnPromotionSrc::getType, staff.getType().equals(1L) ? 2 : 1).eq(PmnPromotionSrc::getInstanceId, instanceId));
             ActivityInstanceVO instanceVO = pmnActivityInstanceService.getVO(instanceId);
             PmnActivityInstanceConfig config = pmnActivityInstanceConfigService.getOne(Wrappers.<PmnActivityInstanceConfig>lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, instanceId));
             String state = Constants.ACTIVITY_QR_CODE_PREFIX + Constants.LINE + instanceId + Constants.LINE + 3 + Constants.LINE + promoterId;
@@ -190,7 +193,11 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
             saveSrc.setIsAddition(2L); //是否要独立码:  1、默认 2、额外码
             saveSrc.setType(staff.getType().equals(1L) ? 2L : 1L); //要注意
             saveSrc.setUpdateTime(new Date());
-            saveSrc.setStatus(1L);
+            Long status = 1L;
+            if(instanceVO.getStatus() == 3 || instanceVO.getStatus() == 4) {
+                status = 2L;
+            }
+            saveSrc.setStatus(status);
 //            String url = storeEmployeeService.createActivityQrCode(staff.getStaffCode(), staff.getStoreCode(), 3, instanceId, promoterId);
 
             String url = storeEmployeeService.createActivityQrCode("mayifei", staff.getStoreCode(), 3, instanceId, promoterId);
diff --git a/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml b/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml
index f891f05..4fd687b 100644
--- a/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml
+++ b/src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml
@@ -67,9 +67,11 @@ select * from pmn_activity_promotion_param where id in(select param_id from pmn_
     <select id="pageVO" resultMap="activityInstanceVOMap">
         select t.*,t1.store_count,t2.abbreviation as store_name,t3.company_count,t4.name as company_name
         from pmn_activity_instance t
-        left join (select instance_id, count(1) as store_count,store_id,org_id from pmn_activity_store_relation group by instance_id) t1 on t.id=t1.instance_id
+        left join (select instance_id, count(1) as store_count,store_id,org_id from pmn_activity_store_relation group by
+        instance_id) t1 on t.id=t1.instance_id
         left join poi_store t2 on t2.id=t1.store_id
-        left join (select instance_id, count(DISTINCT org_id) as company_count,store_id from pmn_activity_store_relation group by instance_id) t3 on t.id=t3.instance_id
+        left join (select instance_id, count(DISTINCT org_id) as company_count,store_id from pmn_activity_store_relation
+        group by instance_id) t3 on t.id=t3.instance_id
         left join privilage_organizational t4 on t4.id=t1.org_id
         where 1 =1
         <if test="storeId != null">
@@ -92,11 +94,10 @@ select * from pmn_activity_promotion_param where id in(select param_id from pmn_
         <if test="status != null">
             and t.status = #{status}
         </if>
-        <if test="startDate != null">
-            and t.begin_time <![CDATA[ >= ]]> #{startDate}
-        </if>
-        <if test="endDate != null">
-            and t.end_time <![CDATA[ <= ]]> #{endDate}
+        <if test="startDate != null and endDate != null">
+            and ((begin_time >= #{startDate} AND begin_time <![CDATA[ <= ]]> #{endDate})
+            OR (begin_time <![CDATA[ <= ]]> #{startDate} AND end_time >= #{endDate})
+            OR (end_time >= #{startDate} AND end_time <![CDATA[ <= ]]> #{endDate}))
         </if>
         and t.status &lt;&gt; 4
         order by create_time desc