From 67783cc8ea4578a6ea473da1ab1dbcc12c23d0b0 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 4 Jan 2021 14:25:46 +0800 Subject: [PATCH 1/3] youxi --- .../main/java/com/iformall/service/impl/WxGameServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 247a3f493..d69dc7ad0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -185,6 +185,7 @@ public class WxGameServiceImpl implements WxGameService { } map.put("playAble",playAble); + logger.info(map.toString()); return new ResultData(map); } From b8524bbcfd3b9910efecca0fb4bf59001c232b22 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 4 Jan 2021 15:03:19 +0800 Subject: [PATCH 2/3] youxi --- .../java/com/iformall/controller/WxGameController.java | 4 +++- .../com/iformall/service/impl/WxGameServiceImpl.java | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index 75e85b649..323cf6e87 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -1,5 +1,6 @@ package com.iformall.controller; +import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.*; @@ -74,6 +75,7 @@ public class WxGameController extends BaseController { } + @AuthIgnore @ApiOperation("添加游戏参与记录") @GetMapping("getCount") @ApiImplicitParams({ @@ -81,7 +83,7 @@ public class WxGameController extends BaseController { public ResultData getCount(String gameId) { try { Long gameIdL = Long.valueOf(gameId); - return wxGameService.getCount(gameIdL,getMemberId()); + return wxGameService.getCount(505906397881098240L,494036479166963712L); } catch (Exception e){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } 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 d69dc7ad0..1f037b510 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -156,7 +156,10 @@ public class WxGameServiceImpl implements WxGameService { int playLimit = wxGame.getPlayLimit(); int playCreditLimit = wxGame.getPlayCreditLimit(); - int playCredit = wxGame.getPlayCredit(); + int playCredit = 0; + if(playCreditLimit >= 0){ + playCredit = wxGame.getPlayCredit(); + } int AwardLimit = wxGame.getAwardLimit(); int playCount = wxGameActionLogMapper.getPlayCount(wxGameActionLog); int playCreditCount = wxGameActionLogMapper.getPlayCreditCount(wxGameActionLog); @@ -168,7 +171,9 @@ public class WxGameServiceImpl implements WxGameService { Map map = new HashMap(); map.put("playLimit",playLimit);//免费次数限制(为0是不限制次数,为-1是不能玩) map.put("playCreditLimit",playCreditLimit);//消耗积分次数限制(为0是不限制次数,为-1是不能玩) - map.put("playCredit",playCredit);//消耗积分数量 + if(playCreditLimit >= 0){ + map.put("playCredit",playCredit);//消耗积分数量 + } map.put("AwardLimit",AwardLimit);//中奖次数限制(为0是不限制次数) map.put("playCount",playCount);//当前玩的免费次数 map.put("playCreditCount",playCreditCount);//当前玩的消耗积分次数 From 45838f7ff00a8d97a0724371c909b065927f0e00 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 4 Jan 2021 15:16:21 +0800 Subject: [PATCH 3/3] youxi --- .../main/java/com/iformall/controller/WxGameController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index 323cf6e87..75e85b649 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -1,6 +1,5 @@ package com.iformall.controller; -import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.*; @@ -75,7 +74,6 @@ public class WxGameController extends BaseController { } - @AuthIgnore @ApiOperation("添加游戏参与记录") @GetMapping("getCount") @ApiImplicitParams({ @@ -83,7 +81,7 @@ public class WxGameController extends BaseController { public ResultData getCount(String gameId) { try { Long gameIdL = Long.valueOf(gameId); - return wxGameService.getCount(505906397881098240L,494036479166963712L); + return wxGameService.getCount(gameIdL,getMemberId()); } catch (Exception e){ return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); }