From 00124b159234635aca5d20f2545a24a4763e087b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com>
Date: Thu, 21 May 2020 23:28:41 +0800
Subject: [PATCH] 1

---
 .../ic/activity/bean/ActivityInstanceVO.java  |  3 +++
 .../service/IPmnActivityInstanceService.java  |  3 ++-
 .../impl/PmnActivityInstanceServiceImpl.java  | 21 +++++++++++++------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java
index 745652e..e4538d4 100644
--- a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java
+++ b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java
@@ -25,6 +25,9 @@ public class ActivityInstanceVO {
     @NotNull(message = "请输入活动池ID")
     private Long scheduleId;
 
+    @ApiModelProperty(value = "活动池信息", hidden = true)
+    private ActivityScheduleVO scheduleVO;
+
 
     @ApiModelProperty(value = "活动名称", required = true)
     @NotBlank(message = "请输入活动名称")
diff --git a/src/main/java/com/kiisoo/ic/activity/service/IPmnActivityInstanceService.java b/src/main/java/com/kiisoo/ic/activity/service/IPmnActivityInstanceService.java
index 03f23e7..c1ce61d 100644
--- a/src/main/java/com/kiisoo/ic/activity/service/IPmnActivityInstanceService.java
+++ b/src/main/java/com/kiisoo/ic/activity/service/IPmnActivityInstanceService.java
@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -21,7 +22,7 @@ public interface IPmnActivityInstanceService extends IService<PmnActivityInstanc
 
     ActivityInstanceVO getVO(Long id);
 
-    List<ActivityInstanceVO> pageVO(Long userId, Date startDate, Date endDate, Long organizationId, Long storeId, Integer status, Integer pageNum, Integer pageSize);
+    Map<String, Object> pageVO(Long userId, Date startDate, Date endDate, Long organizationId, Long storeId, Integer status, Integer pageNum, Integer pageSize);
 
     boolean removeInstance(Long id);
 }
diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java
index 75dc556..04dc310 100644
--- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java
+++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityInstanceServiceImpl.java
@@ -3,6 +3,7 @@ package com.kiisoo.ic.activity.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.kiisoo.ic.activity.entity.*;
 import com.kiisoo.ic.activity.service.*;
 import com.kiisoo.ic.activity.bean.ActivityInstanceVO;
@@ -11,14 +12,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.kiisoo.ic.generalize.entity.PrivilageOrganizational;
 import com.kiisoo.ic.generalize.service.RetailCompanyService;
 import com.kiisoo.ic.store.entity.PoiStore;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -34,6 +33,9 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
     @Autowired
     private IPmnActivityInstanceService pmnActivityInstanceService;
 
+    @Autowired
+    private IPmnActivityScheduleService pmnActivityScheduleService;
+
     @Autowired
     private IPmnActivityPromotionCaseService pmnActivityPromotionCaseService;
 
@@ -123,7 +125,8 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
     }
 
     @Override
-    public List<ActivityInstanceVO> pageVO(Long userId, Date startDate, Date endDate, Long organizationId, Long storeId, Integer status, Integer pageNum, Integer pageSize) {
+    public Map<String, Object> pageVO(Long userId, Date startDate, Date endDate, Long organizationId, Long storeId, Integer status, Integer pageNum, Integer pageSize) {
+        Map<String, Object> results = new HashMap<>();
         PageHelper.startPage(pageNum, pageSize);
         Set<Long> ss = new HashSet<>();
 
@@ -143,16 +146,22 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
             arr = ss.toArray(new Long[ss.size()]);
         }
         List<ActivityInstanceVO> activityInstanceVOS = pmnActivityInstanceDOMapper.pageVO(startDate, endDate, organizationId, storeId, status, arr);
+        if (CollectionUtils.isEmpty(activityInstanceVOS)) {
+            results.put("this", null);
+            return results;
+        }
         AtomicInteger number = new AtomicInteger(1 + ((pageNum - 1) * pageSize));
         //求分页总数
         Page<ActivityInstanceVO> pageList = (Page<ActivityInstanceVO>) activityInstanceVOS;
         Long totalSize = pageList.getTotal();
         for (ActivityInstanceVO m : activityInstanceVOS) {
+            m.setScheduleVO(pmnActivityScheduleService.getVO(m.getScheduleId()));
             m.setTotalSize(totalSize);
             m.setNumber(number.get());
             number.incrementAndGet();
         }
-        return activityInstanceVOS;
+        results.put("this", new PageInfo<>(activityInstanceVOS));
+        return results;
     }
 
     @Override