Commit 08875cde authored by codezwjava's avatar codezwjava

Merge remote-tracking branch 'origin/master'

parents 4a9d74b4 cadf2f59
......@@ -131,7 +131,17 @@ public class WalletServiceImpl implements WalletService {
MoneyPackageDetailVo detailVo = new MoneyPackageDetailVo();
detailVo.setUserId(userId);
detailVo.setTotalIncome(accountInfo.getEarningsMonth());
//获取培育奖信息
BigDecimal earningsMonth = new BigDecimal(0);
TradeRecord trade = tradeRecordMapper.getByUserIdAndTypeAndStatus(userId, TradeRecordEnum.CULTIVATING_PRIZE.getCode(),
new Date(), 0);
if (null != trade) {
earningsMonth = accountInfo.getEarningsMonth().add(trade.getMoney());
} else {
earningsMonth = accountInfo.getEarningsMonth();
}
detailVo.setTotalIncome(earningsMonth);
//获取本月交易记录
List<TradeRecord> list = getTradeRecordList(userId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment