fixed 我的预约接口

fuint-application/src/main/java/com/fuint/common/service/BookItemService.java

@@ -60,4 +60,14 @@ public interface BookItemService extends IService<MtBookItem> {
      * @return
      * */
     List<MtBookItem> queryBookItemListByParams(Map<String, Object> params) throws BusinessCheckException;
+
+    /**
+     * 取消预约
+     *
+     * @param id 预约订单ID
+     * @param remark 备注信息
+     * @throws BusinessCheckException
+     * @return
+     * */
+    Boolean cancelBook(Integer id, String remark) throws BusinessCheckException;
 }

fuint-application/src/main/java/com/fuint/common/service/impl/BookItemServiceImpl.java

@@ -19,6 +19,7 @@ import com.fuint.repository.mapper.MtBookMapper;
 import com.fuint.repository.model.MtBook;
 import com.fuint.repository.model.MtBookItem;
 import com.fuint.repository.model.MtStore;
+import com.fuint.utils.StringUtil;
 import com.github.pagehelper.PageHelper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
@@ -269,4 +270,27 @@ public class BookItemServiceImpl extends ServiceImpl<MtBookItemMapper, MtBookIte
 
         return dataList;
     }
+
+    /**
+     * 取消预约
+     *
+     * @param id 预约ID
+     * @param remark 备注信息
+     * @throws BusinessCheckException
+     * @return
+     * */
+    @Override
+    @Transactional
+    public Boolean cancelBook(Integer id, String remark) throws BusinessCheckException {
+        MtBookItem mtBookItem = getBookItemById(id);
+        if (mtBookItem == null) {
+            throw new BusinessCheckException("该预约订单信息异常");
+        }
+        if (StringUtil.isNotEmpty(remark)) {
+            mtBookItem.setRemark(mtBookItem.getRemark() == null ? remark : mtBookItem.getRemark() + remark);
+        }
+        mtBookItem.setStatus(BookStatusEnum.CANCEL.getKey());
+        mtBookItemMapper.updateById(mtBookItem);
+        return true;
+    }
 }

fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientBookController.java

@@ -2,13 +2,13 @@ package com.fuint.module.clientApi.controller;
 
 import com.fuint.common.Constants;
 import com.fuint.common.dto.BookDto;
+import com.fuint.common.dto.BookItemDto;
 import com.fuint.common.dto.UserInfo;
 import com.fuint.common.enums.StatusEnum;
 import com.fuint.common.param.BookDetailParam;
 import com.fuint.common.param.BookListParam;
 import com.fuint.common.param.BookableParam;
 import com.fuint.common.service.*;
-import com.fuint.common.util.DateUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.exception.BusinessCheckException;
 import com.fuint.framework.pagination.PaginationRequest;
@@ -203,4 +203,73 @@ public class ClientBookController extends BaseController {
 
         return getSuccessResult(result);
     }
+
+    /**
+     * 获取我的预约
+     */
+    @ApiOperation(value = "获取我的预约")
+    @RequestMapping(value = "/myBook", method = RequestMethod.GET)
+    @CrossOrigin
+    public ResponseObject myBook(HttpServletRequest request) throws BusinessCheckException {
+        String token = request.getHeader("Access-Token");
+        String merchantNo = request.getHeader("merchantNo") == null ? "" : request.getHeader("merchantNo");
+        Integer page = request.getParameter("page") == null ? Constants.PAGE_NUMBER : Integer.parseInt(request.getParameter("page"));
+        Integer pageSize = request.getParameter("pageSize") == null ? Constants.PAGE_SIZE : Integer.parseInt(request.getParameter("pageSize"));
+
+        Map<String, Object> param = new HashMap<>();
+        param.put("status", StatusEnum.ENABLED.getKey());
+        Integer merchantId = merchantService.getMerchantId(merchantNo);
+        if (merchantId > 0) {
+            param.put("merchantId", merchantId);
+        }
+
+        UserInfo loginInfo = TokenUtil.getUserInfoByToken(token);
+        if (null == loginInfo) {
+            return getFailureResult(1001);
+        }
+        param.put("userId", loginInfo.getId());
+
+        PaginationRequest paginationRequest = new PaginationRequest();
+        paginationRequest.setCurrentPage(page);
+        paginationRequest.setPageSize(pageSize);
+        PaginationResponse<BookItemDto> paginationResponse = bookItemService.queryBookItemListByPagination(paginationRequest);
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("content", paginationResponse.getContent());
+        result.put("pageSize", paginationResponse.getPageSize());
+        result.put("pageNumber", paginationResponse.getCurrentPage());
+        result.put("totalRow", paginationResponse.getTotalElements());
+        result.put("totalPage", paginationResponse.getTotalPages());
+
+        return getSuccessResult(result);
+    }
+
+    /**
+     * 取消预约
+     */
+    @ApiOperation(value = "取消预约")
+    @RequestMapping(value = "/cancel", method = RequestMethod.GET)
+    @CrossOrigin
+    public ResponseObject cancel(HttpServletRequest request) throws BusinessCheckException {
+        String token = request.getHeader("Access-Token");
+        String remark = request.getParameter("remark") == null ? "会员取消" : request.getParameter("remark");
+        UserInfo mtUser = TokenUtil.getUserInfoByToken(token);
+
+        if (mtUser == null) {
+            return getFailureResult(1001, "用户未登录");
+        }
+
+        String orderId = request.getParameter("orderId");
+        if (StringUtil.isEmpty(orderId)) {
+            return getFailureResult(2000, "订单不能为空");
+        }
+
+        MtBookItem bookItem = bookItemService.getBookItemById(Integer.parseInt(orderId));
+        if (bookItem == null || !bookItem.getUserId().equals(mtUser.getId())) {
+            return getFailureResult(2000, "预约信息有误");
+        }
+
+        Boolean result = bookItemService.cancelBook(bookItem.getId(), remark);
+        return getSuccessResult(result);
+    }
 }