|
@@ -65,8 +65,8 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public FinancePaymentPool getIdByUniqueKey(String advertiserId, Long productId, String paymentMedia) {
|
|
|
|
- return baseMapper.queryFinancePaymentPool(advertiserId, productId, paymentMedia);
|
|
|
|
|
|
+ public FinancePaymentPool getIdByUniqueKey(String advertiserName, Long productId, String paymentMedia) {
|
|
|
|
+ return baseMapper.queryFinancePaymentPool(advertiserName, productId, paymentMedia);
|
|
}
|
|
}
|
|
|
|
|
|
@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.getAdvertiserId(), recharge.getProductId(), recharge.getPaymentMedia());
|
|
|
|
|
|
+ FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(recharge.getAdvertiserName(), recharge.getProductId(), recharge.getPaymentMedia());
|
|
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.getAdvertiserId(), application.getProductId(), application.getPaymentMedia());
|
|
|
|
|
|
+ FinancePaymentPool pool = baseMapper.queryFinancePaymentPool(application.getAdvertiserName(), application.getProductId(), application.getPaymentMedia());
|
|
if (!Check.isNull(pool)) {
|
|
if (!Check.isNull(pool)) {
|
|
BigDecimal cashAmount = pool.getCashAmount();
|
|
BigDecimal cashAmount = pool.getCashAmount();
|
|
BigDecimal displayAmount = pool.getDisplayAmount();
|
|
BigDecimal displayAmount = pool.getDisplayAmount();
|
|
@@ -111,13 +111,13 @@ public class FinancePaymentPoolServiceImpl extends ServiceImpl<FinancePaymentPoo
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public Result<Object> queryPoolAmount(String advertiserId, Long productId, String type) {
|
|
|
|
- return Result.ok(baseMapper.queryFinancePaymentPool(advertiserId, productId, type));
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- @Override
|
|
|
|
public Result<Object> queryPoolProjectList(String advertiserId, Long productId, String type) {
|
|
public Result<Object> queryPoolProjectList(String advertiserId, Long productId, String type) {
|
|
List<String> advertiserIds = Arrays.asList(advertiserId.split(","));
|
|
List<String> advertiserIds = Arrays.asList(advertiserId.split(","));
|
|
return Result.ok(baseMapper.queryPoolProjectList(advertiserIds, productId, type));
|
|
return Result.ok(baseMapper.queryPoolProjectList(advertiserIds, productId, type));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Result<Object> queryPoolAmountById(String advertiserId, Long productId, String type) {
|
|
|
|
+ return Result.ok(baseMapper.queryFinancePaymentPoolById(advertiserId, productId, type));
|
|
|
|
+ }
|
|
}
|
|
}
|