|
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.zanxiang.erp.base.ErpServer;
|
|
|
import com.zanxiang.erp.base.rpc.ISysUserRpc;
|
|
|
import com.zanxiang.erp.security.util.SecurityUtil;
|
|
|
+import com.zanxiang.game.module.manage.enums.ExcludeTagsEnum;
|
|
|
import com.zanxiang.game.module.manage.pojo.dto.GameDTO;
|
|
|
import com.zanxiang.game.module.manage.pojo.params.GamePolicyConfigAddOrUpdateParam;
|
|
|
import com.zanxiang.game.module.manage.pojo.params.GamePolicyConfigListParam;
|
|
@@ -85,6 +86,7 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
|
|
|
.configParam(configParam)
|
|
|
.configExplain(param.getConfigExplain())
|
|
|
.userIds(CollectionUtils.isEmpty(param.getUserIds()) ? null : StringUtils.join(param.getUserIds().toArray(), ","))
|
|
|
+ .tagIds(CollectionUtils.isEmpty(param.getTagIds()) ? null : StringUtils.join(param.getTagIds().toArray(), ","))
|
|
|
.updateBy(sysUserId)
|
|
|
.updateTime(now)
|
|
|
.build();
|
|
@@ -143,6 +145,17 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ //排除标签名称
|
|
|
+ StringBuilder tagNameStr = new StringBuilder();
|
|
|
+ if (StringUtils.isNotBlank(vo.getTagIds())) {
|
|
|
+ String[] tagIds = vo.getTagIds().split(",");
|
|
|
+ for (int i = 0; i < tagIds.length; i++) {
|
|
|
+ tagNameStr.append(ExcludeTagsEnum.getTagName(Integer.valueOf(tagIds[i])));
|
|
|
+ if (i != tagIds.length -1) {
|
|
|
+ tagNameStr.append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return GamePolicyConfigListVO.builder()
|
|
|
.id(vo.getId())
|
|
|
.superGameId(vo.getSuperGameId())
|
|
@@ -154,6 +167,7 @@ public class GamePolicyConfigServiceImpl extends ServiceImpl<GamePolicyConfigMap
|
|
|
.timeCondition(StringUtils.isBlank(timeCondition) ? null : timeCondition)
|
|
|
.configExplain(vo.getConfigExplain())
|
|
|
.userNameStr(StringUtils.isBlank(userNameStr.toString()) ? null : userNameStr.toString())
|
|
|
+ .tagsNameStr(StringUtils.isBlank(tagNameStr.toString()) ? null : tagNameStr.toString())
|
|
|
.createBy(vo.getCreateBy())
|
|
|
.createName(sysUserRpc.getById(vo.getCreateBy()).getData().getNickname())
|
|
|
.createTime(vo.getCreateTime())
|