diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/ConsultationGoodVO.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/ConsultationGoodVO.java index 0c3ea94..fa3b1de 100644 --- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/ConsultationGoodVO.java +++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/ConsultationGoodVO.java @@ -5,6 +5,7 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.time.LocalTime; import java.util.Date; @@ -22,6 +23,17 @@ public class ConsultationGoodVO implements Serializable { */ private String orderNo; + /** + * 下单时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime orderTime; + + /** + * 订单状态,待付款:WAIT_PAY,已付款:PAY,已取消:CANCEL,待收货:WAIT_RECEIVED,已收货:RECEIVED,待退款:WAIT_REFUND,已退款:REFUNDED,待退货:WAIT_RETURNED,已退货:RETURNED + */ + private String orderStatus; + /** * 订单类型 */ diff --git a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml index 84076b5..344295c 100644 --- a/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml +++ b/xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml @@ -179,6 +179,8 @@ gr.order_no, gr.buy_source, gr.total_price, + gr.order_time, + gr.order_status, IF( gr.order_type = 'HEALTH_CONSULTATION', (SELECT person_picture_url FROM hospital_person_info WHERE id =gr.hospital_person_id ), NULL ) personPictureUrl, IF( gr.order_type = 'HEALTH_CONSULTATION', ( SELECT person_phone FROM hospital_person_info WHERE id =gr.hospital_person_id ), NULL ) personPhone,