From 03bd618f5f3055f0a558a65b28a67fd604b27a1e Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 22 Oct 2022 23:49:46 +0800
Subject: [PATCH] fxi
---
src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
index ec83cb7..e7070ed 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/ApiIgtOnHookPlanServiceImpl.java
@@ -23,7 +23,6 @@
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.grpc.internal.JsonUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.bridge.MessageUtil;
@@ -210,16 +209,19 @@
objectQueryWrapper.eq("state",2);
igtOnHookPlanOrderItemDao.delete(objectQueryWrapper);
//计算总收益和总挂机剩余金额，操作用户资金账户信息
+ //所有中奖的收益
BigDecimal totalProfit = igtOnHookPlanOrderItemDao.selectTotalProfitByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
- BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,2);
+ //所有未中奖的本金
+ BigDecimal totalAmount = igtOnHookPlanOrderItemDao.selectTotalAmountByByOrderIdAndMemberIdAndState(orderId,memberId,1,1);
DappWalletCoinEntity dappWalletCoinEntity = dappWalletCoinDao.selectByMemberId(memberId);
BigDecimal availableAmount = dappWalletCoinEntity.getAvailableAmount();
- //如果中奖，返回本金加收益加剩余总挂机金额
+ //如果中奖，返回收益，如果没中奖，则返回本金,最后加上剩余总挂机金额
BigDecimal total = totalProfit.add(totalAmount).add(igtOnHookPlanOrder.getAvaAmount()).setScale(4, BigDecimal.ROUND_DOWN);
- dappWalletCoinDao.addTotalAndaddAvailableById(memberId,total);
+ dappWalletCoinDao.addTotalAndaddAvailableById(dappWalletCoinEntity.getId(),total);
//生成流水记录
BigDecimal add = availableAmount.add(total);
- DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, availableAmount, total, add, "投注盈利", 5);
+ BigDecimal subtract = add.subtract(totalAmount);
+ DappAccountMoneyChangeEntity dappAccountMoneyChangeEntity = new DappAccountMoneyChangeEntity(memberId, subtract, totalProfit, add, "投注盈利", 5);
dappAccountMoneyChangeDao.insert(dappAccountMoneyChangeEntity);
//更新用户表是否正在挂机状态字段为否
DappMemberEntity dappMember= dappMemberDao.selectById(memberId);
--
Gitblit v1.9.1