diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java index 23ab44fee..af193f76a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportRealizeServiceImpl.java @@ -122,10 +122,10 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { for (BranchShopResponse response : list) { ExportBranchShopDTO dto = new ExportBranchShopDTO(); FranchiseFeeDTO franchiseFeeDTO = franchiseFeeDTOMap.get(response.getShopId()); - if (ObjectUtils.isNotEmpty(franchiseFeeDTO)){ + if (ObjectUtils.isNotEmpty(franchiseFeeDTO)) { dto.setFirstYearStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearStartTime())); dto.setFirstYearEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, franchiseFeeDTO.getFirstYearEndTime())); - String total =(new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee())) + String total = (new BigInteger(franchiseFeeDTO.getPerformanceBond()).add(new BigInteger(franchiseFeeDTO.getFirstYearFee())) .add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee())).add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString()); dto.setTotalAmountContributions(total); dto.setFranchiseFeeBill(franchiseFeeDTO.getYearFranchiseFee()); @@ -147,20 +147,20 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { dto.setContractEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime())); } Date payTime = payTimeMap.get(response.getShopId()); - if (Objects.nonNull(payTime)){ - dto.setFirstPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1,payTime)); + if (Objects.nonNull(payTime)) { + dto.setFirstPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, payTime)); } - InvoicingDO invoicingDO = InvoicingMap.get(response.getShopId()); + InvoicingDO invoicingDO = InvoicingMap.get(response.getShopId()); if (invoicingDO != null) { dto.setInvoicingTime(invoicingDO.getInvoiceDate()); - dto.setFirstYearManagementFeeTax(invoicingDO.getManagementFeeTax().toString()); - dto.setFirstYearManagementFee(invoicingDO.getManagementFee().toString()); - dto.setFirstYearBrandingFeeTax(invoicingDO.getBrandUsageFeeTax().toString()); - dto.setFirstYearBrandingFee(invoicingDO.getBrandUsageFee().toString()); - dto.setFranchiseFeeTax(invoicingDO.getFranchiseFeeTax().toString()); - dto.setFranchiseFee(invoicingDO.getFranchiseFee().toString()); - dto.setDesignFeeTax(invoicingDO.getDesignServiceFeeTax().toString()); - dto.setDesignFee(invoicingDO.getDesignServiceFee().toString()); + dto.setFirstYearManagementFeeTax(toString(invoicingDO.getManagementFeeTax())); + dto.setFirstYearManagementFee(toString(invoicingDO.getManagementFee())); + dto.setFirstYearBrandingFeeTax(toString(invoicingDO.getBrandUsageFeeTax())); + dto.setFirstYearBrandingFee(toString(invoicingDO.getBrandUsageFee())); + dto.setFranchiseFeeTax(toString(invoicingDO.getFranchiseFeeTax())); + dto.setFranchiseFee(toString(invoicingDO.getFranchiseFee())); + dto.setDesignFeeTax(toString(invoicingDO.getDesignServiceFeeTax())); + dto.setDesignFee(toString(invoicingDO.getDesignServiceFee().toString())); } dto.setCurrentProgress(response.getCompletionColumn() + "/" + response.getTotalColumn()); dto.setShopStatus(response.getShopStatus()); @@ -185,5 +185,12 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { } } + + private String toString(Object o) { + if (o == null) { + return ""; + } + return o.toString(); + } }