diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java index 5aa96826f..9f3f000b0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java @@ -11,6 +11,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.OrderPileOccupy; import com.jsowell.pile.dto.GenerateOccupyOrderDTO; import com.jsowell.pile.service.OrderPileOccupyService; +import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO; import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -88,7 +89,8 @@ public class OccupyOrderController extends BaseController { logger.info("查询占桩订单详情页 param:{}", occupyCode); RestApiResponse response = null; try { - orderPileOccupyService.getOccupyOrderDetail(occupyCode); + OccupyOrderDetailVO vo = orderPileOccupyService.getOccupyOrderDetail(occupyCode); + response = new RestApiResponse<>(vo); } catch (Exception e) { logger.error("查询占桩订单详情页 error,", e); response = new RestApiResponse<>(e); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java index 08dd2e001..65d4ccea6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java +++ b/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 queryDraftOccupyOrder(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode); + + /** + * 获取占桩订单详情 + * @param occupyCode + */ + OccupyOrderDetailVO getOccupyOrderDetail(String occupyCode); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index 8f284594a..59b4cbd61 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/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; } /* diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OccupyOrderDetailVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OccupyOrderDetailVO.java index 4f8d306b6..c1ca09612 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OccupyOrderDetailVO.java +++ b/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; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml index 053488100..8d1585abc 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -866,4 +866,24 @@ and connector_code = #{connectorCode,jdbcType=VARCHAR} order by create_time DESC + + \ No newline at end of file