新增 占桩订单相关接口

jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java

@@ -50,37 +50,6 @@ public class OccupyOrderController extends BaseController {
         return response;
     }
 
-
-    /**
-     * 生成占桩订单
-     * https://api.jsowellcloud.com/uniapp/occupyOrder/generateOccupyOrder
-     * @param request
-     * @param dto
-     * @return
-     */
-    @PostMapping("/generateOccupyOrder")
-    public RestApiResponse<?> generateOccupyOrder(HttpServletRequest request, @RequestBody GenerateOccupyOrderDTO dto) {
-        logger.info("生成占桩订单 params:{}", JSON.toJSONString(dto));
-        RestApiResponse<?> response = null;
-        try {
-            // 获取memberId
-            String memberId = getMemberIdByAuthorization(request);
-            if (StringUtils.isEmpty(memberId)) {
-                throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR);
-            }
-            dto.setMemberId(memberId);
-            String occupyOrderCode = orderPileOccupyService.generateOccupyPileOrder(dto);
-            if (StringUtils.isNotBlank(occupyOrderCode)) {
-                response = new RestApiResponse<>(ImmutableMap.of("occupyOrderCode", occupyOrderCode));
-            }
-        } catch (Exception e) {
-            logger.error("生成占桩订单 error,", e);
-            response = new RestApiResponse<>(e);
-        }
-        logger.info("生成占桩订单 result:{}", response);
-        return response;
-    }
-
     /**
      * 查询占桩订单列表页
      * https://api.jsowellcloud.com/uniapp/occupyOrder/getOccupyOrderInfo
@@ -108,6 +77,23 @@ public class OccupyOrderController extends BaseController {
     }
 
 
-
-    // 查询占桩订单详情页
+    /**
+     * 查询占桩订单详情页
+     * https://api.jsowellcloud.com/uniapp/occupyOrder/getOccupyOrderDetail/{occupyCode}
+     * @param occupyCode
+     * @return
+     */
+    @GetMapping("/getOccupyOrderDetail/{occupyCode}")
+    public RestApiResponse<?> getOccupyOrderDetail(@PathVariable("occupyCode") String occupyCode) {
+        logger.info("查询占桩订单详情页 param:{}", occupyCode);
+        RestApiResponse<?> response = null;
+        try {
+            orderPileOccupyService.getOccupyOrderDetail(occupyCode);
+        } catch (Exception e) {
+            logger.error("查询占桩订单详情页 error,", e);
+            response = new RestApiResponse<>(e);
+        }
+        logger.info("查询占桩订单详情页 result:{}", response);
+        return response;
+    }
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java

@@ -78,4 +78,10 @@ public interface OrderPileOccupyService{
      * @param dto
      */
     void remoteGroundLock(RemoteGroundLockDTO dto);
+
+    /**
+     * 获取占桩订单详情
+     * @param occupyCode
+     */
+    OccupyOrderDetailVO getOccupyOrderDetail(String occupyCode);
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OccupyOrderDetailVO.java

@@ -0,0 +1,24 @@
+package com.jsowell.pile.vo.uniapp;
+
+import lombok.Data;
+
+/**
+ * 占桩订单详情
+ *
+ * @author Lemon
+ * @Date 2023/8/18 16:10
+ */
+@Data
+public class OccupyOrderDetailVO {
+    private String occupyCode;
+
+    private String occupyStatus;
+
+    private String stationId;
+
+    private String startTime;
+
+    private String endTime;
+
+    private String payStatus;
+}