diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java index 5184e55d0..b5db3c5e5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/IntentAgreementServiceImpl.java @@ -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); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index deedb7ed1..6256c2ca9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -221,7 +221,7 @@ public class ShopServiceImpl implements ShopService { } shopInfoDAO.batchAddShop(addShopList); List 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; }