mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-06-12 03:09:48 +08:00
update
This commit is contained in:
@@ -80,9 +80,6 @@ public class AdapayService {
|
||||
@Autowired
|
||||
private ClearingBillInfoService clearingBillInfoService;
|
||||
|
||||
@Autowired
|
||||
private OrderUnsplitRecordService orderUnsplitRecordService;
|
||||
|
||||
@Autowired
|
||||
private PileMerchantInfoService pileMerchantInfoService;
|
||||
|
||||
@@ -1832,7 +1829,7 @@ public class AdapayService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除结算账户前必须确认没有在途提现、未完成清分或未分账订单。
|
||||
* 删除结算账户前必须确认没有在途提现或未完成清分。
|
||||
*/
|
||||
private void assertSettleAccountCanDelete(String merchantId) {
|
||||
if (clearingWithdrawInfoService.countProcessingByMerchantId(merchantId) > 0) {
|
||||
@@ -1841,9 +1838,6 @@ public class AdapayService {
|
||||
if (clearingBillInfoService.countBlockingByMerchantId(merchantId) > 0) {
|
||||
throw new BusinessException("", "存在未完成清分或提现申请中的账单,请处理完成后再删除结算账户");
|
||||
}
|
||||
if (orderUnsplitRecordService.countUnsplitByMerchantId(merchantId) > 0) {
|
||||
throw new BusinessException("", "存在未结算分账,请完成结算后再删除结算账户");
|
||||
}
|
||||
}
|
||||
|
||||
private AdapayMemberAccount requireCurrentMemberAccount(String merchantId) {
|
||||
|
||||
Reference in New Issue
Block a user