diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/DeleteShopRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/DeleteShopRequest.java index 007194f62..a0ddc3cdf 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/DeleteShopRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/DeleteShopRequest.java @@ -3,6 +3,8 @@ package com.cool.store.request; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * @author zhangchenbiao * @FileName: DeleteShopRequest @@ -13,6 +15,8 @@ import lombok.Data; public class DeleteShopRequest { @ApiModelProperty("店铺id") + @NotNull private Long shopId; + private String userId; } 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 6188df4d9..cf011dfd3 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 @@ -192,8 +192,12 @@ public class ShopServiceImpl implements ShopService { } @Override + @Transactional(rollbackFor = Exception.class) public Integer deleteShop(DeleteShopRequest request) { -// ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); + if (shopInfo==null){ + throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); + } // if (Objects.nonNull(shopInfo)) { // //进入选址不允许删除操作 // throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); @@ -209,9 +213,16 @@ public class ShopServiceImpl implements ShopService { // } // pointRecommendDAO.updateRecommendStatus(shopInfo.getPointId(), PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1, Arrays.asList(PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_5)); // } + LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + lineInfoDO.setWantShopNum(lineInfoDO.getWantShopNum() - 1); + lineInfoDO.setUpdateTime(new Date()); + lineInfoDO.setUpdateUserId(request.getUserId()); + lineInfoDAO.updateLineInfo(lineInfoDO); ShopInfoDO updateShop = new ShopInfoDO(); updateShop.setId(request.getShopId()); updateShop.setDeleted(true); + updateShop.setUpdateTime(new Date()); + updateShop.setUpdateUserId(request.getUserId()); return shopInfoDAO.updateShopInfo(updateShop); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java index d69259916..883c89668 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCShopController.java @@ -59,6 +59,7 @@ public class PCShopController { @ApiOperation("删除店铺") @PostMapping("/deleteShop") public ResponseResult deleteShop(@RequestBody @Validated DeleteShopRequest request) { + request.setUserId(CurrentUserHolder.getUserId()); return ResponseResult.success(shopService.deleteShop(request)); }