新增 查询占桩订单详情接口

jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java

@@ -2,6 +2,7 @@ package com.jsowell.pile.mapper;
 
 import com.jsowell.pile.domain.OrderPileOccupy;
 import com.jsowell.pile.dto.QueryOccupyOrderDTO;
+import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO;
 import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -99,4 +100,10 @@ public interface OrderPileOccupyMapper {
      * @return
      */
     List<OrderPileOccupy> queryDraftOccupyOrder(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode);
+
+    /**
+     * 获取占桩订单详情
+     * @param occupyCode
+     */
+    OccupyOrderDetailVO getOccupyOrderDetail(String occupyCode);
 }

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java

@@ -372,9 +372,22 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService {
         }
     }
 
+    /**
+     * 获取占桩订单详情
+     * @param occupyCode
+     */
     @Override
     public OccupyOrderDetailVO getOccupyOrderDetail(String occupyCode) {
-        return null;
+        OccupyOrderDetailVO vo = orderPileOccupyMapper.getOccupyOrderDetail(occupyCode);
+        // 订单状态
+        vo.setOrderStatus(OccupyOrderStatusEnum.getValueByCode(vo.getOrderStatus()));
+        // 支付状态
+        vo.setPayStatus(OccupyOrderPayStatusEnum.getValueByCode(vo.getPayStatus()));
+        if (vo.getEndTime() != null && vo.getStartTime() != null) {
+            // 计算占桩时长
+            vo.setOccupyTime(DateUtils.getDatePoor(DateUtils.parseDate(vo.getEndTime()), DateUtils.parseDate(vo.getStartTime())));
+        }
+        return vo;
     }
 
     /*

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

@@ -2,6 +2,8 @@ package com.jsowell.pile.vo.uniapp;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 占桩订单详情
  *
@@ -10,15 +12,59 @@ import lombok.Data;
  */
 @Data
 public class OccupyOrderDetailVO {
+    /**
+     * 占桩订单
+     */
     private String occupyCode;
 
-    private String occupyStatus;
+    /**
+     * 订单状态
+     * （0-占桩中；1-订单完成; 2-订单挂起;9-草稿单）
+     */
+    private String orderStatus;
 
+    /**
+     * 站点id
+     */
     private String stationId;
 
+    /**
+     * 站点名称
+     */
+    private String stationName;
+
+    /**
+     * 运营商id
+     */
+    private String merchantId;
+
+    /**
+     * 运营商名称
+     */
+    private String merchantName;
+
+    /**
+     * 占桩开始时间
+     */
     private String startTime;
 
+    /**
+     * 占桩结束时间
+     */
     private String endTime;
 
+    /**
+     * 占桩总时长（结束时间 - 开始时间）
+     */
+    private String occupyTime;
+
+    /**
+     * 支付状态
+     */
     private String payStatus;
+
+    /**
+     * 订单金额
+     */
+    private String orderAmount;
 }