|
@@ -98,7 +98,7 @@ public class GameGiftPackLinkServiceImpl extends ServiceImpl<GameGiftPackLinkMap
|
|
|
//循环构造
|
|
|
return linkList.stream().map(link -> {
|
|
|
GameGiftPackLinkVO vo = BeanUtil.copy(link, GameGiftPackLinkVO.class);
|
|
|
- vo.setConditionDTO(JsonUtil.toObj(link.getCondition(), GameGiftPackConditionDTO.class));
|
|
|
+ vo.setConditionDTO(JsonUtil.toObj(link.getCodeCheck(), GameGiftPackConditionDTO.class));
|
|
|
vo.setCreateByName(userMap.get(link.getCreateBy()));
|
|
|
vo.setUpdateByName(userMap.get(link.getUpdateBy()));
|
|
|
Game game = gameMap.get(link.getGameId());
|
|
@@ -125,7 +125,7 @@ public class GameGiftPackLinkServiceImpl extends ServiceImpl<GameGiftPackLinkMap
|
|
|
public boolean updateGiftPackLink(GameGiftPackLinkUpdateParam param) {
|
|
|
return super.update(new LambdaUpdateWrapper<GameGiftPackLink>()
|
|
|
.set(GameGiftPackLink::getCodeType, param.getCodeType())
|
|
|
- .set(GameGiftPackLink::getCondition, param.getConditionDTO() == null ? null : JsonUtil.toString(param.getConditionDTO()))
|
|
|
+ .set(GameGiftPackLink::getCodeCheck, param.getConditionDTO() == null ? null : JsonUtil.toString(param.getConditionDTO()))
|
|
|
.set(GameGiftPackLink::getUpdateBy, SecurityUtil.getUserId())
|
|
|
.set(GameGiftPackLink::getUpdateTime, LocalDateTime.now())
|
|
|
.eq(GameGiftPackLink::getId, param.getId())
|
|
@@ -172,7 +172,7 @@ public class GameGiftPackLinkServiceImpl extends ServiceImpl<GameGiftPackLinkMap
|
|
|
.configId(configId)
|
|
|
.gameId(param.getGameId())
|
|
|
.codeType(param.getCodeType())
|
|
|
- .condition(JsonUtil.toString(param.getConditionDTO()))
|
|
|
+ .codeCheck(JsonUtil.toString(param.getConditionDTO()))
|
|
|
.codeLink(codeLink)
|
|
|
.createBy(SecurityUtil.getUserId())
|
|
|
.createTime(LocalDateTime.now())
|