diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/controller/BookCarController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/controller/BookCarController.java index eef187a..4e72ea2 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/controller/BookCarController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/controller/BookCarController.java @@ -44,4 +44,15 @@ public class BookCarController extends BaseController { return bookCarService.getBookCarDetails(devInfo); } + /** + * 删除预约车 + * @param devInfo + * @return + */ + @ApiOperation(value = "删除预约车") + @PostMapping("/deleteById") + public AjaxResult deleteById(@RequestBody BookCarInfoDto devInfo) { + return bookCarService.deleteById(devInfo); + } + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java index 8443d0b..2790baf 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/domain/BookCarInfoDto.java @@ -15,10 +15,14 @@ import java.util.List; */ @Data public class BookCarInfoDto { - // + + @ApiModelProperty(value = "主键id") + private Integer id; + @ApiModelProperty(value = "订单id") private Integer bookId; + @ApiModelProperty(value = "设备id") private String maId; @ApiModelProperty(value = "订单编号") diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java index 91008fc..e85fb9f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/mapper/BookCarMapper.java @@ -36,4 +36,11 @@ public interface BookCarMapper { * @return */ DevInfoVo selectDevInfoByMaId(@Param("maId") String maId, @Param("userId") Long userId); + + /** + * 删除预约车 + * @param id + * @return + */ + int deleteById(Integer id); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/BookCarService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/BookCarService.java index 42ae881..612eb4e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/BookCarService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/BookCarService.java @@ -26,4 +26,10 @@ public interface BookCarService { */ AjaxResult getBookCarDetails(BookCarInfoDto devInfo); + /** + * 删除预约车 + * @param devInfo + * @return + */ + AjaxResult deleteById(BookCarInfoDto devInfo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java index ed5d5a1..7908660 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/book/service/impl/BookCarServiceImpl.java @@ -2,11 +2,9 @@ package com.bonus.material.book.service.impl; import com.alibaba.nacos.common.utils.CollectionUtils; import com.bonus.common.biz.domain.BmFileInfo; -import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.web.domain.AjaxResult; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.material.book.domain.BookCarDetailDto; import com.bonus.material.book.domain.BookCarInfoDto; import com.bonus.material.book.domain.BookCarVo; import com.bonus.material.book.domain.CompanyPersonPhoneKey; @@ -18,9 +16,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -94,4 +90,18 @@ public class BookCarServiceImpl implements BookCarService { return AjaxResult.success(list); } + /** + * 删除预约车 + * @param devInfo + * @return + */ + @Override + public AjaxResult deleteById(BookCarInfoDto devInfo) { + if (devInfo == null || StringUtils.isEmpty(devInfo.getMaId())) { + return AjaxResult.error("传入设备ID为空,请刷新后重试"); + } + int result = bookCarMapper.deleteById(devInfo.getId()); + return result > 0 ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败"); + } + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java index f29ebad..3247cfc 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java @@ -28,6 +28,9 @@ public class DevInfo extends BaseEntity { private static final long serialVersionUID = 429270031714225761L; + @ApiModelProperty(value = "主键id") + private Integer id; + /** 设备id */ @Excel(name = "设备id") @ApiModelProperty(value = "设备id") diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml index df9a300..926db12 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/bookcar/BookCarMapper.xml @@ -9,8 +9,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" values(#{maId}, 0, #{orderCompany}, #{orderUser}, #{creater}, now()) + + delete from book_car_detail where id = #{id} + +