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

# Conflicts:
#	src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java
#	src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java

src/main/java/com/kiisoo/ic/activity/controller/WebAppActivityController.java

@@ -101,7 +101,7 @@ public class WebAppActivityController extends BaseController {
              */
             PmnPromotionSrc up = new PmnPromotionSrc();
             up.setStatus(2L);
-            pmnPromotionSrcService.update(up, Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getInstanceId, instanceId).notIn(PmnPromotionSrc::getPromoterId, staffs.stream().map(PoiStoreStaff::getUserId).collect(Collectors.toList())).notIn(PmnPromotionSrc::getType, staffs.stream().map(PoiStoreStaff::getType).collect(Collectors.toList())));
+            pmnPromotionSrcService.update(up, Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getInstanceId, instanceId).notIn(PmnPromotionSrc::getPromoterId, staffs.stream().map(PoiStoreStaff::getUserId).collect(Collectors.toList())).eq(PmnPromotionSrc::getType, 1));
             //
             Map<String, Object> ret = new HashMap<>();
             ret.put("success", success);

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

@@ -12,10 +12,17 @@ import com.kiisoo.ic.activity.mapper.PmnActivityInstanceDOMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kiisoo.ic.domain.service.PrivilageDomainService;
 import com.kiisoo.ic.generalize.entity.PrivilageOrganizational;
+import com.kiisoo.ic.generalize.entity.PrivilageOrganizationalMember;
+import com.kiisoo.ic.generalize.mapper.OrganizationalMemberMapper;
 import com.kiisoo.ic.generalize.mapper.RetailCompanyMapper;
 import com.kiisoo.ic.generalize.service.RetailCompanyService;
 import com.kiisoo.ic.store.entity.PoiStore;
 import com.kiisoo.ic.store.mapper.PoiStoreDOMapper;
+import com.kiisoo.ic.system.entity.PrivilageAccountDO;
+import com.kiisoo.ic.system.entity.PrivilageRoleDO;
+import com.kiisoo.ic.system.enums.RoleEnum;
+import com.kiisoo.ic.system.mapper.PrivilageAccountDOMapper;
+import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -69,6 +76,12 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
 
     @Autowired
     private PoiStoreDOMapper poiStoreDOMapper;
