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-01-15 17:31:34 +08:00
parent e39607382c
commit cf7a5757f9
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java
View File

@@ -140,6 +140,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
}
@Override
@Transactional(rollbackFor = Exception.class)
protected Boolean auditPass(Long auditId, LineInfoDO lineInfo, String userId) {
LineInfoDO updateLine = new LineInfoDO();
updateLine.setId(lineInfo.getId());
@@ -200,6 +201,7 @@ public class IntentAgreementServiceImpl extends LineFlowService implements Inten
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean skipIntentAgreement(Long lineId,LoginUserInfo user) {
log.info("skipIntentAgreement lineId:{},操作人:{}",lineId,user.getName());
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java
View File

@@ -221,7 +221,7 @@ public class ShopServiceImpl implements ShopService {
}
shopInfoDAO.batchAddShop(addShopList);
List<Long> shopIds = addShopList.stream().map(ShopInfoDO::getId).collect(Collectors.toList());
shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds,true);
shopStageInfoDAO.initShopStageInfo(lineInfo.getId(), shopIds, true);
return 1L;
}
@@ -263,7 +263,11 @@ public class ShopServiceImpl implements ShopService {
ShopInfoDO shopInfoDO = request.toDO(request, lineInfo.getPartnerId());
shopInfoDO.setCreateUserId(userId);
Long shopId = shopInfoDAO.addShopInfo(shopInfoDO);
shopStageInfoDAO.initShopStageInfo(request.getLineId(), Collections.singletonList(shopId),false);
if (lineInfo.getWorkflowSubStageStatus().equals(WorkflowSubStageStatusEnum.SIGN_INTENT_AGREEMENT_125.getCode())) {
shopStageInfoDAO.initShopStageInfo(request.getLineId(), Collections.singletonList(shopId), true);
}else{
shopStageInfoDAO.initShopStageInfo(request.getLineId(), Collections.singletonList(shopId), false);
}
return shopId;
}