From 194e4aefa846a30061d8309ca319f82c15f3eac0 Mon Sep 17 00:00:00 2001 From: guohb Date: Tue, 21 May 2024 10:33:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/SignFranchiseService.java | 7 +++++++ .../store/service/impl/SignFranchiseServiceImpl.java | 10 ++++++++++ .../controller/webb/PCSignFranchiseController.java | 6 ++++++ .../controller/webc/MiniSignFranchiseController.java | 6 ++++++ 4 files changed, 29 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java index fa144a7a4..ba67f9c0c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/SignFranchiseService.java @@ -17,4 +17,11 @@ public interface SignFranchiseService { AddSignFranchiseResponse getSignFranchise(Long shopId); + /** + * 加盟合同退回后重新缴费 + * @param shopId + * @return + */ + Boolean rePay(Long shopId); + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 708b7801a..f0b6e6a6a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -7,6 +7,7 @@ import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.ShopStageInfoDAO; import com.cool.store.entity.*; import com.cool.store.enums.*; +import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.*; @@ -414,4 +415,13 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu public static String getDateTimeFormat(String pattern, Date date) { return new SimpleDateFormat(pattern).format(date); } + + + @Override + @Transactional(rollbackFor = Exception.class) + public Boolean rePay(Long shopId) { + shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_71); + shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_7); + return true; + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java index 8166ad912..7ac515329 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCSignFranchiseController.java @@ -33,4 +33,10 @@ public class PCSignFranchiseController { return ResponseResult.success(signFranchiseService.getSignFranchise(shopId)); } + @ApiOperation("重新缴费(加盟合同阶段退回后)") + @GetMapping("/rePay") + public ResponseResult rePay(@RequestParam("shopId") Long shopId) { + return ResponseResult.success(signFranchiseService.rePay(shopId)); + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java index d0619d63e..3424e248c 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniSignFranchiseController.java @@ -33,4 +33,10 @@ public class MiniSignFranchiseController { return ResponseResult.success(signFranchiseService.getSignFranchise(shopId)); } + @ApiOperation("重新缴费(加盟合同阶段退回后)") + @GetMapping("/rePay") + public ResponseResult rePay(@RequestParam("shopId") Long shopId) { + return ResponseResult.success(signFranchiseService.rePay(shopId)); + } + }