From 60bad71c7aec1b1157ba17ca368fa506b79b1dca Mon Sep 17 00:00:00 2001 From: zhenghuang <236220500@qq.com> Date: Fri, 22 May 2020 09:12:07 +0800 Subject: [PATCH] swagger mysql --- .../ic/activity/bean/ActivityInstanceVO.java | 4 +- .../impl/PmnActivityInstanceServiceImpl.java | 50 ++++++++++++------- .../impl/PmnActivityScheduleServiceImpl.java | 5 ++ 3 files changed, 39 insertions(+), 20 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 e4538d4..ab01a63 100644 --- a/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java +++ b/src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java @@ -49,8 +49,8 @@ public class ActivityInstanceVO { private List params; @ApiModelProperty(value = "选择的企业列表", required = true) - @NotNull(message = "请选择企业列表") - @Size(min = 1, message = "请选择企业列表") +// @NotNull(message = "请选择企业列表") +// @Size(min = 1, message = "请选择企业列表") private List organizations; @ApiModelProperty(value = "选择的店铺列表", required = true) 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 04dc310..da7387c 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 @@ -1,5 +1,6 @@ package com.kiisoo.ic.activity.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; @@ -9,7 +10,10 @@ import com.kiisoo.ic.activity.service.*; import com.kiisoo.ic.activity.bean.ActivityInstanceVO; 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.CompanyStoreDO; import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; +import com.kiisoo.ic.generalize.mapper.RetailCompanyMapper; import com.kiisoo.ic.generalize.service.RetailCompanyService; import com.kiisoo.ic.store.entity.PoiStore; import org.apache.commons.collections.CollectionUtils; @@ -50,6 +54,15 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpllambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, pmnActivityInstance.getId()).eq(PmnActivityInstanceConfig::getParamId, param.getId())); } + List storeIds = new ArrayList<>(); for (PoiStore store : activityInstanceVO.getStores()) { PmnActivityStoreRelation pmnActivityStoreRelation = new PmnActivityStoreRelation(); pmnActivityStoreRelation.setUpdateTime(new Date()); @@ -114,8 +128,10 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpllambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, pmnActivityInstance.getId()).eq(PmnActivityStoreRelation::getStoreId, store.getId())); } + pmnActivityStoreRelationService.remove(Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, pmnActivityInstance.getId()).notIn(PmnActivityStoreRelation::getStoreId, storeIds)); return saveInstance && saveCase; } @@ -127,25 +143,23 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl pageVO(Long userId, Date startDate, Date endDate, Long organizationId, Long storeId, Integer status, Integer pageNum, Integer pageSize) { Map results = new HashMap<>(); - PageHelper.startPage(pageNum, pageSize); - Set ss = new HashSet<>(); + List shopIds = new ArrayList<>(); - if(userId != null) { - List organizationals = retailCompanyService.listOfRetailCompany(userId, null, 0L); - for (PrivilageOrganizational organizational : organizationals) { - List stores = retailCompanyService.selectShopByCompany(organizational.getId()); - for (PoiStore store : stores) { - ss.add(store.getId()); - } - } - } - Long[] arr; - if(ss.size() <= 0) { - arr = null; - }else { - arr = ss.toArray(new Long[ss.size()]); - } - List activityInstanceVOS = pmnActivityInstanceDOMapper.pageVO(startDate, endDate, organizationId, storeId, status, arr); +// if(userId != null) { +// if (storeId != null) { +// shopIds.add(storeId); +// } else { +// shopIds = privilageDomainService.listUserDatePermission(userId); +// } +// } +// List list = retailCompanyMapper.selectShopIdByRetail(orgId, shopIds); +// +// //查询所有的店铺信息 +// QueryWrapper poiStoreQueryWrapper = new QueryWrapper<>(); +// poiStoreQueryWrapper.in("id", shopIds); +// List list2 = shopIds.size() == 0 ? new ArrayList<>() : poiStoreDOMapper.selectList(poiStoreQueryWrapper); + PageHelper.startPage(pageNum, pageSize); + List activityInstanceVOS = pmnActivityInstanceDOMapper.pageVO(startDate, endDate, organizationId, storeId, status, null); if (CollectionUtils.isEmpty(activityInstanceVOS)) { results.put("this", null); return results; diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java index 30717ba..7a9a88d 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnActivityScheduleServiceImpl.java @@ -98,12 +98,17 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpllambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "appId")); saveUri = pmnActivityPromotionParamService.saveOrUpdate(uri, Wrappers.lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "uri")); + List paramIds = new ArrayList<>(); for (PmnActivityPromotionParam param : activityScheduleVO.getParams()) { param.setPromotionId(pmnActivityPromotion.getId()); param.setAttr(2); + if(param.getId() != null && param.getId() > 0) { + paramIds.add(param.getId()); + } boolean saveParam = pmnActivityPromotionParamService.saveOrUpdate(param); if (!saveParam) throw new RuntimeException("活动类型保存失败"); } + pmnActivityPromotionParamService.remove(Wrappers.lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).notIn(PmnActivityPromotionParam::getId, paramIds).eq(PmnActivityPromotionParam::getAttr, 2)); } return saveActivitySchedule && saveActivityPromotion && saveAppId && saveUri; }