Merge branch 'zhuyajie' into 'master'

合并

See merge request rays/pcloud-book!45

pcloud-service-book/src/main/java/com/pcloud/book/advertising/biz/impl/AdvertisingSpaceBizImpl.java

@@ -544,15 +544,15 @@ public class AdvertisingSpaceBizImpl implements AdvertisingSpaceBiz {
         }
         // 校验广告位是否已投放微信群
         List<Long> qrcodeIds = book.getGroups().stream().map(DistributionWechatGroup::getQrcodeId).collect(Collectors.toList());
-        Map<String, Object> paramMap = new HashMap<>();
+        /*Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("adId", book.getAdId());
         paramMap.put("qrcodeIds", qrcodeIds);
         List<Long> existIds = advertisingDistributionBookDao.checkQrcodeIdExist(paramMap);
-        if (!ListUtils.isEmpty(existIds)) {
+        if (!ListUtils.isEmpty(existIds) && !isPlan) {
             Long qrcodeId = existIds.get(0);
             GroupQrcode groupQrcode = groupQrcodeDao.getById(qrcodeId);
             throw new BookBizException(BookBizException.PARAM_IS_ERROR, StringUtil.addBracket(groupQrcode.getGroupName()) + "等" + existIds.size() + "个微信群已投放该广告位！");
-        }
+        }*/
         List<AdvertisingDistributionBook> list = new ArrayList<>();
         Map<Long, Long> agentIdMap = new HashMap<>();
         for (DistributionWechatGroup group : book.getGroups()) {