From cbc884e533724a6c7732dbc36edc2851c3435edb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E7=9A=87?= <236220500@qq.com> Date: Sun, 24 May 2020 14:17:54 +0800 Subject: [PATCH] 1 --- .../ic/activity/bean/PromotionSrcVO.java | 4 +++ .../impl/PmnPromotionSrcServiceImpl.java | 25 ++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java index 4befca5..c03d127 100644 --- a/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java +++ b/src/main/java/com/kiisoo/ic/activity/bean/PromotionSrcVO.java @@ -3,9 +3,11 @@ package com.kiisoo.ic.activity.bean; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.kiisoo.ic.store.entity.PoiStoreStaff; import lombok.Data; import java.util.Date; +import java.util.List; /** */ @@ -25,6 +27,8 @@ public class PromotionSrcVO { private PromotionFriendsSrcVO friendsSrc; + private List storeStaffs; + private Long caseId; private Long status; 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 21768a7..588f8fe 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 @@ -1,8 +1,10 @@ package com.kiisoo.ic.activity.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; @@ -48,6 +50,7 @@ import java.net.URL; import java.sql.Wrapper; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; /** *

@@ -133,6 +136,26 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + //如果有店铺则查店铺 + wrapper.eq("store_id", staff.getStoreId()); + //状态有效 + wrapper.eq("status", 1); + wrapper.ne("user_id", 0); + wrapper.orderByDesc("id"); + wrapper.select("id"); + //返回店铺对应的导购 + List poiStoreStaffs = poiStoreStaffDOMapper.selectList(wrapper); + List userIds = poiStoreStaffs.stream().map(PoiStoreStaff::getId).collect(Collectors.toList()); + List staffSrcs = pmnPromotionSrcService.list(Wrappers.lambdaQuery().in(PmnPromotionSrc::getPromoterId, userIds).eq(PmnPromotionSrc::getType, 1).select(PmnPromotionSrc::getPromoterId).eq(PmnPromotionSrc::getInstanceId, src.getInstanceId())); + List staffSrcUsers = staffSrcs.stream().map(PmnPromotionSrc::getPromoterId).collect(Collectors.toList()); + List storeStaffs; + if(userIds.size() > 0) { + storeStaffs = poiStoreStaffDOMapper.selectBatchIds(staffSrcUsers); + vo.setStoreStaffs(storeStaffs); + } + } lists.add(vo); } return lists;