diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java index 168ef8396..13229c1b4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/FranchiseFeeMapper.java @@ -1,10 +1,16 @@ package com.cool.store.mapper; import com.cool.store.entity.FranchiseFeeDO; +import org.apache.ibatis.annotations.MapKey; import org.apache.ibatis.annotations.Param; import tk.mybatis.mapper.common.Mapper; +import java.util.Date; +import java.util.List; +import java.util.Map; + public interface FranchiseFeeMapper extends Mapper { FranchiseFeeDO selectByShopId(@Param("shopId") Long shopId); - + @MapKey("shopId") + Map getPayTimeByShopIds(@Param("shopIds") List shopIds); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml index f5df125cd..e6af0d5f1 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/FranchiseFeeMapper.xml @@ -9,4 +9,14 @@ order by create_time desc limit 1 + \ No newline at end of file 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 bfd5c6e0d..da809ab43 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 @@ -110,5 +110,8 @@ public class ExportBranchShopDTO { @ColumnWidth(30) private String openDuration; + @ExcelProperty(value = "缴费时间",order = 24) + @ColumnWidth(30) + private String payTime; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java index 31941bd5b..eea95ca77 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportRealizeService.java @@ -16,6 +16,6 @@ import java.util.List; */ public interface ExportRealizeService { - void preparationList( List preparationDTOS,ImportTaskDO importTaskDO); + void branchShopList(List list,ImportTaskDO importTaskDO); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java index 400998fa7..00c1d1b5a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExportService.java @@ -10,7 +10,6 @@ import com.cool.store.request.*; * @注释: */ public interface ExportService { - Integer preparationList(PreparationRequest request,LoginUserInfo loginUserInfo); Long branchShopList(BranchShopRequest request,LoginUserInfo user); } 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 3abe6cbed..7e33a0d83 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 @@ -14,10 +14,7 @@ import com.cool.store.entity.*; import com.cool.store.enums.*; import com.cool.store.enums.point.*; import com.cool.store.exception.ServiceException; -import com.cool.store.mapper.ImportTaskMapper; -import com.cool.store.mapper.IntentAgreementMapper; -import com.cool.store.mapper.PointInfoMapper; -import com.cool.store.mapper.SignFranchiseMapper; +import com.cool.store.mapper.*; import com.cool.store.request.InitiatingRequest; import com.cool.store.response.BranchShopResponse; import com.cool.store.service.*; @@ -54,7 +51,7 @@ import static com.cool.store.utils.poi.DateUtils.*; @Slf4j public class ExportRealizeServiceImpl implements ExportRealizeService { @Resource - private InvoicingDAO invoicingDAO; + private FranchiseFeeMapper franchiseFeeMapper; @Resource private ImportTaskMapper importTaskMapper; @Autowired @@ -93,71 +90,8 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { @Autowired private RegionDao regionDao; - @Async - @Override - public void preparationList(List preparationDTOS, ImportTaskDO importTaskDO) { - Boolean flag = Boolean.TRUE; - String url = ""; - try { - List shopIds = preparationDTOS.stream().map(PreparationDTO::getId).collect(Collectors.toList()); - List scheduleList = shopStageInfoDAO.getScheduleList(shopIds); - List shopContractActualCompletionTime = shopStageInfoDAO.getShopContractActualCompletionTime(shopIds); - Map scheduleDTOMap = scheduleList.stream().collect(Collectors.toMap(ScheduleDTO::getShopId, x -> x)); - Map shopStageInfoDOMap = shopContractActualCompletionTime.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, x -> x)); - List regionIds = preparationDTOS.stream().map(PreparationDTO::getRegionId).collect(Collectors.toList()); - Map regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); - Set userIds = preparationDTOS.stream().filter(x -> StringUtils.isNotEmpty(x.getShopManagerUserId())).map(PreparationDTO::getShopManagerUserId).collect(Collectors.toSet()); - userIds.addAll(preparationDTOS.stream().filter(x -> StringUtils.isNotEmpty(x.getInvestmentManager())).map(PreparationDTO::getInvestmentManager).collect(Collectors.toSet())); - userIds.addAll(preparationDTOS.stream().filter(x -> StringUtils.isNotEmpty(x.getSupervisorUserId())).map(PreparationDTO::getSupervisorUserId).collect(Collectors.toSet())); - Map userInfoMap = enterpriseUserDAO.getUserInfoMap(new ArrayList<>(userIds)); - List openActivityActualCompletionTime = shopStageInfoDAO.getOpenActivityActualCompletionTime(shopIds); - Map openActivityStageMap; - if (openActivityActualCompletionTime != null) { - openActivityStageMap = openActivityActualCompletionTime.stream().collect(Collectors.toMap(ShopStageInfoDO::getShopId, x -> x)); - } else { - openActivityStageMap = new HashMap<>(); - } - List result = new ArrayList<>(); - preparationDTOS.forEach(x -> { - PreparationScheduleDTO dto1 = new PreparationScheduleDTO(); - dto1.setMobile(x.getMobile()); - dto1.setUsername(x.getUsername()); - dto1.setShopName(x.getShopName()); - dto1.setPlanOpenTime(DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, x.getPlanOpenTime())); - dto1.setShopCode(x.getShopCode()); - dto1.setSupervisionName(userInfoMap.getOrDefault(x.getSupervisorUserId(), new EnterpriseUserDO()).getName()); - dto1.setInvestmentManagerName(userInfoMap.getOrDefault(x.getInvestmentManager(), new EnterpriseUserDO()).getName()); - dto1.setRegionNodeName(regionNameMap.getOrDefault(x.getRegionId(), "")); - ScheduleDTO dto = scheduleDTOMap.getOrDefault(x.getId(), new ScheduleDTO()); - dto1.setCurrentProgress(dto.getCompletionColumn().toString() + "/" + dto.getTotalColumn().toString()); - if (openActivityStageMap.containsKey(x.getId())) { - Date openActivity = DateUtils.strToDate(openActivityStageMap.get(x.getId()).getActualCompleteTime(), YYYY_MM_DD_HH_MM_SS); - long between = ChronoUnit.SECONDS.between(x.getCreateTime().toInstant(), openActivity.toInstant()); - double days = (double) between / (24 * 60 * 60); - dto1.setDays(String.format("%.1f", days)); - } else { - long between = ChronoUnit.SECONDS.between(x.getCreateTime().toInstant(), new Date().toInstant()); - double days = (double) between / (24 * 60 * 60); - dto1.setDays(String.format("%.1f", days)); - } - result.add(dto1); - }); - url = easyExcelUtil.exportExcel(PreparationScheduleDTO.class, result, null, FileTypeEnum.PREPARATION.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date()), FileTypeEnum.PREPARATION.getDesc() + DateUtils.parseDateToStr(SPECIAL_DATE_START_1, new Date())); - } catch (Throwable e) { - flag = Boolean.FALSE; - log.error("fileUpload upload err, originFileName={}", FileTypeEnum.PREPARATION.getDesc(), e); - throw new ServiceException(ErrorCodeEnum.INTERNAL_SERVER_ERROR); - } finally { - if (flag) { - importTaskDO.setStatus(ImportStatusEnum.success.getCode()); - importTaskDO.setFileUrl(url); - } else { - importTaskDO.setStatus(ImportStatusEnum.fail.getCode()); - } - importTaskMapper.update(eid, importTaskDO); - } - } - + @Resource + private InvoicingDAO invoicingDAO; @Override @Async public void branchShopList(List list, ImportTaskDO importTaskDO) { @@ -167,6 +101,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { List exportList = new ArrayList<>(); List shopIds = list.stream().map(BranchShopResponse::getShopId).collect(Collectors.toList()); List signFranchises = signFranchiseMapper.selectByShopIds(shopIds); + Map payTimeByShopIds = franchiseFeeMapper.getPayTimeByShopIds(shopIds); Map signFranchiseMap = new HashMap<>(); if (signFranchises != null) { signFranchiseMap = signFranchises.stream().collect(Collectors.toMap(SignFranchiseDO::getShopId, Function.identity())); @@ -192,6 +127,7 @@ public class ExportRealizeServiceImpl implements ExportRealizeService { dto.setContractStartTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractStartTime())); dto.setContractEndTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, signFranchiseDO.getContractEndTime())); } + dto.setPayTime(DateUtils.parseDateToStr(SPECIAL_DATE_START_1, payTimeByShopIds.get(response.getShopId()))); InvoicingDO invoicingDO = InvoicingMap.get(response.getShopId()); if (invoicingDO != null) { dto.setInvoicingTime(invoicingDO.getInvoiceDate()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java index 82a7b900b..62fef85e2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ExportServiceImpl.java @@ -73,42 +73,7 @@ public class ExportServiceImpl implements ExportService { private ShopService shopService; - //原先进度管理接口废弃，使用branchShopList - @Override - public Integer preparationList(PreparationRequest request, LoginUserInfo loginUserInfo) { - if (!sysRoleService.checkIsAdmin(request.getCurUserId())) { - request.setAuthRegionIds(userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(request.getCurUserId())); - } - if (CollectionUtils.isNotEmpty(request.getRegionIds())) { - if (request.getRegionIds().contains(CommonConstants.ROOT_DEPT_ID_STR)) { - request.setRegionIds(null); - } else { - request.setRegionIds(regionService.getSubRegionIdsByRegionIds(request.getRegionIds())); - } - } - //进度数据 - List preparationDTOS = shopInfoDAO.ListByCondition(request); - if (CollectionUtils.isEmpty(preparationDTOS)) { - throw new ServiceException(ErrorCodeEnum.NO_DATA); - } - List result; - if (preparationDTOS.size() > CommonConstants.MAX_EXPORT_SIZE) { - result = preparationDTOS.subList(0, CommonConstants.MAX_EXPORT_SIZE); - } else { - result = preparationDTOS; - } - ImportTaskDO importTaskDO = new ImportTaskDO(); - importTaskDO.setStatus(ImportStatusEnum.Ongoing.getCode()); - importTaskDO.setFileName(FileTypeEnum.PREPARATION.getDesc() + DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START_1, new Date())); - importTaskDO.setIsImport(Boolean.FALSE); - importTaskDO.setFileType(FileTypeEnum.PREPARATION.getFileType()); - importTaskDO.setCreateUserId(request.getCurUserId()); - importTaskDO.setCreateTime(new Date().getTime()); - importTaskDO.setCreateName(loginUserInfo.getName()); - importTaskMapper.insert(eid, importTaskDO); - exportRealizeService.preparationList(result, importTaskDO); - return result.size(); - } + @Override public Long branchShopList(BranchShopRequest request, LoginUserInfo user) {