|
|
@ -14,6 +14,7 @@ import cc.yunxi.domain.query.RecyclerQuery;
|
|
|
|
import cc.yunxi.domain.vo.client.ClientUpdateVO;
|
|
|
|
import cc.yunxi.domain.vo.client.ClientUpdateVO;
|
|
|
|
import cc.yunxi.enums.BalanceChangeTypeEnum;
|
|
|
|
import cc.yunxi.enums.BalanceChangeTypeEnum;
|
|
|
|
import cc.yunxi.enums.BusinessCodeEnum;
|
|
|
|
import cc.yunxi.enums.BusinessCodeEnum;
|
|
|
|
|
|
|
|
import cc.yunxi.enums.OrderTypeEnum;
|
|
|
|
import cc.yunxi.mapper.ClientAccountDetailMapper;
|
|
|
|
import cc.yunxi.mapper.ClientAccountDetailMapper;
|
|
|
|
import cc.yunxi.mapper.ClientMapper;
|
|
|
|
import cc.yunxi.mapper.ClientMapper;
|
|
|
|
import cc.yunxi.mapper.EnterpriseAccountBillMapper;
|
|
|
|
import cc.yunxi.mapper.EnterpriseAccountBillMapper;
|
|
|
@ -191,14 +192,14 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void addBalance(String clientId, BigDecimal amount, String orderNo, String enterpriseId) {
|
|
|
|
public void addBalance(String clientId, BigDecimal amount, String orderNo, String enterpriseId, String orderType) {
|
|
|
|
this.changeBalance(clientId, amount, orderNo, enterpriseId, BalanceChangeTypeEnum.INCOME);
|
|
|
|
this.changeBalance(clientId, amount, orderNo, enterpriseId, BalanceChangeTypeEnum.INCOME,orderType);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void reduceBalance(String clientId, BigDecimal amount, String orderNo, String enterpriseId) {
|
|
|
|
public void reduceBalance(String clientId, BigDecimal amount, String orderNo, String enterpriseId) {
|
|
|
|
this.changeBalance(clientId, amount, orderNo, enterpriseId, BalanceChangeTypeEnum.REFUND);
|
|
|
|
this.changeBalance(clientId, amount, orderNo, enterpriseId, BalanceChangeTypeEnum.REFUND,"");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
@ -212,7 +213,7 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void cashBalance(String openId, Integer amount) throws Exception {
|
|
|
|
public void cashBalance(String openId, Integer amount) throws Exception {
|
|
|
|
this.changeBalance(openId, new BigDecimal(amount), null, null, BalanceChangeTypeEnum.CASH_OUT);
|
|
|
|
this.changeBalance(openId, new BigDecimal(amount), null, null, BalanceChangeTypeEnum.CASH_OUT,"");
|
|
|
|
// 微信提现(单位:分)
|
|
|
|
// 微信提现(单位:分)
|
|
|
|
amount = amount * 100;
|
|
|
|
amount = amount * 100;
|
|
|
|
BatchTransferModel batchTransferModel = new BatchTransferModel()
|
|
|
|
BatchTransferModel batchTransferModel = new BatchTransferModel()
|
|
|
@ -291,7 +292,8 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
|
|
|
|
|
|
|
|
|
|
|
|
// 统一金额交易
|
|
|
|
// 统一金额交易
|
|
|
|
private void changeBalance(String keyId, BigDecimal amount, String orderNo,
|
|
|
|
private void changeBalance(String keyId, BigDecimal amount, String orderNo,
|
|
|
|
String enterpriseId, BalanceChangeTypeEnum changeTypeEnum) {
|
|
|
|
String enterpriseId, BalanceChangeTypeEnum changeTypeEnum,
|
|
|
|
|
|
|
|
String orderType) {
|
|
|
|
Client client = this.getClientByKeyId(keyId);
|
|
|
|
Client client = this.getClientByKeyId(keyId);
|
|
|
|
BigDecimal balance = client.getBanlance();
|
|
|
|
BigDecimal balance = client.getBanlance();
|
|
|
|
String remark;
|
|
|
|
String remark;
|
|
|
@ -320,6 +322,7 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
|
|
|
|
accountBill.setAccountBalance(fund);
|
|
|
|
accountBill.setAccountBalance(fund);
|
|
|
|
accountBill.setPayoutAmount(amount);
|
|
|
|
accountBill.setPayoutAmount(amount);
|
|
|
|
accountBill.setOrderNumber(orderNo);
|
|
|
|
accountBill.setOrderNumber(orderNo);
|
|
|
|
|
|
|
|
accountBill.setOrderTypeId(orderType);
|
|
|
|
accountBill.setRemark("支付给散户" + amountStr + "元");
|
|
|
|
accountBill.setRemark("支付给散户" + amountStr + "元");
|
|
|
|
accountBill.setCreatorTime(now);
|
|
|
|
accountBill.setCreatorTime(now);
|
|
|
|
accountBillMapper.insert(accountBill);
|
|
|
|
accountBillMapper.insert(accountBill);
|
|
|
@ -345,6 +348,7 @@ public class ClientServiceImpl extends ServiceImpl<ClientMapper, Client> impleme
|
|
|
|
accountBill1.setAccountBalance(fund1);
|
|
|
|
accountBill1.setAccountBalance(fund1);
|
|
|
|
accountBill1.setIncomeAmount(amount);
|
|
|
|
accountBill1.setIncomeAmount(amount);
|
|
|
|
accountBill1.setOrderNumber(orderNo);
|
|
|
|
accountBill1.setOrderNumber(orderNo);
|
|
|
|
|
|
|
|
accountBill1.setOrderTypeId(orderType);
|
|
|
|
accountBill1.setRemark("散户退款到商户" + amountStr + "元");
|
|
|
|
accountBill1.setRemark("散户退款到商户" + amountStr + "元");
|
|
|
|
accountBill1.setCreatorTime(now);
|
|
|
|
accountBill1.setCreatorTime(now);
|
|
|
|
accountBillMapper.insert(accountBill1);
|
|
|
|
accountBillMapper.insert(accountBill1);
|
|
|
|