1

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

@@ -7,6 +7,7 @@ import com.kiisoo.ic.activity.mapper.PmnActivityStoreRelationMapper;
 import com.kiisoo.ic.activity.service.IPmnActivityInstanceService;
 import com.kiisoo.ic.activity.service.IPmnActivityScheduleService;
 import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService;
+import com.kiisoo.ic.activity.service.IPmnPromotionSrcService;
 import com.kiisoo.ic.common.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -38,6 +39,8 @@ public class ActivityInstanceController extends BaseController {
     IPmnActivityInstanceService pmnActivityInstanceService;
     @Resource
     IPmnActivityScheduleService pmnActivityScheduleService;
+    @Resource
+    IPmnPromotionSrcService pmnPromotionSrcService;
 
     @ApiOperation(value = "活动实例分页列表")
     @GetMapping(value = "/list")
@@ -51,7 +54,7 @@ public class ActivityInstanceController extends BaseController {
             @ApiImplicitParam(name = "pageNum", value = "当前页数", dataType = "int", paramType = "form"),
             @ApiImplicitParam(name = "pageSize", value = "每页条数", defaultValue = "10", dataType = "int", paramType = "form"),
     })
-    public Map<String, Object> instanceList(Long userId, String startDate, String endDate, Long organizationId, Long storeId, Integer status, @RequestParam("pageNum") int pageNum, @RequestParam("pageSize")int pageSize) {
+    public Map<String, Object> instanceList(Long userId, String startDate, String endDate, Long organizationId, Long storeId, Integer status, @RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) {
         // TODO 需要根据当前用户角色分开查询
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         try {
@@ -61,6 +64,22 @@ public class ActivityInstanceController extends BaseController {
             return fail();
         }
     }
+    @ApiOperation(value = "店铺码分页列表")
+    @GetMapping(value = "/StoreCode")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "userId", value = "用户ID", dataType = "int", paramType = "form"),
+            @ApiImplicitParam(name = "instanceId", value = "活动实例ID", dataType = "string", paramType = "form"),
+            @ApiImplicitParam(name = "pageNum", value = "当前页数", dataType = "int", paramType = "form"),
+            @ApiImplicitParam(name = "pageSize", value = "每页条数", defaultValue = "10", dataType = "int", paramType = "form"),
+    })
+    public Map<String, Object> storeCode(Long userId, Long instanceId, @RequestParam("pageNum") int pageNum, @RequestParam("pageSize") int pageSize) {
+        try {
+            return data(pmnPromotionSrcService.pageStoreCode(userId, instanceId, pageNum, pageSize));
+        } catch (Exception e) {
+            log.error("查询出错", e);
+            return fail();
+        }
+    }
 
     @ApiOperation(value = "根据活动池新建/编辑实例")
     @PostMapping(value = "/save")
@@ -126,7 +145,7 @@ public class ActivityInstanceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "活动id", dataType = "int", paramType = "form"),
     })
-    public Map<String, Object> codeList(){
+    public Map<String, Object> codeList() {
         return data(null);
     }
 }

src/main/java/com/kiisoo/ic/activity/service/IPmnPromotionSrcService.java

@@ -5,6 +5,7 @@ import com.kiisoo.ic.activity.bean.PromotionSrcVO;
 import com.kiisoo.ic.activity.entity.PmnPromotionSrc;
 import com.kiisoo.ic.store.entity.PoiStoreStaff;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,6 +18,7 @@ import java.util.List;
  */
 public interface IPmnPromotionSrcService extends IService<PmnPromotionSrc> {
     List<PromotionSrcVO> listUserCodes(Long userId) throws Exception;
+    List<PromotionSrcVO> pageStoreCode(Long userId, Long instanceId, Integer pageNum, Integer pageSize) throws Exception;
     String saveCodeFile(String fileUrl, String code);
     boolean createCode(PoiStoreStaff staff, Long instanceId);
 }

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

@@ -2,14 +2,18 @@ package com.kiisoo.ic.activity.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
 import com.kiisoo.ic.activity.bean.ActivityInstanceVO;
 import com.kiisoo.ic.activity.bean.PromotionSrcVO;
 import com.kiisoo.ic.activity.entity.PmnActivityInstance;
 import com.kiisoo.ic.activity.entity.PmnActivityInstanceConfig;
+import com.kiisoo.ic.activity.entity.PmnActivityStoreRelation;
 import com.kiisoo.ic.activity.entity.PmnPromotionSrc;
 import com.kiisoo.ic.activity.mapper.PmnPromotionSrcDOMapper;
 import com.kiisoo.ic.activity.service.IPmnActivityInstanceConfigService;
 import com.kiisoo.ic.activity.service.IPmnActivityInstanceService;
