fixed 商户预约管理相关接口

fuint-application/src/main/java/com/fuint/common/enums/BookStatusEnum.java

@@ -45,8 +45,10 @@ public enum BookStatusEnum {
         this.value = value;
     }
 
-    public static List<ParamDto> getBookStatusList() {
+    public static List<ParamDto> getBookStatusList(String... excludedKeys) {
+        List<String> excludedKeySet = Arrays.asList(excludedKeys);
         return Arrays.stream(BookStatusEnum.values())
+                .filter(status -> !excludedKeySet.contains(status.getKey()))
                 .map(status -> new ParamDto(status.getKey(), status.getValue(), status.getValue()))
                 .collect(Collectors.toList());
     }

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendAccountController.java

@@ -73,7 +73,6 @@ public class BackendAccountController extends BaseController {
     @CrossOrigin
     @PreAuthorize("@pms.hasPermission('system:account:index')")
     public ResponseObject list(HttpServletRequest request) throws BusinessCheckException {
-        String token = request.getHeader("Access-Token");
         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"));
         String accountName = request.getParameter("accountName") == null ? "" : request.getParameter("accountName");
@@ -82,7 +81,7 @@ public class BackendAccountController extends BaseController {
         String merchantId = request.getParameter("merchantId") == null ? "" : request.getParameter("merchantId");
         String storeId = request.getParameter("storeId") == null ? "" : request.getParameter("storeId");
         String staffId = request.getParameter("staffId") == null ? "" : request.getParameter("staffId");
-        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(token);
+        AccountInfo accountInfo = TokenUtil.getAccountInfoByToken(request.getHeader("Access-Token"));
 
         PaginationRequest paginationRequest = new PaginationRequest();
         paginationRequest.setCurrentPage(page);

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendBookItemController.java

@@ -115,7 +115,7 @@ public class BackendBookItemController extends BaseController {
         List<MtStore> storeList = storeService.getMyStoreList(accountInfo.getMerchantId(), accountInfo.getStoreId(), StatusEnum.ENABLED.getKey());
 
         // 预约状态列表
-        List<ParamDto> bookStatusList = BookStatusEnum.getBookStatusList();
+        List<ParamDto> bookStatusList = BookStatusEnum.getBookStatusList(BookStatusEnum.DELETE.getKey());
 
         Map<String, Object> param = new HashMap<>();
         param.put("status", StatusEnum.ENABLED.getKey());

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

@@ -256,16 +256,13 @@ public class ClientBookController extends BaseController {
         paginationRequest.setSearchParams(param);
         PaginationResponse<BookItemDto> paginationResponse = bookItemService.queryBookItemListByPagination(paginationRequest);
 
-        // 预约状态列表
-        List<ParamDto> statusList = BookStatusEnum.getBookStatusList();
-
         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());
-        result.put("statusList", statusList);
+        result.put("statusList", BookStatusEnum.getBookStatusList(BookStatusEnum.DELETE.getKey()));
 
         return getSuccessResult(result);
     }

fuint-application/src/main/java/com/fuint/module/merchantApi/controller/MerchantBookController.java

@@ -1,6 +1,8 @@
 package com.fuint.module.merchantApi.controller;
 
+import com.fuint.common.dto.ParamDto;
 import com.fuint.common.dto.UserInfo;
+import com.fuint.common.enums.BookStatusEnum;
 import com.fuint.common.service.BookItemService;
 import com.fuint.common.service.MemberService;
 import com.fuint.common.service.StaffService;
@@ -22,6 +24,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -68,7 +71,9 @@ public class MerchantBookController extends BaseController {
             return getFailureResult(1004);
         } else {
             params.put("merchantId", staffInfo.getMerchantId());
-            params.put("storeId", staffInfo.getStoreId());
+            if (staffInfo.getStoreId() > 0) {
+                params.put("storeId", staffInfo.getStoreId());
+            }
         }
         if (StringUtil.isNotEmpty(requestParams.getStatus())) {
             params.put("status", requestParams.getStatus());
@@ -79,8 +84,17 @@ public class MerchantBookController extends BaseController {
         paginationRequest.setPageSize(requestParams.getPageSize());
         paginationRequest.setSearchParams(params);
 
-        PaginationResponse bookList = bookItemService.queryBookItemListByPagination(paginationRequest);
-        return getSuccessResult(bookList);
+        PaginationResponse 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());
+        result.put("statusList", BookStatusEnum.getBookStatusList(BookStatusEnum.DELETE.getKey()));
+
+        return getSuccessResult(result);
     }
 
     /**
@@ -158,7 +172,8 @@ public class MerchantBookController extends BaseController {
         if (staffInfo == null || (staffInfo.getStoreId() != null && staffInfo.getStoreId() > 0 && !staffInfo.getStoreId().equals(bookItem.getStoreId()))) {
             return getFailureResult(1004);
         }
-
+        bookItem.setStatus(BookStatusEnum.CONFIRM.getKey());
+        bookItem.setOperator(staffInfo.getRealName());
         bookItemService.updateBookItem(bookItem);
         return getSuccessResult(true);
     }