|
@@ -3,7 +3,7 @@ package com.trade.client.accounts.payableaccounts.service.impl;
|
|
|
import com.github.pagehelper.Page;
|
|
|
import com.github.pagehelper.PageHelper;
|
|
|
import com.trade.client.accounts.payableaccounts.dto.PaymentConfirmDto;
|
|
|
-import com.trade.client.accounts.payableaccounts.service.BPayableAccountsService;
|
|
|
+import com.trade.client.accounts.payableaccounts.service.CPayableAccountsService;
|
|
|
import com.trade.client.accounts.payableaccounts.vo.PayableAccountsDetail;
|
|
|
import com.trade.client.enterprise.customer.domain.CustomerUser;
|
|
|
import com.trade.client.enterprise.customer.service.CustomerUserService;
|
|
@@ -11,7 +11,6 @@ import com.trade.common.annotation.RewriteDate;
|
|
|
import com.trade.common.constant.HttpStatus;
|
|
|
import com.trade.common.core.page.GridPage;
|
|
|
import com.trade.common.exception.ServiceException;
|
|
|
-import com.trade.common.utils.ConstantUtil;
|
|
|
import com.trade.service.business.payableaccounts.domain.PayableAccounts;
|
|
|
import com.trade.service.business.payableaccounts.dto.PayableAccountsSearchDto;
|
|
|
import com.trade.service.business.payableaccounts.service.PayableAccountsService;
|
|
@@ -37,7 +36,7 @@ import java.util.List;
|
|
|
* @Version: 1.0
|
|
|
*/
|
|
|
@Service
|
|
|
-public class BPayableAccountsServiceImpl implements BPayableAccountsService {
|
|
|
+public class CPayableAccountsServiceImpl implements CPayableAccountsService {
|
|
|
|
|
|
@Resource
|
|
|
private PayableAccountsService payableAccountsService;
|
|
@@ -104,8 +103,13 @@ public class BPayableAccountsServiceImpl implements BPayableAccountsService {
|
|
|
throw new ServiceException("该应付账款记录不存在");
|
|
|
}
|
|
|
PayableAccountsDetail payableAccountsDetail = new PayableAccountsDetail();
|
|
|
- businessRelateFileBaseService.fillBizObjFiles(payableAccountsDetail, payableAccounts.getId(),
|
|
|
+ BusinessRelateFile businessRelateFile =businessRelateFileBaseService.getByCondition(payableAccounts.getId(),
|
|
|
BillingConstant.PAYMENT_VOUCHER, FileTypeEnum.PAYABLE_ACCOUNTS.getCode());
|
|
|
+ FileAbstractDto payableAccountsFile = new FileAbstractDto(
|
|
|
+ fileStorageService.getFileStorageById(businessRelateFile.getFileId()));
|
|
|
+ payableAccountsDetail.setPayableAccountsFile(payableAccountsFile);
|
|
|
+// businessRelateFileBaseService.fillBizObjFiles(payableAccountsDetail, payableAccounts.getId(),
|
|
|
+// BillingConstant.PAYMENT_VOUCHER, FileTypeEnum.PAYABLE_ACCOUNTS.getCode());
|
|
|
payableAccountsDetail.setPayableAccountInfo(payableAccounts);
|
|
|
FileAbstractDto contactFile = new FileAbstractDto(
|
|
|
fileStorageService.getFileStorageById(payableAccounts.getContactFileId()));
|