From f763381df8c8d6740be356ded4657823388bed9e Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 15 Mar 2019 11:24:39 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B8=B8=E6=88=8F][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AE=A1=E6=95=B0=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxGameController.java | 3 +-- .../service/impl/WxGameServiceImpl.java | 17 +++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index a9bb73413..15e9b487f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -67,8 +67,7 @@ public class WxGameController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - wxGameService.addActionLog(getUserId(), gameIdL, orderIdL); - return new ResultData(); + return wxGameService.addActionLog(getUserId(), gameIdL, orderIdL); } @ApiOperation("添加游戏参与记录") 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 defdffb36..93e448dcd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -92,15 +92,16 @@ public class WxGameServiceImpl implements WxGameService { wxCouponOrder.setcUserId(userId); wxCouponOrder.setOrderId(orderId); - try { - wxCouponOrder = wxCouponOrderMapper.selectOne(wxCouponOrder); - } catch (Exception e){ - return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); - } - - if (wxCouponOrder == null) - return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + if (orderId != 0) { + try { + wxCouponOrder = wxCouponOrderMapper.selectOne(wxCouponOrder); + } catch (Exception e) { + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + } + if (wxCouponOrder == null) + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + } final IdWorker idWorker = IdWorker.get(); WxGameActionLog wxGameActionLog = new WxGameActionLog(); wxGameActionLog.setUserId(userId);