Merge branch 'dev_v1.3.4_20220914'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -722,8 +722,9 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
         List<Long> collect = saveOrUpdateRewardDto.getUpdateRewardDtoList().stream()
                 .map(ActivityPlanReward::getRewardId).distinct().collect(Collectors.toList());
 
+        String clientType = activityPlan.getActivityClient().getCode();
         long validRewardNums = activityRewardService.listByIds(collect).stream()
-                .filter(x -> x.getRewardClient().equals(activityPlan.getActivityClient().getCode()))
+                .filter(x -> Lists.newArrayList(x.getRewardClient().split(",")).contains(clientType))
                 .count();
         if (saveOrUpdateRewardDto.getUpdateRewardDtoList().size() != validRewardNums) {
             throw new BizException("添加奖品与活动客户端不匹配");