From b70b490637daef3dd360a417b0b9dca00e7e986b Mon Sep 17 00:00:00 2001 From: bianyadong Date: Sun, 28 Apr 2024 17:43:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/ShopStageAcceptanceRequest.java | 6 ++++++ .../service/OpenAcceptanceInfoService.java | 3 +++ .../impl/OpenAcceptanceInfoServiceImpl.java | 18 ++++++++++++++++++ .../webb/OpenAcceptanceInfoController.java | 10 ++++++++-- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ShopStageAcceptanceRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopStageAcceptanceRequest.java index 098dd34b8..c993c723d 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/ShopStageAcceptanceRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopStageAcceptanceRequest.java @@ -21,4 +21,10 @@ public class ShopStageAcceptanceRequest { @ApiModelProperty("是否合格 0:不合格 1:合格") private Boolean result; + /** + * 店铺id + */ + @ApiModelProperty("店铺id") + private Long shopId; + } \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java index 852553918..3d1f77d65 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAcceptanceInfoService.java @@ -2,6 +2,7 @@ package com.cool.store.service; import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.request.ShopAcceptanceRequest; +import com.cool.store.request.ShopStageAcceptanceRequest; import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.cool.store.vo.ShopAcceptanceVO; import com.github.pagehelper.PageInfo; @@ -31,4 +32,6 @@ public interface OpenAcceptanceInfoService { * @param shopAcceptanceRequest */ void acceptance(ShopAcceptanceRequest shopAcceptanceRequest, String userId); + + void acceptanceOne(ShopStageAcceptanceRequest shopStageAcceptanceRequest); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java index 405ee1a54..3061ed08c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAcceptanceInfoServiceImpl.java @@ -13,6 +13,7 @@ import com.cool.store.enums.point.ShopSubStageFieldEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.request.ShopAcceptanceRequest; +import com.cool.store.request.ShopStageAcceptanceRequest; import com.cool.store.service.OpenAcceptanceInfoService; import com.cool.store.service.RegionService; import com.cool.store.utils.CoolDateUtils; @@ -141,4 +142,21 @@ public class OpenAcceptanceInfoServiceImpl implements OpenAcceptanceInfoService shopInfoDO.setPlanOpenTime(shopAcceptanceRequest.getPlanOpenTime()); shopInfoDAO.updateShopInfo(shopInfoDO); } + + @Override + public void acceptanceOne(ShopStageAcceptanceRequest shopStageAcceptanceRequest) { + OpenAcceptanceInfoDO openAcceptanceInfoDO = openAcceptanceInfoDAO.selectOne(OpenAcceptanceInfoDO.builder().shopId(shopStageAcceptanceRequest.getShopId()).build()); + if (openAcceptanceInfoDO == null) { + throw new ServiceException("该店铺不存在"); + } + if (openAcceptanceInfoDO.getAcceptanceStatus() != null && openAcceptanceInfoDO.getAcceptanceStatus() == 1) { + throw new ServiceException("该店铺已验收完成，不能再次验收"); + } + + ShopSubStageFieldEnum shopSubStageFieldEnum = ShopSubStageFieldEnum.getByShopSubStage(shopStageAcceptanceRequest.getShopSubStage()); + if (shopSubStageFieldEnum != null) { + ReflectUtil.setFieldValue(openAcceptanceInfoDO, shopSubStageFieldEnum.getFiled(), shopStageAcceptanceRequest.getResult()); + } + openAcceptanceInfoDAO.updateByPrimaryKeySelective(openAcceptanceInfoDO); + } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java index ebd26a4f6..71f849e45 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAcceptanceInfoController.java @@ -3,11 +3,11 @@ package com.cool.store.controller.webb; import com.cool.store.context.CurrentUserHolder; import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.request.ShopAcceptanceRequest; +import com.cool.store.request.ShopStageAcceptanceRequest; import com.cool.store.response.ResponseResult; import com.cool.store.service.OpenAcceptanceInfoService; import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.cool.store.vo.ShopAcceptanceVO; -import com.cool.store.vo.ShopStageAcceptanceVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; /** * @Author byd @@ -54,4 +53,11 @@ public class OpenAcceptanceInfoController { return ResponseResult.success(Boolean.TRUE); } + @ApiOperation("开业验收-单项") + @PostMapping(path = "/acceptanceOne") + public ResponseResult acceptanceOne(@RequestBody ShopStageAcceptanceRequest shopStageAcceptanceRequest) { + openAcceptanceInfoService.acceptanceOne(shopStageAcceptanceRequest); + return ResponseResult.success(Boolean.TRUE); + } + }