From ac11994f24ad28ea36d915e9561e550c0ddd2cce Mon Sep 17 00:00:00 2001 From: HaoWang <1477026787@qq.com> Date: Thu, 16 Nov 2023 17:25:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=AE=A2=E5=8D=95=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E4=B8=93=E5=AE=B6=E5=92=A8=E8=AF=A2?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../applet/vo/nursingorder/ConsultationGoodVO.java | 12 ++++++++++++ .../applet/nursingorder/NusringOrderMapper.xml | 2 ++ 2 files changed, 14 insertions(+) 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,