+    @Autowired
+    private PrivilageRoleDOMapper privilageRoleDOMapper;
+    @Autowired
+    private PrivilageAccountDOMapper privilageAccountDOMapper;
+    @Autowired
+    private OrganizationalMemberMapper organizationalMemberMapper;
 
     @Transactional
     public boolean saveVO(ActivityInstanceVO activityInstanceVO, boolean isTerminate) {
@@ -163,7 +176,16 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
     public Map<String, Object> pageVO(Long userId, Date startDate, Date endDate, Long organizationId, Long storeId, Integer status, Integer pageNum, Integer pageSize, Date beginTime, Date endTime) {
         Map<String, Object> results = new HashMap<>();
         List<Long> shopIds = new ArrayList<>();
-
+        if(userId != null) {
+            PrivilageAccountDO privilageAccountDO = privilageAccountDOMapper.selectOne(Wrappers.<PrivilageAccountDO>lambdaQuery().eq(PrivilageAccountDO::getUserId, userId));
+            PrivilageRoleDO roleDO = privilageRoleDOMapper.selectRoleName(privilageAccountDO.getUserId());
+            System.out.println(roleDO.getCode());
+            System.out.println(RoleEnum.getCodeByName("运营人员").getRoleCode());
+            if(roleDO.getCode().equals(RoleEnum.getCodeByName("运营人员").getRoleCode())) {
+                PrivilageOrganizationalMember organizationalMember = organizationalMemberMapper.selectOne(Wrappers.<PrivilageOrganizationalMember>lambdaQuery().eq(PrivilageOrganizationalMember::getUserId, userId));
+                organizationId = organizationalMember.getOrgId();
+            }
+        }
 //        if(userId != null) {
 //            if (storeId != null) {
 //                shopIds.add(storeId);

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

@@ -35,6 +35,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.shiro.crypto.hash.SimpleHash;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -103,7 +104,7 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
         if (type.equals(2L)) {
             userId = staff.getStoreId();
         }
-        List<PmnPromotionSrc> srcs = list(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getPromoterId, userId).eq(PmnPromotionSrc::getType, type));
+        List<PmnPromotionSrc> srcs = list(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getPromoterId, userId).eq(PmnPromotionSrc::getType, type).eq(PmnPromotionSrc::getStatus, 1));
         for (PmnPromotionSrc src : srcs) {
             File codeFile = new File("activity/" + src.getCode() + ".png");
             if (!codeFile.exists() || src.getQrCode() == null) {

src/main/java/com/kiisoo/ic/config/CorsFilter.java

@@ -0,0 +1,25 @@
+package com.kiisoo.ic.config;
+
+import org.springframework.context.annotation.Configuration;
+
+import javax.servlet.*;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@WebFilter(filterName = "CorsFilter")
+@Configuration
+public class CorsFilter implements Filter {
+    @Override
+    public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws ServletException, IOException {
+        HttpServletResponse response = (HttpServletResponse) res;
+        HttpServletRequest httpServletRequest = (HttpServletRequest) req;
+        response.setHeader("Access-Control-Allow-Origin",httpServletRequest.getHeader("Origin"));
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Methods", "POST, GET, PATCH, DELETE, PUT");
+        response.setHeader("Access-Control-Max-Age", "3600");
+        response.setHeader("Access-Control-Allow-Headers", httpServletRequest.getHeader("Access-Control-Request-Headers"));
+        chain.doFilter(req, res);
+    }
+}

src/main/java/com/kiisoo/ic/store/controller/PoiStoreController.java

@@ -29,9 +29,9 @@ public class PoiStoreController extends BaseController {
     private PoiStoreService poiStoreService;
 
 
+
     /**
      * 根据用户id，区域id获取店铺
-     *
      * @return
      */
     @RequestMapping(value = "/user/shop", method = RequestMethod.POST)
@@ -61,7 +61,6 @@ public class PoiStoreController extends BaseController {
 
     /**
      * 根据用户id，区域id获取店铺
-     *
      * @return
      */
     @RequestMapping(value = "/user/shopDTO",method = RequestMethod.POST)
@@ -88,7 +87,6 @@ public class PoiStoreController extends BaseController {
         }
 
     }
-
     /**
      * 查询所有店铺
      *

src/main/java/com/kiisoo/ic/store/service/PoiStoreService.java

@@ -53,10 +53,12 @@ public class PoiStoreService {
     private PrivilageOrganizationalDomainMapper privilageOrganizationalDomainMapper;
     @Autowired
     private RetailCompanyMapper retailCompanyMapper;
-
+    @Autowired
+    private IPmnActivityInstanceService pmnActivityInstanceService;
+    @Autowired
+    private IPmnActivityStoreRelationService storeRelationService;
     /**
      * 根据区域id找到店铺集合
-     *
      * @param regionId
      */
     public List<PoiStore> getRegionShop(long regionId){
@@ -66,7 +68,6 @@ public class PoiStoreService {
 
     /**
      * 根据区域id找到店铺集合，若没有，则查用户所有店铺
-     *
      * @param regionId
      */
     public List<PoiStore> getRegionShop(long userId,List<Long> customerIds){
@@ -97,20 +98,29 @@ public class PoiStoreService {
 
     /**
      * 根据区域id找到店铺集合，若没有，则查用户所有店铺
-     *
      * @param regionId
      */
-    public List<PoiStoreDTO> getRegionShopDTO(long userId, List<Long> customerIds) {
+    public List<PoiStoreDTO> getRegionShopDTO(long userId,List<Long> customerIds, Long scheduleId){
         List<PoiStoreDTO> poiStores = new ArrayList<>();
         //找到店铺集合
         if(null != customerIds && customerIds.size()>0){
             Set<Long> cs = new HashSet<>();
             cs.addAll(customerIds);
+            Set<Long> joined = new HashSet<>();
+            if(scheduleId != null) {
+                List<PmnActivityInstance> instances = pmnActivityInstanceService.list(Wrappers.<PmnActivityInstance>lambdaQuery().eq(PmnActivityInstance::getScheduleId, scheduleId).select(PmnActivityInstance::getId));
+                Set<Long> instanceIds = instances.stream().map(PmnActivityInstance::getId).collect(Collectors.toSet());
+                List<PmnActivityStoreRelation> relations = storeRelationService.list(Wrappers.<PmnActivityStoreRelation>lambdaQuery().in(PmnActivityStoreRelation::getInstanceId, instanceIds).select(PmnActivityStoreRelation::getStoreId));
+                joined = relations.stream().map(PmnActivityStoreRelation::getStoreId).collect(Collectors.toSet());
+            }
             Set<Long> childs = retailCompanyMapper.selectChildList(cs);
             List<PrivilageOrganizationalDomain> domains = privilageOrganizationalDomainMapper.selectList(Wrappers.<PrivilageOrganizationalDomain>lambdaQuery().in(PrivilageOrganizationalDomain::getOrgId, childs).select(PrivilageOrganizationalDomain::getDomainId));
             Set<Long> domainIds = domains.stream().map(PrivilageOrganizationalDomain::getDomainId).collect(Collectors.toSet());
             List<PrivilageDomainEntityDO> entityDOS = privilageDomainEntityDOMapper.selectList(Wrappers.<PrivilageDomainEntityDO>lambdaQuery().in(PrivilageDomainEntityDO::getDomainId, domainIds).eq(PrivilageDomainEntityDO::getType, 3).select(PrivilageDomainEntityDO::getEntityId));
             Set<Long> shopIds = entityDOS.stream().map(PrivilageDomainEntityDO::getEntityId).collect(Collectors.toSet());
+            if(joined.size() > 0) {
+                shopIds.removeAll(joined);
+            }
             if(shopIds.size() > 0){
                 poiStores = poiStoreDOMapper.selectDTOBatchIds(shopIds);
             }
@@ -119,7 +129,6 @@ public class PoiStoreService {
         }
         return poiStores;
     }
-
     /**
      * 查询所有店铺
      *
@@ -132,7 +141,6 @@ public class PoiStoreService {
 
     /**
      * 根据区域id找到店铺集合，若没有，则查用户所有店铺
-     *
      * @param companyId 零售公司ID
      */
     public List<PoiStore> getStoreByCompanyId(long userId,Long companyId){