This commit is contained in:
bianyadong
2024-04-28 17:43:07 +08:00
parent 3e4bea75cc
commit b70b490637
4 changed files with 35 additions and 2 deletions

View File

@@ -21,4 +21,10 @@ public class ShopStageAcceptanceRequest {
@ApiModelProperty("是否合格 0:不合格 1:合格") @ApiModelProperty("是否合格 0:不合格 1:合格")
private Boolean result; private Boolean result;
/**
* 店铺id
*/
@ApiModelProperty("店铺id")
private Long shopId;
} }

View File

@@ -2,6 +2,7 @@ package com.cool.store.service;
import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.request.OpenAcceptanceRequest;
import com.cool.store.request.ShopAcceptanceRequest; import com.cool.store.request.ShopAcceptanceRequest;
import com.cool.store.request.ShopStageAcceptanceRequest;
import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.cool.store.vo.OpenAcceptanceInfoListVO;
import com.cool.store.vo.ShopAcceptanceVO; import com.cool.store.vo.ShopAcceptanceVO;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
@@ -31,4 +32,6 @@ public interface OpenAcceptanceInfoService {
* @param shopAcceptanceRequest * @param shopAcceptanceRequest
*/ */
void acceptance(ShopAcceptanceRequest shopAcceptanceRequest, String userId); void acceptance(ShopAcceptanceRequest shopAcceptanceRequest, String userId);
void acceptanceOne(ShopStageAcceptanceRequest shopStageAcceptanceRequest);
} }

View File

@@ -13,6 +13,7 @@ import com.cool.store.enums.point.ShopSubStageFieldEnum;
import com.cool.store.exception.ServiceException; import com.cool.store.exception.ServiceException;
import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.request.OpenAcceptanceRequest;
import com.cool.store.request.ShopAcceptanceRequest; import com.cool.store.request.ShopAcceptanceRequest;
import com.cool.store.request.ShopStageAcceptanceRequest;
import com.cool.store.service.OpenAcceptanceInfoService; import com.cool.store.service.OpenAcceptanceInfoService;
import com.cool.store.service.RegionService; import com.cool.store.service.RegionService;
import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.CoolDateUtils;
@@ -141,4 +142,21 @@ public class OpenAcceptanceInfoServiceImpl implements OpenAcceptanceInfoService
shopInfoDO.setPlanOpenTime(shopAcceptanceRequest.getPlanOpenTime()); shopInfoDO.setPlanOpenTime(shopAcceptanceRequest.getPlanOpenTime());
shopInfoDAO.updateShopInfo(shopInfoDO); 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);
}
} }

View File

@@ -3,11 +3,11 @@ package com.cool.store.controller.webb;
import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.CurrentUserHolder;
import com.cool.store.request.OpenAcceptanceRequest; import com.cool.store.request.OpenAcceptanceRequest;
import com.cool.store.request.ShopAcceptanceRequest; import com.cool.store.request.ShopAcceptanceRequest;
import com.cool.store.request.ShopStageAcceptanceRequest;
import com.cool.store.response.ResponseResult; import com.cool.store.response.ResponseResult;
import com.cool.store.service.OpenAcceptanceInfoService; import com.cool.store.service.OpenAcceptanceInfoService;
import com.cool.store.vo.OpenAcceptanceInfoListVO; import com.cool.store.vo.OpenAcceptanceInfoListVO;
import com.cool.store.vo.ShopAcceptanceVO; import com.cool.store.vo.ShopAcceptanceVO;
import com.cool.store.vo.ShopStageAcceptanceVO;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
@@ -16,7 +16,6 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
/** /**
* @Author byd * @Author byd
@@ -54,4 +53,11 @@ public class OpenAcceptanceInfoController {
return ResponseResult.success(Boolean.TRUE); return ResponseResult.success(Boolean.TRUE);
} }
@ApiOperation("开业验收-单项")
@PostMapping(path = "/acceptanceOne")
public ResponseResult<Boolean> acceptanceOne(@RequestBody ShopStageAcceptanceRequest shopStageAcceptanceRequest) {
openAcceptanceInfoService.acceptanceOne(shopStageAcceptanceRequest);
return ResponseResult.success(Boolean.TRUE);
}
} }