From 5ffa4ccd62c2f32b5808e0a5f6c9a65142c201ff Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 25 Nov 2021 10:20:37 +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 |   72 +++++++++++++++++++++++++++--------
 1 files changed, 55 insertions(+), 17 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..63fcbd0 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,23 +1,23 @@
 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.AccountAvaBanlaceVo;
+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;
+import javax.validation.Valid;
 
 @Slf4j
 @Api(value = "MemberCannonController", tags = "炮台接口类")
@@ -29,30 +29,50 @@
     private MemberCannonService memberCannonService;
 
     /**
+     * 获取账户金币，代币，USDT可用余额
+     */
+    @ApiOperation(value="获取账户金币，代币，USDT可用余额", notes="获取账户金币，代币，USDT可用余额")
+    @ApiResponses({@ApiResponse( code = 200, message = "success", response = AccountAvaBanlaceVo.class)})
+    @GetMapping(value="/getAccountAva")
+    public Result getAccountAvaBanlace() {
+        return memberCannonService.getAccountAvaBanlace();
+    }
+
+    /**
+     * 获取金币账户
+     */
+    @ApiOperation(value="获取金币账户", notes="获取金币账户")
+    @ApiResponses({@ApiResponse( code = 200, message = "success", response = GoldAccountVo.class)})
+    @GetMapping(value="/getGoldAccount")
+    public Result getGoldAccount() {
+        return memberCannonService.getGoldAccount();
+    }
+
+    /**
      * 代币金币互转
      */
     @ApiOperation(value = "代币金币互转")
     @PostMapping(value = "/coinGoldExchange")
-    public Result coinGoldExchange(@RequestBody CoinGoldExchangeDto coinGoldExchangeDto) {
+    public Result coinGoldExchange(@RequestBody @Valid CoinGoldExchangeDto coinGoldExchangeDto) {
         return memberCannonService.coinGoldExchange(coinGoldExchangeDto);
     }
 
     /**
      * 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) {
+    public Result getCannons(@RequestBody @Valid GetCannonsDto getCannonsDto) {
         return memberCannonService.getCannons(getCannonsDto);
     }
 
@@ -61,9 +81,27 @@
      */
     @ApiOperation(value = "兑换大炮")
     @PostMapping(value = "/cannonExchange")
-    public Result cannonExchange(@RequestBody CannonExchangeDto cannonExchangeDto) {
+    public Result cannonExchange(@RequestBody @Valid CannonExchangeDto cannonExchangeDto) {
         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 @Valid FishingDto fishingDto) {
+        return memberCannonService.fishing(fishingDto);
+    }
 
 }

--
Gitblit v1.9.1