Merge branch 'feature/1003255' into 'master'

feat: [1003255] 立享权益社群板块加头图

See merge request rays/pcloud-book!845

pcloud-service-book/src/main/java/com/pcloud/book/skill/biz/impl/PcloudGroupActivityBizImpl.java

@@ -54,6 +54,7 @@ import com.pcloud.common.utils.NumberUtil;
 import com.pcloud.common.utils.httpclient.UrlUtils;
 import com.pcloud.common.utils.string.StringUtil;
 import com.pcloud.common.utils.string.StringUtilParent;
+import com.pcloud.readercenter.common.enums.YesOrNoNumEnum;
 import com.pcloud.usercenter.party.adviser.service.AdviserService;
 import com.pcloud.usercenter.party.agent.service.AgentService;
 import com.sdk.wxgroup.RobotProcessTypeEnum;
@@ -161,10 +162,12 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
     @Override
     public void saveGroupActivity(SaveGroupActivityRequestVO vo) {
         //校验编号是否重复
+        if(!StringUtil.isEmpty(vo.getNumber())){
             Integer count = pcloudGroupActivityDao.getCountByNumber(vo.getNumber());
             if (count>0){
                 throw new BookBizException(BookBizException.PARAM_IS_ERROR,"参数有误，编号已存在！");
             }
+        }
 
         vo.checkParam();
         PcloudGroupActivity entity = vo.getEntity();
@@ -189,10 +192,12 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         }
 
         //校验编号是否重复
+        if(!StringUtil.isEmpty(vo.getNumber())){
             Integer count = pcloudGroupActivityDao.getCountByNumber(vo.getNumber());
             if (count>0 && (!vo.getNumber().equals(activity.getNumber()))){
                 throw new BookBizException(BookBizException.PARAM_IS_ERROR,"参数有误，编号已存在！");
             }
+        }
         PcloudGroupActivity entity = vo.getEntity();
         Date now = new Date();
         entity.setUpdateUser(vo.getUserId());
@@ -328,7 +333,8 @@ public class PcloudGroupActivityBizImpl implements PcloudGroupActivityBiz {
         if (MapUtils.isEmpty(regionMapMap)) {
             return;
         }
-        recordList.stream().forEach(queryGroupActivityResponseVO -> {
+        //过滤掉第三方社群
+        recordList.stream().filter(e -> !YesOrNoNumEnum.YES.getValue().equals(e.getGroupType())).forEach(queryGroupActivityResponseVO -> {
             RegionMap regionMap = regionMapMap.get(queryGroupActivityResponseVO.getCityCode());
             if (null != regionMap) {
                 queryGroupActivityResponseVO.setCityName(regionMap.getRegionName());

pcloud-service-book/src/main/resources/mapper/skill/PcloudGroupActivityDao.xml

@@ -149,6 +149,7 @@
         </if>
         <if test="cityCode != null">
             and b.city_code = #{cityCode}
+            and a.group_type != 1
         </if>
         order by a.id desc
     </select>
@@ -595,6 +596,7 @@
   WHERE
   a.is_delete = 0 AND a.is_show = 1
   and c.city_code = #{cityCode}
+  and a.group_type != 1
   GROUP BY a.id
   ORDER BY a.id DESC
   </select>