From b78fbc06a0fef9c24501a65ecabee5a4ef75b9ca Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 6 Jan 2021 15:42:12 +0800 Subject: [PATCH] child --- .../iformall/controller/WxGameController.java | 6 +-- .../service/impl/WxGameServiceImpl.java | 43 ++++++++++--------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java index 86a679560..152f598a5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxGameController.java @@ -148,9 +148,9 @@ public class WxGameController extends BaseController { return new ResultData(ErrorCode.GAME_NOT_FOUND); } int playLimit = (int) data.get("playLimit"); - if(playLimit < Constant.limit){ - return new ResultData(ErrorCode.GAME_NOT_COUNT); - } +// if(playLimit < Constant.limit){ +// return new ResultData(ErrorCode.GAME_NOT_COUNT); +// } int AwardLimit = (int) data.get("AwardLimit"); int AwardCount = (int) data.get("AwardCount"); if(AwardLimit != Constant.limit && AwardCount >= AwardLimit){ 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 fe623cca3..9aff46933 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -425,12 +425,13 @@ public class WxGameServiceImpl implements WxGameService { if(couponIdsList != null || couponIdsList.size() > 0){ for (Object a:couponIdsList) { int weight = 0; - if(a instanceof Map){ - Map map = (Map) a; - weight = (int) map.get("weight"); - }else if(a instanceof WxCouponChannelVo){ + if(a instanceof WxCouponChannelVo){ WxCouponChannelVo vo = (WxCouponChannelVo) a; weight = vo.getGameWeight(); + }else if(a instanceof JSONObject){ + JSONObject map = (JSONObject) a; + Integer w = map.getInteger("weight"); + weight = (w==null?0:w); } y += weight; if(x <= y){ @@ -443,12 +444,25 @@ public class WxGameServiceImpl implements WxGameService { Long orderId = 0L; Integer addCredit = 0; if(data != null){ - if(data instanceof Map){ - Map dataMap = (Map) data; + if(data instanceof WxCouponChannelVo){ + WxCouponChannelVo vo = (WxCouponChannelVo) data; + OrderSaveDto orderSaveDto = new OrderSaveDto(); + orderSaveDto.setCouponChannelId(vo.getId()); + orderSaveDto.setCouponId(vo.getCouponId()); + ResultData resultData1 = wxOrderService.saveOrder(orderSaveDto, userId, EnumPayWay.PAY_WAY_WECHAT, wxGame); + + if(resultData1.code == Result.SUCCESS && resultData1.data != null && resultData1.data instanceof WxOrder){ + WxOrder order = (WxOrder)resultData1.data; + orderId = order.getId(); + }else{ + resultData.data = null; + } + }else if(data instanceof JSONObject){ + JSONObject dataMap = (JSONObject) data; // Integer prizeType = (Integer) dataMap.get("prizeType"); // if(prizeType != null && prizeType == 0){ - Integer credit = (Integer) dataMap.get("credit"); - if(credit > 0){ + Integer credit = dataMap.getInteger("credit"); + if(credit != null && credit > 0){ WxCreditHistory wxCreditHistory = new WxCreditHistory(); wxCreditHistory.setTenantId(wxGame.getFinalTenantId()); wxCreditHistory.setCUserId(userId); @@ -466,19 +480,6 @@ public class WxGameServiceImpl implements WxGameService { } // } - }else if(data instanceof WxCouponChannelVo){ - WxCouponChannelVo vo = (WxCouponChannelVo) data; - OrderSaveDto orderSaveDto = new OrderSaveDto(); - orderSaveDto.setCouponChannelId(vo.getId()); - orderSaveDto.setCouponId(vo.getCouponId()); - ResultData resultData1 = wxOrderService.saveOrder(orderSaveDto, userId, EnumPayWay.PAY_WAY_WECHAT, wxGame); - - if(resultData1.code == Result.SUCCESS && resultData1.data != null && resultData1.data instanceof WxOrder){ - WxOrder order = (WxOrder)resultData1.data; - orderId = order.getId(); - }else{ - resultData.data = null; - } } }