From 1cf65d941ac357b0dc3f4f62e3a12af3e72788b5 Mon Sep 17 00:00:00 2001 From: zhenghuang <236220500@qq.com> Date: Thu, 28 May 2020 10:18:16 +0800 Subject: [PATCH] swagger mysql --- .../event/ActivityInstanceCreatedEvent.java | 10 +++++++- .../listener/GenerateQRCodeListener.java | 25 +++++++++++++++++-- .../impl/PmnActivityInstanceServiceImpl.java | 19 +------------- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/kiisoo/ic/activity/event/ActivityInstanceCreatedEvent.java b/src/main/java/com/kiisoo/ic/activity/event/ActivityInstanceCreatedEvent.java index 4f3fc47..a6cf10d 100644 --- a/src/main/java/com/kiisoo/ic/activity/event/ActivityInstanceCreatedEvent.java +++ b/src/main/java/com/kiisoo/ic/activity/event/ActivityInstanceCreatedEvent.java @@ -1,5 +1,6 @@ package com.kiisoo.ic.activity.event; +import com.kiisoo.ic.activity.bean.ActivityInstanceVO; import com.kiisoo.ic.activity.entity.PmnActivityInstance; import org.springframework.context.ApplicationEvent; @@ -7,12 +8,19 @@ public class ActivityInstanceCreatedEvent extends ApplicationEvent { private PmnActivityInstance pmnActivityInstance; - public ActivityInstanceCreatedEvent(Object source, PmnActivityInstance pmnActivityInstance) { + private ActivityInstanceVO activityInstanceVO; + + public ActivityInstanceCreatedEvent(Object source, PmnActivityInstance pmnActivityInstance, ActivityInstanceVO activityInstanceVO) { super(source); this.pmnActivityInstance = pmnActivityInstance; + this.activityInstanceVO = activityInstanceVO; } public PmnActivityInstance instance() { return this.pmnActivityInstance; } + + public ActivityInstanceVO instanceVO() { + return this.activityInstanceVO; + } } diff --git a/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java b/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java index 033b6fd..3de79ea 100644 --- a/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java +++ b/src/main/java/com/kiisoo/ic/activity/listener/GenerateQRCodeListener.java @@ -1,14 +1,17 @@ package com.kiisoo.ic.activity.listener; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.kiisoo.ic.activity.bean.ActivityInstanceVO; import com.kiisoo.ic.activity.entity.PmnActivityInstance; import com.kiisoo.ic.activity.entity.PmnActivityStoreRelation; import com.kiisoo.ic.activity.entity.PmnPromotionSrc; import com.kiisoo.ic.activity.event.ActivityInstanceCreatedEvent; import com.kiisoo.ic.activity.service.IPmnActivityStoreRelationService; import com.kiisoo.ic.activity.service.IPmnPromotionSrcService; +import com.kiisoo.ic.generalize.entity.PrivilageOrganizational; import com.kiisoo.ic.store.entity.PoiStore; import com.kiisoo.ic.store.entity.PoiStoreStaff; +import com.kiisoo.ic.store.mapper.PoiStoreDOMapper; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.service.PoiStoreService; import com.kiisoo.ic.store.service.PoiStoreStaffService; @@ -33,6 +36,8 @@ public class GenerateQRCodeListener { private IPmnActivityStoreRelationService pmnActivityStoreRelationService; @Autowired private PoiStoreStaffDOMapper poiStoreStaffDOMapper; + @Autowired + private PoiStoreDOMapper poiStoreDOMapper; @Async @EventListener //后台创建活动实例并绑定店铺之后，给店铺批量生成二维码 @@ -40,8 +45,24 @@ public class GenerateQRCodeListener { log.info("生成店铺码: {}", event.instance()); try { PmnActivityInstance instance = event.instance(); - List relationList = pmnActivityStoreRelationService.list(Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, instance.getId()).select(PmnActivityStoreRelation::getStoreId).eq(PmnActivityStoreRelation::getStatus, 1)); - List storeIds = relationList.stream().map(PmnActivityStoreRelation::getStoreId).collect(Collectors.toList()); + ActivityInstanceVO activityInstanceVO = event.instanceVO(); + List storeIds = new ArrayList<>(); + for (PoiStore store : activityInstanceVO.getStores()) { + PrivilageOrganizational org = poiStoreDOMapper.findStoreCompany(store.getId()); + PmnActivityStoreRelation pmnActivityStoreRelation = new PmnActivityStoreRelation(); + pmnActivityStoreRelation.setUpdateTime(new Date()); + pmnActivityStoreRelation.setStoreId(store.getId()); + pmnActivityStoreRelation.setInstanceId(instance.getId()); + pmnActivityStoreRelation.setCreateTime(new Date()); + pmnActivityStoreRelation.setStatus(instance.getStatus().intValue()); + pmnActivityStoreRelation.setCaseId(instance.getId()); + pmnActivityStoreRelation.setOrgId(org.getId()); + pmnActivityStoreRelationService.saveOrUpdate(pmnActivityStoreRelation, Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, instance.getId()).eq(PmnActivityStoreRelation::getStoreId, store.getId())); + storeIds.add(store.getId()); + } + if (storeIds.size() > 0) { + pmnActivityStoreRelationService.remove(Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, instance.getId()).notIn(PmnActivityStoreRelation::getStoreId, storeIds)); + } log.info("storeIds: {}", storeIds); List staffs = poiStoreStaffDOMapper.selectList(Wrappers.lambdaQuery().in(PoiStoreStaff::getStoreId, storeIds).eq(PoiStoreStaff::getType, 1).eq(PoiStoreStaff::getStatus, 1)); log.info("staffs: {}", staffs); 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 1026c77..9279a69 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 @@ -139,24 +139,7 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpllambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, pmnActivityInstance.getId()).eq(PmnActivityInstanceConfig::getParamId, param.getId())); } - List storeIds = new ArrayList<>(); - for (PoiStore store : activityInstanceVO.getStores()) { - PrivilageOrganizational org = poiStoreDOMapper.findStoreCompany(store.getId()); - PmnActivityStoreRelation pmnActivityStoreRelation = new PmnActivityStoreRelation(); - pmnActivityStoreRelation.setUpdateTime(new Date()); - pmnActivityStoreRelation.setStoreId(store.getId()); - pmnActivityStoreRelation.setInstanceId(pmnActivityInstance.getId()); - pmnActivityStoreRelation.setCreateTime(new Date()); - pmnActivityStoreRelation.setStatus(pmnActivityInstance.getStatus().intValue()); - pmnActivityStoreRelation.setCaseId(pmnActivityPromotionCase.getId()); - pmnActivityStoreRelation.setOrgId(org.getId()); - pmnActivityStoreRelationService.saveOrUpdate(pmnActivityStoreRelation, Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, pmnActivityInstance.getId()).eq(PmnActivityStoreRelation::getStoreId, store.getId())); - storeIds.add(store.getId()); - } - if (storeIds.size() > 0) { - pmnActivityStoreRelationService.remove(Wrappers.lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, pmnActivityInstance.getId()).notIn(PmnActivityStoreRelation::getStoreId, storeIds)); - } - applicationContext.publishEvent(new ActivityInstanceCreatedEvent(this, pmnActivityInstance)); + applicationContext.publishEvent(new ActivityInstanceCreatedEvent(this, pmnActivityInstance, activityInstanceVO)); return saveInstance && saveCase; }