+import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService;
 import com.kiisoo.ic.activity.service.IPmnPromotionSrcService;
 import com.kiisoo.ic.constants.Constants;
 import com.kiisoo.ic.employee.entity.PrivilageCpUserDO;
@@ -30,6 +34,7 @@ import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper;
 import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper;
 import com.kiisoo.ic.system.service.PrivilageAccountService;
 import com.kiisoo.ic.webappmy.vo.StafferInfoVO;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.shiro.crypto.hash.SimpleHash;
 import org.springframework.beans.BeanUtils;
@@ -41,9 +46,8 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.net.URL;
 import java.sql.Wrapper;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * <p>
@@ -74,6 +78,8 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
     private IPmnActivityInstanceConfigService pmnActivityInstanceConfigService;
     @Autowired
     private IPmnPromotionSrcService pmnPromotionSrcService;
+    @Autowired
+    private IPmnActivityStoreRelationService pmnActivityStoreRelationService;
 
     @Override
     @Transactional
@@ -92,13 +98,16 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
         }
         PrivilageRoleDO roleDO = privilageRoleDOMapper.selectRoleName(userId);
         Long type;
-        if (roleDO.getCode().equals(RoleEnum.getRoleByCode("DZ-DIANZHANG"))) {
+        if (roleDO.getCode().equals("DZ-DIANZHANG")) {
             type = 2L;
-        } else if (roleDO.getCode().equals(RoleEnum.getRoleByCode("DZ-DAOGOU"))) {
+        } else if (roleDO.getCode().equals("DZ-DAOGOU")) {
             type = 1L;
         } else {
             return lists;
         }
+        if(type.equals(2L)) {
+            userId = staff.getStoreId();
+        }
         List<PmnPromotionSrc> srcs = list(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getPromoterId, userId).eq(PmnPromotionSrc::getType, type));
         for (PmnPromotionSrc src : srcs) {
             File codeFile = new File("activity/" + src.getCode() + ".png");
@@ -164,6 +173,28 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl<PmnPromotionSrcDOMap
         }
     }
 
+    @Override
+    public List<PromotionSrcVO> pageStoreCode(Long userId, Long instanceId, Integer pageNum, Integer pageSize) throws Exception {
+        Map<String, Object> results = new HashMap<>();
+        PageHelper.startPage(pageNum, pageSize);
+        List<PmnActivityStoreRelation> storeRelations = pmnActivityStoreRelationService.list(Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, instanceId));
+        if (CollectionUtils.isEmpty(storeRelations)) {
+            results.put("this", null);
+        }
+        AtomicInteger number = new AtomicInteger(1 + ((pageNum - 1) * pageSize));
+        for (PmnActivityStoreRelation store : storeRelations) {
+            PmnPromotionSrc src = getOne(Wrappers.<PmnPromotionSrc>lambdaQuery().eq(PmnPromotionSrc::getPromoterId, store.getStoreId()).eq(PmnPromotionSrc::getInstanceId, instanceId).eq(PmnPromotionSrc::getType, 2));
+            if(src == null || src.getCode() == null) {
+                File codeFile = new File("activity/" + src.getCode() + ".png");
+
+            }
+        }
+        //求分页总数
+//        Page<ActivityInstanceVO> pageList = (Page<ActivityInstanceVO>) storeRelations;
+//        Long totalSize = pageList.getTotal();
+        return null;
+    }
+
     @Override
     public String saveCodeFile(String fileUrl, String code) {
         try {

src/main/resources/application-dev.yml

@@ -5,6 +5,8 @@ logging:
 
 mybatis:
   mapperLocations: classpath:mapper/*.xml
+  configuration:
+     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 spring:
   datasource:

src/main/resources/mapper/activity/PmnActivityInstanceDOMapper.xml

@@ -24,8 +24,16 @@ select * from pmn_activity_promotion_param where id in(select param_id from pmn_
     </select>
 
     <select id="selectStoresByInstanceId" parameterType="int"
-            resultType="com.kiisoo.ic.store.entity.PoiStore">
-select * from poi_store where id in(select store_id from pmn_activity_store_relation where instance_id=#{instanceId})
+            resultType="com.kiisoo.ic.store.bean.PoiStoreDTO">
+        select t.*,
+                t1.domain_id,
+                t2.org_id AS company_id,
+                t3.parent_id from poi_store t
+                LEFT JOIN privilage_domain_entity t1 ON t.id = t1.entity_id
+                LEFT JOIN privilage_organizational_domain t2 ON t1.domain_id = t2.domain_id
+                LEFT JOIN privilage_organizational t3 ON t2.org_id = t3.id
+         where
+         t.id in(select store_id from pmn_activity_store_relation where instance_id=#{instanceId})
     </select>
 
     <select id="pageVO" resultMap="activityInstanceVOMap">