|
|
@ -250,12 +250,6 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
|
|
|
|
if (changeTypeEnum.equals(BalanceChangeTypeEnum.INCOME)) { // 收入
|
|
|
|
if (changeTypeEnum.equals(BalanceChangeTypeEnum.INCOME)) { // 收入
|
|
|
|
balance = balance.add(amount);
|
|
|
|
balance = balance.add(amount);
|
|
|
|
remark = "废品回收结算,收入" + amount + "元";
|
|
|
|
remark = "废品回收结算,收入" + amount + "元";
|
|
|
|
} else { // 微信提现
|
|
|
|
|
|
|
|
if (balance.compareTo(amount) < 0) {
|
|
|
|
|
|
|
|
throw new BizIllegalException("余额不足");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
balance = balance.subtract(amount);
|
|
|
|
|
|
|
|
remark = "微信提现" + amount + "元";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 更新商户资金
|
|
|
|
// 更新商户资金
|
|
|
|
Enterprise enterprise = enterpriseService.getEnterpriseByStationId(stationId);
|
|
|
|
Enterprise enterprise = enterpriseService.getEnterpriseByStationId(stationId);
|
|
|
@ -277,6 +271,13 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
|
|
|
|
accountBill.setRemark("支付给散户"+ amount + "元");
|
|
|
|
accountBill.setRemark("支付给散户"+ amount + "元");
|
|
|
|
accountBill.setCreatorTime(now);
|
|
|
|
accountBill.setCreatorTime(now);
|
|
|
|
accountBillMapper.insert(accountBill);
|
|
|
|
accountBillMapper.insert(accountBill);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} else { // 微信提现
|
|
|
|
|
|
|
|
if (balance.compareTo(amount) < 0) {
|
|
|
|
|
|
|
|
throw new BizIllegalException("余额不足");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
balance = balance.subtract(amount);
|
|
|
|
|
|
|
|
remark = "微信提现" + amount + "元";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 更新散户余额
|
|
|
|
// 更新散户余额
|
|
|
|
client.setBanlance(balance);
|
|
|
|
client.setBanlance(balance);
|
|
|
|