From f5e6133809c553cfd9fb28ee61019927c547c374 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 08 Dec 2021 15:58:33 +0800
Subject: [PATCH] 20211208  fish

---
 src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java b/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
index b798f65..fd5277a 100644
--- a/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/fish/service/impl/MemberCannonServiceImpl.java
@@ -332,6 +332,23 @@
         return Result.ok(award);
     }
 
+    @Override
+    public Result getOwnAwards(CannonWinRecordDto cannonWinRecordDto) {
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        Page<CannonWinRecordVo> page = new Page<>(cannonWinRecordDto.getPageNum(), cannonWinRecordDto.getPageSize());
+        CannonWinRecord cannonWinRecord = new CannonWinRecord();
+        cannonWinRecord.setMemberId(memberId);
+        IPage<CannonWinRecordVo> list = cannonSettingDao.findCannonWinRecordInPage(page, cannonWinRecord);
+        return Result.ok(list);
+    }
+
+    @Override
+    public Result getListAwards() {
+        Long memberId = LoginUserUtils.getAppLoginUser().getId();
+        List<CannonWinRecordVo> list = cannonSettingDao.findCannonWinRecordList();
+        return Result.ok(list);
+    }
+
     private CannonAwardVo getAward(Long memberId) {
         CannonAwardVo cannonAwardVo = new CannonAwardVo();
         //获取所有的奖品列表
@@ -344,18 +361,21 @@
                 MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
                 memberCannonService.updateTotalBalanceAndAvailableBalance(memberAccountGold.getId(),quantity,quantity,null);
                 cannonAwardVo.setName(cannonAward.getName());
+                cannonAwardVo.setImage(cannonAward.getImage());
                 cannonAwardVo.setQuantity(cannonAward.getQuantity());
             }else if("COIN".equals(cannonAward.getCode())){
                 BigDecimal quantity = new BigDecimal(cannonAward.getQuantity());
                 MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.XCC.name());
                 coinService.updateWalletBalance(memberWalletCoinEntity.getId(),quantity,quantity,null);
                 cannonAwardVo.setName(cannonAward.getName());
+                cannonAwardVo.setImage(cannonAward.getImage());
                 cannonAwardVo.setQuantity(cannonAward.getQuantity());
             }else if("USDT".equals(cannonAward.getCode())){
                 BigDecimal quantity = new BigDecimal(cannonAward.getQuantity());
                 MemberWalletCoinEntity memberWalletCoinEntity = memberWalletCoinDao.selectWalletCoinBymIdAndCode(memberId, CoinTypeEnum.USDT.name());
                 coinService.updateWalletBalance(memberWalletCoinEntity.getId(),quantity,quantity,null);
                 cannonAwardVo.setName(cannonAward.getName());
+                cannonAwardVo.setImage(cannonAward.getImage());
                 cannonAwardVo.setQuantity(cannonAward.getQuantity());
             }else{
                 CannonSetting cannonSetting = cannonSettingDao.selectCannonSettingByCannonCode(cannonAward.getCode());
@@ -374,6 +394,7 @@
                     cannonOwnRecordDao.insert(cannonOwnRecord);
 
                     cannonAwardVo.setName(cannonAward.getName());
+                    cannonAwardVo.setImage(cannonAward.getImage());
                     cannonAwardVo.setQuantity(cannonAward.getQuantity());
                 }else{
                     CannonAward cannonAwardGold = cannonOwnRecordDao.selectCannonAwardByCode("GOLD");
@@ -381,6 +402,7 @@
                     MemberAccountGold memberAccountGold = memberAccountGoldDao.selectAccountGoldByMemberId(memberId);
                     memberCannonService.updateTotalBalanceAndAvailableBalance(memberAccountGold.getId(),quantity,quantity,null);
                     cannonAwardVo.setName(cannonAwardGold.getName());
+                    cannonAwardVo.setImage(cannonAwardGold.getImage());
                     cannonAwardVo.setQuantity(cannonAwardGold.getQuantity());
                 }
             }

--
Gitblit v1.9.1