suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-05-12 19:06:08 +08:00
parent 3564fb1bfb
commit df2f7e1e07
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-dao/src/main/resources/mapper/OrderSysInfoMapper.xml
View File

@@ -98,6 +98,7 @@
<if test="item.receivingMsBankAccount !=null and item.receivingMsBankAccount != ''"> <if test="item.receivingMsBankAccount !=null and item.receivingMsBankAccount != ''">
receiving_ms_bank_account = #{item.receivingMsBankAccount}, receiving_ms_bank_account = #{item.receivingMsBankAccount},
</if> </if>
order_update_time = now()
</set> </set>
where shop_id = #{item.shopId} where shop_id = #{item.shopId}
</foreach> </foreach>

21
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
View File

@@ -183,6 +183,7 @@ public class DataHandlerServerImpl implements DataHandlerServer {
ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(); ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO();
errorDTO.setShopCode(dto.getShopCode()); errorDTO.setShopCode(dto.getShopCode());
errorDTO.setErrorReason("门店未完成合同签约"); errorDTO.setErrorReason("门店未完成合同签约");
errorList.add(errorDTO);
continue; continue;
} }
Date buildEndTime = DateUtils.toDate(YYYY_MM_DD, dto.getBuildEndTime()); Date buildEndTime = DateUtils.toDate(YYYY_MM_DD, dto.getBuildEndTime());
@@ -242,6 +243,12 @@ public class DataHandlerServerImpl implements DataHandlerServer {
} }
ShopStageInfoDO buildStage = bulidStageMap.get(shopId); ShopStageInfoDO buildStage = bulidStageMap.get(shopId);
//建店资料未完成 //建店资料未完成
BuildStageDTO buildStageDTO = new BuildStageDTO();
buildStageDTO.setShopId(shopId);
buildStageDTO.setEndTime(dto.getBuildEndTime()+" 00:00:00");
updateBuildStageList.add(buildStageDTO);
//建店资料阶段处理
shopStageInfoDAO.dataUpdateShopStageInfo(Collections.singletonList(buildStageDTO), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156);
if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus().equals(buildStage.getShopSubStageStatus())) { if (!ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156.getShopSubStageStatus().equals(buildStage.getShopSubStageStatus())) {
//初始化数据 //初始化数据
preparationService.licenseCompleted(shopId); preparationService.licenseCompleted(shopId);
@@ -250,10 +257,6 @@ public class DataHandlerServerImpl implements DataHandlerServer {
preparationService.selectSiteAndBuildStoreComplete(shopId); preparationService.selectSiteAndBuildStoreComplete(shopId);
preparationService.buildStoreComplete(shopId); preparationService.buildStoreComplete(shopId);
} }
BuildStageDTO buildStageDTO = new BuildStageDTO();
buildStageDTO.setShopId(shopId);
buildStageDTO.setEndTime(dto.getBuildEndTime()+" 00:00:00");
updateBuildStageList.add(buildStageDTO);
if (buildEndTime.before(new Date(1745164800000L))){ if (buildEndTime.before(new Date(1745164800000L))){
fitmentFhopIdList.add(shopId); fitmentFhopIdList.add(shopId);
} }
@@ -337,8 +340,6 @@ public class DataHandlerServerImpl implements DataHandlerServer {
orderSysInfoDAO.batchInsertSpecific(addOrderSysInfoList); orderSysInfoDAO.batchInsertSpecific(addOrderSysInfoList);
franchiseFeeDAO.updateBill(franchiseFeeByShopIds); franchiseFeeDAO.updateBill(franchiseFeeByShopIds);
buildInformationDAO.batchInsertSpecific(addBuildList); buildInformationDAO.batchInsertSpecific(addBuildList);
//建店资料阶段处理
shopStageInfoDAO.dataUpdateShopStageInfo(updateBuildStageList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_156);
if (CollectionUtils.isNotEmpty(updateBuildStageList)){ if (CollectionUtils.isNotEmpty(updateBuildStageList)){
List<Long> updateStageShopIds = updateBuildStageList.stream().map(BuildStageDTO::getShopId).collect(Collectors.toList()); List<Long> updateStageShopIds = updateBuildStageList.stream().map(BuildStageDTO::getShopId).collect(Collectors.toList());
//pos阶段完成 //pos阶段完成
@@ -537,10 +538,10 @@ public class DataHandlerServerImpl implements DataHandlerServer {
importOaOldShopDataDTO.setPointArea(String.valueOf(data.get("场地实际面积")));} importOaOldShopDataDTO.setPointArea(String.valueOf(data.get("场地实际面积")));}
if (Objects.nonNull(data.get("签约人2姓名"))){ if (Objects.nonNull(data.get("签约人2姓名"))){
importOaOldShopDataDTO.setPartnershipSignatorySecond(String.valueOf(data.get("签约人2姓名")));} importOaOldShopDataDTO.setPartnershipSignatorySecond(String.valueOf(data.get("签约人2姓名")));}
if (Objects.nonNull(data.get("签约人2手机号"))){ if (Objects.nonNull(data.get("签约人2电话"))){
importOaOldShopDataDTO.setPartnershipSignatorySecondMobile(String.valueOf(data.get("签约人2手机号")));} importOaOldShopDataDTO.setPartnershipSignatorySecondMobile(String.valueOf(data.get("签约人2电话")));}
if (Objects.nonNull(data.get("签约人2身份证号"))){ if (Objects.nonNull(data.get("签约人2身份证号码"))){
importOaOldShopDataDTO.setPartnershipSignatorySecondIdNumber(String.valueOf(data.get("签约人2身份证号"))); importOaOldShopDataDTO.setPartnershipSignatorySecondIdNumber(String.valueOf(data.get("签约人2身份证号码")));
} }
if (Objects.nonNull(data.get("合同开始日期"))){ if (Objects.nonNull(data.get("合同开始日期"))){
importOaOldShopDataDTO.setContractStartDate(String.valueOf(data.get("合同开始日期"))); importOaOldShopDataDTO.setContractStartDate(String.valueOf(data.get("合同开始日期")));