From 565547a1d026a9bcff26f3e0edaf079bdb7a55d4 Mon Sep 17 00:00:00 2001 From: nickchange <126672920+nickchange@users.noreply.github.com> Date: 星期四, 26 十月 2023 08:55:52 +0800 Subject: [PATCH] 10.26 --- cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java | 45 ++++++++++++++++++++++++++++++++++++++------- 1 files changed, 38 insertions(+), 7 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java index 38cf153..5f5e79b 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java +++ b/cloud-server-other/src/main/java/com/dsh/other/controller/GameController.java @@ -51,6 +51,24 @@ private PayMoneyUtil payMoneyUtil; + + @ResponseBody + @PostMapping("/getIntro") + @ApiOperation(value = "获取步骤说明", tags = {"用户—游戏"}) + @ApiImplicitParams({ + @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), + }) + public ResultUtil<String> getIntro(){ + try { + + return ResultUtil.success( gameService.getIntro()); + }catch (Exception e){ + e.printStackTrace(); + return ResultUtil.runErr(); + } + } + + @ResponseBody @PostMapping("/queryGameList") @ApiOperation(value = "获取当前场地的游戏列表配置", tags = {"用户—游戏"}) @@ -63,11 +81,10 @@ try { List<TGameConfig> tGameConfigs = new ArrayList<>(); - List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId)); + List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId).eq(TGame::getState,0)); if(list.size()>0){ Integer id = list.get(0).getId(); // tGameConfigs = gameConfigService.list(new LambdaQueryWrapper<TGameConfig>().eq(TGameConfig::getOtherId, id)); - tGameConfigs = gameConfigService.listJs(id); } @@ -87,7 +104,7 @@ @ApiImplicitParam(value = "游戏配置id", name = "configId", dataType = "int", required = true), @ApiImplicitParam(value = "sutuId", name = "sutuId", dataType = "int", required = true), @ApiImplicitParam(value = "spaceId", name = "spaceId", dataType = "int", required = true), - @ApiImplicitParam(value = "1微信 2支付宝 3玩湃币", name = "type", dataType = "int", required = true), + @ApiImplicitParam(value = "1微信 2支付宝 3玩湃币 5积分", name = "type", dataType = "int", required = true), @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."), }) public ResultUtil payGame(Integer gameId, Integer configId,Integer type,Integer sutuId,Integer spaceId){ @@ -104,6 +121,7 @@ tGameRecord.setPayType(type); tGameRecord.setUserId(uid); tGameRecord.setNumber(code); + tGameRecord.setTime(new Date()); gameRecordService.save(tGameRecord); if(type==1){ ResultUtil weixinpay = payMoneyUtil.weixinpay("游戏支付", "", code, config.getCash().toString(), "/base/course/weChatPaymentCourseCallback", "APP", ""); @@ -144,6 +162,7 @@ if("SUCCESS".equals(s)){ for (TGameRecord coursePackagePayment : list) { coursePackagePayment.setStatus(1); + coursePackagePayment.setMoney(config.getCash()); coursePackagePayment.setOrderNo(transaction_id); } gameRecordService.updateBatchById(list); @@ -197,6 +216,7 @@ if("TRADE_SUCCESS".equals(s)){ for (TGameRecord coursePackagePayment : list) { coursePackagePayment.setStatus(1); + coursePackagePayment.setMoney(config.getCash()); coursePackagePayment.setOrderNo(tradeNo); } gameRecordService.updateBatchById(list); @@ -216,6 +236,8 @@ } return alipay; }else if(type==3){ + tGameRecord.setMoney(config.getPlayCoin()); + gameRecordService.updateById(tGameRecord); AppUser appUser = appUserClient.queryAppUser(uid); Integer playPaiCoins = appUser.getPlayPaiCoins(); BigDecimal playCoin = config.getPlayCoin(); @@ -229,6 +251,19 @@ startGame(uid,gameId,spaceId,sutuId); return ResultUtil.success(); + }else if(type==5){ + AppUser appUser = appUserClient.queryAppUser(uid); + Integer playPaiCoins = appUser.getIntegral(); + BigDecimal playCoin = config.getIntegral(); + int i = playCoin.intValue(); + if(playPaiCoins<i){ + return ResultUtil.error("积分不足"); + } + int i1 = playPaiCoins - i; + appUser.setIntegral(i1); + appUserClient.updateAppUser(appUser); + startGame(uid,gameId,spaceId,sutuId); + return ResultUtil.success(); }else { return ResultUtil.error("支付方式错误"); } @@ -261,8 +296,4 @@ } - public static void main(String[] args) { - Integer integer = startGame(1, 13, 1001, 1001); - System.out.println(integer); - } } -- Gitblit v1.7.1