From f05ae3a261f1647cd56b741d05fe44050af690f0 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 17 Oct 2018 10:51:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B8=B8=E6=88=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E6=89=80=E6=9C=89=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxGameController.java | 13 ---------- .../java/com/iformall/domain/po/WxGame.java | 14 +++++----- .../com/iformall/service/WxGameService.java | 7 ----- .../service/impl/WxGameServiceImpl.java | 26 +++++++------------ 4 files changed, 18 insertions(+), 42 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index 4de8a7314..64e93aaab 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -49,17 +49,4 @@ public class WxGameController extends BaseController { return new ResultData(ErrorCode.GAME_NOT_FOUND); } - @ApiOperation("获取游戏参数(id,gameId必填)") - @GetMapping("getParams") - public ResultData getParams(@ModelAttribute WxGame wxGame) { - if (null == wxGame) wxGame = new WxGame(); - wxGame.setTenantId(getTenantId()); - wxGame.setStatus(EnumGameStatus.STATUS_THROW_IN.getCode()); - WxGame wxGame1 = wxGameService.getParams(wxGame); - if (wxGame1 != null) { - return new ResultData(wxGame1); - } - return new ResultData(ErrorCode.GAME_NOT_FOUND); - } - } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java index 17758c938..b33e21806 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxGame.java @@ -176,12 +176,14 @@ public class WxGame implements Serializable { } public void setGameTemplate(WxGameTemplate gameTemplate) { - this.imgUrl = gameTemplate.getImgUrl(); - this.url = gameTemplate.getUrl(); - this.name = gameTemplate.getName(); - this.optionLimit = gameTemplate.getOptionLimit(); - this.rules = gameTemplate.getRules(); - this.type = gameTemplate.getType(); + if (gameTemplate != null) { + this.imgUrl = gameTemplate.getImgUrl(); + this.url = gameTemplate.getUrl(); + this.name = gameTemplate.getName(); + this.optionLimit = gameTemplate.getOptionLimit(); + this.rules = gameTemplate.getRules(); + this.type = gameTemplate.getType(); + } } public static enum Field { diff --git a/mallinkService/src/main/java/com/iformall/service/WxGameService.java b/mallinkService/src/main/java/com/iformall/service/WxGameService.java index 72c70d969..811d4226c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxGameService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxGameService.java @@ -22,13 +22,6 @@ public interface WxGameService { */ WxGame getOne(WxGame record); - /** - * 获取用户要玩的游戏参数 - * @param record - * @return - */ - WxGame getParams(WxGame record); - /** * 根据Id获得实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index 71f99d892..3242d1230 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -73,20 +73,13 @@ public class WxGameServiceImpl implements WxGameService { } if (wxGame != null) { + wxGame.setCouponIdsList(getParams(wxGame)); return wxGame; } return null; } - @Override - public WxGame getParams(WxGame record) { - WxGame wxGame = null; - try { - wxGame = wxGameMapper.selectOne(record); - } catch (Exception e) { - logger.error(e.getMessage()); - return null; - } + private List getParams(WxGame record) { // 获取已上架的CouponChannel WxCouponChannel couponChannelQ = new WxCouponChannel(); couponChannelQ.setTenantId(record.getTenantId()); @@ -101,7 +94,7 @@ public class WxGameServiceImpl implements WxGameService { // get game's coupon List couponIdsList = new ArrayList(); - JSONArray couponChannelIds = JSON.parseArray(wxGame.getCouponIds()); + JSONArray couponChannelIds = JSON.parseArray(record.getCouponIds()); for(int i=0; i 0) { - wxGame.setCouponIdsList(couponIdsList); - return wxGame; - } - return null; + return couponIdsList; } @Override public WxGame getById(Long id) { - return wxGameMapper.selectByPrimaryKey(id); + WxGame game = wxGameMapper.selectByPrimaryKey(id); + if (game != null) { + game.setGameTemplate(wxGameTemplateService.getById(game.getGameId())); + game.setCouponIdsList(getParams(game)); + } + return game; } @Override