From cf7a5757f925f3285797a22d9b2b9c7c6d870218 Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Wed, 15 Jan 2025 17:31:34 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=84=8F=E5=90=91=E5=8A=A0=E7=9B=9F?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E5=AE=8C=E6=88=90=E5=AF=B9=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E9=98=B6=E6=AE=B5=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/IntentAgreementServiceImpl.java | 2 ++ .../java/com/cool/store/service/impl/ShopServiceImpl.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) 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; }