From 198a0319c88b54472e940f00fdb8be6452a26f7f Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Tue, 20 May 2025 14:36:37 +0800 Subject: [PATCH] =?UTF-8?q?pc=20=E7=BC=B4=E7=BA=B3=E5=8A=A0=E7=9B=9F?= =?UTF-8?q?=E8=B4=B9=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=BB=BA=E5=BA=97=E8=B5=84?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/service/impl/DeskServiceImpl.java | 2 +- .../webb/PCBuildInformationController.java | 19 +++++++++++++++---- .../controller/webb/PCLinePayController.java | 8 ++++++++ 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index 94a472cc3..b229b4cca 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -244,7 +244,7 @@ public class DeskServiceImpl implements DeskService { //督导代填 if (userRoleIds.contains(UserRoleEnum.QW_SUPERVISION.getCode()) || userRoleIds.contains(UserRoleEnum.SUPERVISION.getCode())) { pageInfo = commonPendingVOPageInfo(pageNum, pageSize, user, ShopSubStageEnum.SHOP_STAGE_7, - Collections.singletonList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus()), Boolean.FALSE); + Arrays.asList(SHOP_SUB_STAGE_STATUS_71.getShopSubStageStatus(), SHOP_SUB_STAGE_STATUS_74.getShopSubStageStatus()), Boolean.FALSE); } else { if (userRoleIds.contains(UserRoleEnum.JOIN_OFFICE.getCode()) || userRoleIds.contains(UserRoleEnum.REGION_OFFICE.getCode())) { subStageStatusList.add(SHOP_SUB_STAGE_STATUS_70.getShopSubStageStatus()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBuildInformationController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBuildInformationController.java index 49428e962..777547942 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBuildInformationController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCBuildInformationController.java @@ -1,14 +1,13 @@ package com.cool.store.controller.webb; +import com.cool.store.request.BuildInformationRequest; import com.cool.store.response.BuildInformationResponse; import com.cool.store.response.ResponseResult; import com.cool.store.service.BuildInformationService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -31,4 +30,16 @@ public class PCBuildInformationController { return ResponseResult.success(buildInformationService.getBuildInformation(shopId)); } + @ApiOperation("提交/修改") + @PostMapping("/submitOrUpdate") + public ResponseResult submitBuildInformation(@RequestBody @Validated BuildInformationRequest request) { + return ResponseResult.success(buildInformationService.submitOrUpdate(request)); + } + + @ApiOperation("获取加盟类型 1 - 个人加盟 2- 企业加盟") + @GetMapping("/getJoinType") + public ResponseResult getJoinType(@RequestParam(value = "lineId", required = true) Long lineId) { + return ResponseResult.success(buildInformationService.getJoinType(lineId)); + } + } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLinePayController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLinePayController.java index cde4700ef..4b4273c43 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLinePayController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCLinePayController.java @@ -44,4 +44,12 @@ public class PCLinePayController { return ResponseResult.success(linePayService.getAmount(lineId)); } + @ApiOperation("缴纳意向金/加盟费") + @PostMapping("/submitPayInfo") + public ResponseResult submitPayInfo(@RequestBody LinePaySubmitRequest request){ + PartnerUserInfoVO partnerUser = PartnerUserHolder.getUser(); + return ResponseResult.success(linePayService.submitPayInfo(request, partnerUser)); + } + + }