|
@@ -36,7 +36,7 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
|
|
|
@Override
|
|
@Override
|
|
|
public void add(FinancePaymentRechargeApplication recharge, FinancePaymentApplication application) {
|
|
public void add(FinancePaymentRechargeApplication recharge, FinancePaymentApplication application) {
|
|
|
if (Check.isNull(recharge)) {
|
|
if (Check.isNull(recharge)) {
|
|
|
- FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia());
|
|
|
|
|
|
|
+ FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia(), application.getPaymentPort());
|
|
|
if (Check.isNull(pool)) {
|
|
if (Check.isNull(pool)) {
|
|
|
FinancePaymentPool paymentPool = new FinancePaymentPool();
|
|
FinancePaymentPool paymentPool = new FinancePaymentPool();
|
|
|
BeanUtil.copyProperties(application, paymentPool);
|
|
BeanUtil.copyProperties(application, paymentPool);
|
|
@@ -52,7 +52,7 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
|
|
|
this.updateById(pool);
|
|
this.updateById(pool);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
|
|
|
|
|
|
|
+ FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia(), recharge.getPaymentPort());
|
|
|
if (!Check.isNull(pool)) {
|
|
if (!Check.isNull(pool)) {
|
|
|
JSONObject amounts = accountMapperl.queryAmounts(recharge.getId());
|
|
JSONObject amounts = accountMapperl.queryAmounts(recharge.getId());
|
|
|
BigDecimal cashAmount = pool.getCashAmount();
|
|
BigDecimal cashAmount = pool.getCashAmount();
|
|
@@ -65,8 +65,8 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public FinancePaymentPool getIdByUniqueKey(String advertiserName, Long productId, String paymentMedia) {
|
|
|
|
|
- return baseMapper.queryFinancePaymentPool(advertiserName, productId, paymentMedia);
|
|
|
|
|
|
|
+ public FinancePaymentPool getIdByUniqueKey(String advertiserName, Long productId, String paymentMedia, String paymentPort) {
|
|
|
|
|
+ return baseMapper.queryFinancePaymentPool(advertiserName, productId, paymentMedia, paymentPort);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -88,7 +88,7 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
|
|
|
@Override
|
|
@Override
|
|
|
public void reduce(FinancePaymentRechargeApplication recharge, FinancePaymentApplication application) {
|
|
public void reduce(FinancePaymentRechargeApplication recharge, FinancePaymentApplication application) {
|
|
|
if (Check.isNull(application)) {
|
|
if (Check.isNull(application)) {
|
|
|
- FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
|
|
|
|
|
|
|
+ FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia(), recharge.getPaymentPort());
|
|
|
if (!Check.isNull(pool)) {
|
|
if (!Check.isNull(pool)) {
|
|
|
JSONObject amounts = accountMapperl.queryAmounts(recharge.getId());
|
|
JSONObject amounts = accountMapperl.queryAmounts(recharge.getId());
|
|
|
|
|
|
|
@@ -99,7 +99,7 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
|
|
|
this.updateById(pool);
|
|
this.updateById(pool);
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia());
|
|
|
|
|
|
|
+ FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia(), application.getPaymentPort());
|
|
|
if (!Check.isNull(pool)) {
|
|
if (!Check.isNull(pool)) {
|
|
|
BigDecimal cashAmount = pool.getCashAmount();
|
|
BigDecimal cashAmount = pool.getCashAmount();
|
|
|
BigDecimal displayAmount = pool.getDisplayAmount();
|
|
BigDecimal displayAmount = pool.getDisplayAmount();
|