1

src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java

@@ -9,6 +9,7 @@ import com.kiisoo.ic.activity.event.ActivityInstanceCreatedEvent;
 import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService;
 import com.kiisoo.ic.activity.service.IPmnPromotionSrcService;
 import com.kiisoo.ic.generalize.entity.PrivilageOrganizational;
+import com.kiisoo.ic.store.bean.PoiStoreStaffDTO;
 import com.kiisoo.ic.store.entity.PoiStore;
 import com.kiisoo.ic.store.entity.PoiStoreStaff;
 import com.kiisoo.ic.store.mapper.PoiStoreDOMapper;
@@ -67,6 +68,17 @@ public class GenerateQRCodeListener {
             if (storeIds.size() > 0) {
                 pmnActivityStoreRelationService.remove(Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, instance.getId()).notIn(PmnActivityStoreRelation::getStoreId, storeIds));
             }
+            List<PmnPromotionSrc> storeSrcs = pmnPromotionSrcService.list(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getInstanceId, instance.getId()).notIn(PmnPromotionSrc::getPromoterId, storeIds).eq(PmnPromotionSrc::getType, 2).select(PmnPromotionSrc::getPromoterId));
+            Set<Long> removeStoreSrcs = storeSrcs.stream().map(PmnPromotionSrc::getPromoterId).collect(Collectors.toSet());
+            List<PoiStoreStaffDTO> removeSellers = poiStoreStaffDOMapper.selectSellersByShopIds(new ArrayList<>(removeStoreSrcs));
+            Set<Long> removeSellerIds = removeSellers.stream().map(PoiStoreStaffDTO::getUserId).collect(Collectors.toSet());
+            List<Long> removeSrcs = new ArrayList<>();
+            removeSrcs.addAll(new ArrayList<>(removeStoreSrcs));
+            removeSrcs.addAll(new ArrayList<>(removeSellerIds));
+            if(removeSrcs.size() > 0) {
+                pmnPromotionSrcService.remove(Wrappers.<PmnPromotionSrc>lambdaQuery().in(PmnPromotionSrc::getPromoterId, removeSrcs).eq(PmnPromotionSrc::getInstanceId, instance.getId()));
+            }
+            log.info("removeSrcs: {}", removeSrcs);
             log.info("storeIds: {}", storeIds);
             List<PoiStoreStaff> staffs = poiStoreStaffDOMapper.selectList(Wrappers.<PoiStoreStaff>lambdaQuery().in(PoiStoreStaff::getStoreId, storeIds).eq(PoiStoreStaff::getType, 1).eq(PoiStoreStaff::getStatus, 1));
             log.info("staffs: {}", staffs);

src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java

@@ -180,7 +180,7 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
             PrivilageRoleDO roleDO = privilageRoleDOMapper.selectRoleName(privilageAccountDO.getUserId());
             System.out.println(roleDO.getCode());
             System.out.println(RoleEnum.getCodeByName("运营人员").getRoleCode());
-            if (roleDO.getCode().equals(RoleEnum.getCodeByName("运营人员").getRoleCode())) {
+            if (roleDO.getCode().equals(RoleEnum.getCodeByName("运营人员").getRoleCode()) || roleDO.getCode().equals(RoleEnum.getCodeByName("店长").getRoleCode())) {
                 PrivilageOrganizationalMember organizationalMember = organizationalMemberMapper.selectOne(Wrappers.<PrivilageOrganizationalMember>lambdaQuery().eq(PrivilageOrganizationalMember::getUserId, userId));
                 organizationId = organizationalMember.getOrgId();
             }