出入账

trade-admin/src/main/java/com/trade/admin/finance/paymentcollection/service/impl/BPaymentCollectionServiceImpl.java

@@ -282,15 +282,15 @@ public class BPaymentCollectionServiceImpl implements BPaymentCollectionService
         PaymentCollectionOperate paymentCollectionOperate = paymentCollectionOperateService
                 .getBusinessInfo(income.getId(), 1);
         detailDto.setPaymentCollectionOperate(paymentCollectionOperate);
-        BusinessRelateFile businessRelateFile =  businessRelateFileBaseService.getByCondition(income.getId(),
+        BusinessRelateFile businessRelateFile = businessRelateFileBaseService.getByCondition(income.getId(),
                 BillingConstant.ERECEIVE_PAYMENT_VOUCHER, FileTypeEnum.DISBURSEMENT_ENTRY.getCode());
-        if (businessRelateFile != null && businessRelateFile.getFileId()!= null) {
+        if (businessRelateFile != null && businessRelateFile.getFileId() != null) {
             FileAbstractDto disbursementEntry = new FileAbstractDto(
                     fileStorageService.getFileStorageById(businessRelateFile.getFileId()));
             detailDto.setDisbursementEntry(disbursementEntry);
         }
-//        businessRelateFileBaseService.fillBizObjFiles(detailDto, income.getId(),
-//                BillingConstant.ERECEIVE_PAYMENT_VOUCHER, FileTypeEnum.DISBURSEMENT_ENTRY.getCode());
+        // businessRelateFileBaseService.fillBizObjFiles(detailDto, income.getId(),
+        // BillingConstant.ERECEIVE_PAYMENT_VOUCHER, FileTypeEnum.DISBURSEMENT_ENTRY.getCode());
         // BillingIncomeInfo billingIncomeInfo = billingIncomeInfoService.getBillingIncomeById(id);
         // if (billingIncomeInfo != null) {
         // BankAccountDto bankAccountDto = new BankAccountDto();
@@ -352,6 +352,7 @@ public class BPaymentCollectionServiceImpl implements BPaymentCollectionService
                         }
                     }
                 }
+                detailDto.setOrderListInfos(listInfoDtos);
             }
         }
         if (BillingConstant.PAYMENT_TYPE_TECHNICAL_SERVICE_FEE.equals(income.getPaymentType())