swagger mysql

src/main/java/com/kiisoo/ic/activity/bean/ActivityInstanceVO.java

@@ -49,8 +49,8 @@ public class ActivityInstanceVO {
     private List<PmnActivityPromotionParam> params;
 
     @ApiModelProperty(value = "选择的企业列表", required = true)
-    @NotNull(message = "请选择企业列表")
+//    @NotNull(message = "请选择企业列表")
-    @Size(min = 1, message = "请选择企业列表")
+//    @Size(min = 1, message = "请选择企业列表")
     private List<PrivilageOrganizational> organizations;
 
     @ApiModelProperty(value = "选择的店铺列表", required = true)

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 ServiceImpl<PmnActivityInsta
     @Autowired
     private PmnActivityInstanceDOMapper pmnActivityInstanceDOMapper;
 
+    @Autowired
+    private RetailCompanyMapper retailCompanyMapper;
+
+    /**
+     * 用户权限mapper
+     */
+    @Autowired
+    private PrivilageDomainService privilageDomainService;
+
     @Transactional
     public boolean saveVO(ActivityInstanceVO activityInstanceVO, boolean isTerminate) {
         // TODO 创建活动实例的时候，自动关联一个 activity_promotion_case 一对一关系
@@ -106,6 +119,7 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
             config.setType(Long.valueOf(param.getType()));
             pmnActivityInstanceConfigService.saveOrUpdate(config, Wrappers.<PmnActivityInstanceConfig>lambdaQuery().eq(PmnActivityInstanceConfig::getInstanceId, pmnActivityInstance.getId()).eq(PmnActivityInstanceConfig::getParamId, param.getId()));
         }
+        List<Long> storeIds = new ArrayList<>();
         for (PoiStore store : activityInstanceVO.getStores()) {
             PmnActivityStoreRelation pmnActivityStoreRelation = new PmnActivityStoreRelation();
             pmnActivityStoreRelation.setUpdateTime(new Date());
@@ -114,8 +128,10 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
             pmnActivityStoreRelation.setCreateTime(new Date());
             pmnActivityStoreRelation.setStatus(pmnActivityInstance.getStatus().intValue());
             pmnActivityStoreRelation.setCaseId(pmnActivityPromotionCase.getId());
+            storeIds.add(store.getId());
             pmnActivityStoreRelationService.saveOrUpdate(pmnActivityStoreRelation, Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, pmnActivityInstance.getId()).eq(PmnActivityStoreRelation::getStoreId, store.getId()));
         }
+        pmnActivityStoreRelationService.remove(Wrappers.<PmnActivityStoreRelation>lambdaQuery().eq(PmnActivityStoreRelation::getInstanceId, pmnActivityInstance.getId()).notIn(PmnActivityStoreRelation::getStoreId, storeIds));
         return saveInstance && saveCase;
     }
 
@@ -127,25 +143,23 @@ public class PmnActivityInstanceServiceImpl extends ServiceImpl<PmnActivityInsta
     @Override
     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);
+        List<Long> shopIds = new ArrayList<>();
-        Set<Long> ss = new HashSet<>();
 
-        if(userId != null) {
+//        if(userId != null) {
-            List<PrivilageOrganizational> organizationals = retailCompanyService.listOfRetailCompany(userId, null, 0L);
+//            if (storeId != null) {
-            for (PrivilageOrganizational organizational : organizationals) {
+//                shopIds.add(storeId);
-                List<PoiStore> stores = retailCompanyService.selectShopByCompany(organizational.getId());
+//            } else {
-                for (PoiStore store : stores) {
+//                shopIds = privilageDomainService.listUserDatePermission(userId);
-                    ss.add(store.getId());
+//            }
-                }
+//        }
-            }
+//        List<CompanyStoreDO> list = retailCompanyMapper.selectShopIdByRetail(orgId, shopIds);
-        }
+//
-        Long[] arr;
+//        //查询所有的店铺信息
-        if(ss.size() <= 0) {
+//        QueryWrapper<PoiStore> poiStoreQueryWrapper = new QueryWrapper<>();
-            arr = null;
+//        poiStoreQueryWrapper.in("id", shopIds);
-        }else {
+//        List<PoiStore> list2 = shopIds.size() == 0 ? new ArrayList<>() : poiStoreDOMapper.selectList(poiStoreQueryWrapper);
-            arr = ss.toArray(new Long[ss.size()]);
+        PageHelper.startPage(pageNum, pageSize);
-        }
+        List<ActivityInstanceVO> activityInstanceVOS = pmnActivityInstanceDOMapper.pageVO(startDate, endDate, organizationId, storeId, status, null);
-        List<ActivityInstanceVO> activityInstanceVOS = pmnActivityInstanceDOMapper.pageVO(startDate, endDate, organizationId, storeId, status, arr);
         if (CollectionUtils.isEmpty(activityInstanceVOS)) {
             results.put("this", null);
             return results;

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

@@ -98,12 +98,17 @@ public class PmnActivityScheduleServiceImpl extends ServiceImpl<PmnActivitySched
             uri.setDefaultVal(activityScheduleVO.getUri());
             saveAppId = pmnActivityPromotionParamService.saveOrUpdate(appId, Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "appId"));
             saveUri = pmnActivityPromotionParamService.saveOrUpdate(uri, Wrappers.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).eq(PmnActivityPromotionParam::getAttr, 1).eq(PmnActivityPromotionParam::getName, "uri"));
+            List<Long> 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.<PmnActivityPromotionParam>lambdaQuery().eq(PmnActivityPromotionParam::getPromotionId, pmnActivityPromotion.getId()).notIn(PmnActivityPromotionParam::getId, paramIds).eq(PmnActivityPromotionParam::getAttr, 2));
         }
         return saveActivitySchedule && saveActivityPromotion && saveAppId && saveUri;
     }