fixed 商户管理预约接口

fuint-application/src/main/java/com/fuint/common/dto/BookItemDto.java

@@ -78,4 +78,7 @@ public class BookItemDto implements Serializable {
     @ApiModelProperty("A：已提交；B：审核通过；C：审核未通过；D：删除；E：已完成")
     private String status;
 
+    @ApiModelProperty("状态")
+    private String statusName;
+
 }

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

@@ -45,6 +45,22 @@ public enum BookStatusEnum {
         this.value = value;
     }
 
+    /**
+     * 根据key获取value
+     *
+     * @param key
+     * @return
+     */
+    public static String getValue(String key) {
+        final BookStatusEnum[] values = BookStatusEnum.values();
+        for (BookStatusEnum value : values) {
+            if (key.equals(value.getKey())) {
+                return value.getValue();
+            }
+        }
+        return null;
+    }
+
     public static List<ParamDto> getBookStatusList(String... excludedKeys) {
         List<String> excludedKeySet = Arrays.asList(excludedKeys);
         return Arrays.stream(BookStatusEnum.values())

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

@@ -117,6 +117,7 @@ public class BookItemServiceImpl extends ServiceImpl<MtBookItemMapper, MtBookIte
                  if (mtBook != null) {
                      bookItemDto.setBookName(mtBook.getName());
                  }
+                 bookItemDto.setStatusName(BookStatusEnum.getValue(bookItemDto.getStatus()));
                  dataList.add(bookItemDto);
             }
         }

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

@@ -12,6 +12,7 @@ import com.fuint.framework.pagination.PaginationRequest;
 import com.fuint.framework.pagination.PaginationResponse;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
+import com.fuint.module.merchantApi.request.BookConfirmParam;
 import com.fuint.module.merchantApi.request.BookDetailParam;
 import com.fuint.module.merchantApi.request.BookListRequest;
 import com.fuint.repository.model.MtBookItem;
@@ -158,7 +159,7 @@ public class MerchantBookController extends BaseController {
     @ApiOperation(value = "确定预约")
     @RequestMapping(value = "/confirm", method = RequestMethod.POST)
     @CrossOrigin
-    public ResponseObject confirm(HttpServletRequest request, @RequestBody BookDetailParam param) throws BusinessCheckException {
+    public ResponseObject confirm(HttpServletRequest request, @RequestBody BookConfirmParam param) throws BusinessCheckException {
         UserInfo mtUser = TokenUtil.getUserInfoByToken(request.getHeader("Access-Token"));
 
         Integer bookId = param.getBookId();
@@ -172,7 +173,7 @@ 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.setStatus(param.getStatus() == null ? BookStatusEnum.CONFIRM.getKey() : param.getStatus());
         bookItem.setOperator(staffInfo.getRealName());
         bookItemService.updateBookItem(bookItem);
         return getSuccessResult(true);

fuint-application/src/main/java/com/fuint/module/merchantApi/request/BookConfirmParam.java

@@ -0,0 +1,22 @@
+package com.fuint.module.merchantApi.request;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 预约确认请求参数
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Data
+public class BookConfirmParam implements Serializable {
+
+    @ApiModelProperty(value="预约ID", name="bookId")
+    private Integer bookId;
+
+    @ApiModelProperty(value="状态", name="status")
+    private String status;
+
+}