diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java index 9b9057fb9..6bd34d18a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ExportBranchShopDTO.java @@ -54,7 +54,7 @@ public class ExportBranchShopDTO { @ColumnWidth(30) private String firstYearStartTime; - @ExcelProperty(value = "第一年加盟开始时间",order = 9) + @ExcelProperty(value = "第一年加盟结束时间",order = 10) @ColumnWidth(30) private String firstYearEndTime; 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 24eddc5d6..23ab44fee 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 @@ -28,6 +28,7 @@ import com.cool.store.utils.poi.StringUtils; import io.swagger.annotations.ApiModelProperty; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; @@ -120,15 +121,17 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { } for (BranchShopResponse response : list) { ExportBranchShopDTO dto = new ExportBranchShopDTO(); - FranchiseFeeDTO franchiseFeeDTO = franchiseFeeDTOMap.getOrDefault(response.getShopId(), new 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())) - .add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee())).add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString()); - dto.setTotalAmountContributions(total); - dto.setFranchiseFeeBill(franchiseFeeDTO.getYearFranchiseFee()); - dto.setLoanMargin(franchiseFeeDTO.getLoanMargin()); - dto.setPerformanceBondBill(franchiseFeeDTO.getPerformanceBond()); + FranchiseFeeDTO franchiseFeeDTO = franchiseFeeDTOMap.get(response.getShopId()); + 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())) + .add(new BigInteger(franchiseFeeDTO.getYearFranchiseFee())).add(new BigInteger(franchiseFeeDTO.getLoanMargin())).toString()); + dto.setTotalAmountContributions(total); + dto.setFranchiseFeeBill(franchiseFeeDTO.getYearFranchiseFee()); + dto.setLoanMargin(franchiseFeeDTO.getLoanMargin()); + dto.setPerformanceBondBill(franchiseFeeDTO.getPerformanceBond()); + } dto.setUserName(response.getUsername()); dto.setMobile(response.getMobile()); dto.setShopName(response.getShopName());