From 25d595acbb1da6e564d470b0edf62935239ea4d6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Nov 2021 16:58:32 +0800
Subject: [PATCH] Merge branch 'fish' of http://120.27.238.55:7000/r/exchange into fish
---
src/main/java/com/xcong/excoin/modules/fish/controller/MemberCannonController.java | 54 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/fish/controller/MemberCannonController.java b/src/main/java/com/xcong/excoin/modules/fish/controller/MemberCannonController.java
index 84c8a7a..eb2af90 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/controller/MemberCannonController.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/controller/MemberCannonController.java
@@ -1,21 +1,19 @@
package com.xcong.excoin.modules.fish.controller;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.coin.parameter.vo.MemberWalletAgentInfoVo;
import com.xcong.excoin.modules.coin.parameter.vo.OrderWalletCoinDealVo;
-import com.xcong.excoin.modules.fish.dto.CannonExchangeDto;
-import com.xcong.excoin.modules.fish.dto.CoinGoldExchangeDto;
-import com.xcong.excoin.modules.fish.dto.GetCannonsDto;
-import com.xcong.excoin.modules.fish.dto.GoldExchangeDto;
+import com.xcong.excoin.modules.fish.dto.*;
import com.xcong.excoin.modules.fish.service.MemberCannonService;
+import com.xcong.excoin.modules.fish.vo.CannonSettingVo;
+import com.xcong.excoin.modules.fish.vo.GoldAccountVo;
+import com.xcong.excoin.modules.fish.vo.OwnCannonVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -29,6 +27,16 @@
private MemberCannonService memberCannonService;
/**
+ * 获取金币账户
+ */
+ @ApiOperation(value="获取金币账户", notes="获取金币账户")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = GoldAccountVo.class)})
+ @GetMapping(value="/getGoldAccount")
+ public Result getGoldAccount() {
+ return memberCannonService.getGoldAccount();
+ }
+
+ /**
* 代币金币互转
*/
@ApiOperation(value = "代币金币互转")
@@ -40,17 +48,17 @@
/**
* USDT购买金币
*/
- @ApiOperation(value = "USDT购买金币")
- @PostMapping(value = "/goldExchange")
- public Result goldExchange(@RequestBody GoldExchangeDto goldExchangeDto) {
- return memberCannonService.goldExchange(goldExchangeDto);
- }
+// @ApiOperation(value = "USDT购买金币")
+// @PostMapping(value = "/goldExchange")
+// public Result goldExchange(@RequestBody GoldExchangeDto goldExchangeDto) {
+// return memberCannonService.goldExchange(goldExchangeDto);
+// }
/**
* 获取大炮列表
*/
@ApiOperation(value = "获取大炮列表")
- @ApiResponses({@ApiResponse( code = 200, message = "success", response = OrderWalletCoinDealVo.class)})
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = CannonSettingVo.class)})
@PostMapping(value = "/getCannons")
public Result getCannons(@RequestBody GetCannonsDto getCannonsDto) {
return memberCannonService.getCannons(getCannonsDto);
@@ -65,5 +73,23 @@
return memberCannonService.cannonExchange(cannonExchangeDto);
}
+ /**
+ * 获取用户拥有的炮台
+ */
+ @ApiOperation(value="获取用户拥有的炮台", notes="获取用户拥有的炮台")
+ @ApiResponses({@ApiResponse( code = 200, message = "success", response = OwnCannonVo.class)})
+ @GetMapping(value="/getOwnCannon")
+ public Result getOwnCannon() {
+ return memberCannonService.getOwnCannon();
+ }
+
+ /**
+ * 捕鱼
+ */
+ @ApiOperation(value = "捕鱼")
+ @PostMapping(value = "/fishing")
+ public Result fishing(@RequestBody FishingDto fishingDto) {
+ return memberCannonService.fishing(fishingDto);
+ }
}
--
Gitblit v1.9.1