Commit 95fddbba authored by lining's avatar lining

feat: 服务订单价格

parent 98b5af46
...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel; ...@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
...@@ -63,4 +64,7 @@ public class ServiceOrderVO { ...@@ -63,4 +64,7 @@ public class ServiceOrderVO {
@ApiModelProperty(value = "订单状态 1待受理,2 已拍估价员 3待支付,4待派单,5服务中,6已完成,7已取消 ") @ApiModelProperty(value = "订单状态 1待受理,2 已拍估价员 3待支付,4待派单,5服务中,6已完成,7已取消 ")
private String orderStatus; private String orderStatus;
@ApiModelProperty(value = "价格")
private BigDecimal price;
} }
\ No newline at end of file
...@@ -351,6 +351,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> { ...@@ -351,6 +351,7 @@ public class ServiceOrderBizService extends AbstractMapper<ServiceOrder> {
serviceOrderVO.setRemark(serviceOrder.getRemark()); serviceOrderVO.setRemark(serviceOrder.getRemark());
serviceOrderVO.setCreateTime(serviceOrder.getCreateTime()); serviceOrderVO.setCreateTime(serviceOrder.getCreateTime());
serviceOrderVO.setOrderStatus(String.valueOf(serviceOrder.getOrderStatus())); serviceOrderVO.setOrderStatus(String.valueOf(serviceOrder.getOrderStatus()));
serviceOrderVO.setPrice(serviceOrder.getPrice());
// 剩余时间 // 剩余时间
if (serviceOrder.getOrderStatus().equals(ServiceOrderStatusEnum.SEND.getStatus())) { if (serviceOrder.getOrderStatus().equals(ServiceOrderStatusEnum.SEND.getStatus())) {
long left = Math.max(serviceOrder.getCancelTime().getTime() - System.currentTimeMillis(), 0); long left = Math.max(serviceOrder.getCancelTime().getTime() - System.currentTimeMillis(), 0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment