xinyilu/xinelu-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支' of http://182.92.166.109:3000/jihan/xinelu-api into jihan_0920_护理服务、商城、积分兑换、在线问诊功能分支

Browse Source
This commit is contained in:
haown 2023-11-16 17:29:35 +08:00
commit 2ae7b95854
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xinelu-nurse-applet/src/main/java/com/xinelu/applet/vo/nursingorder/ConsultationGoodVO.java
View File

@ -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;
/**
* 订单类型
*/

2
xinelu-nurse-applet/src/main/resources/mapper/applet/nursingorder/NusringOrderMapper.xml
View File

@ -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,