From 2bc39e9183e62818dcfbb3cdfc6cdca5dfa43923 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 12 Jan 2021 15:37:52 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml | 1 +
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml | 2 ++
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java | 11 +++++++++++
zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java | 10 ++++++++++
4 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
index dcc8ff6..205bcd7 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/OrderDetailVo.java
@@ -19,6 +19,9 @@
@ApiModelProperty(value = "订单ID")
private String orderId;
+ @ApiModelProperty(value = "会员ID")
+ private String vipId;
+
@ApiModelProperty(value = "会员姓名")
private String vipName;
@@ -59,6 +62,13 @@
@ApiModelProperty(value = "下单时间")
private Date orderTime;
+ public String getVipId() {
+ return vipId;
+ }
+
+ public void setVipId(String vipId) {
+ this.vipId = vipId;
+ }
public Date getOrderTime() {
return orderTime;
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
index d0786df..cacf737 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceOrderListVo.java
@@ -18,6 +18,9 @@
@ApiModelProperty(value = "服务单Id")
private Long id;
+ @ApiModelProperty(value = "会员ID")
+ private Long vipId;
+
@ApiModelProperty(value = "下单顾问ID")
private Long createStaffId;
@@ -43,6 +46,14 @@
@ApiModelProperty(value = "服务项目信息")
private List<ServiceOrderListProjVo> projs;
+ public Long getVipId() {
+ return vipId;
+ }
+
+ public void setVipId(Long vipId) {
+ this.vipId = vipId;
+ }
+
public Long getCreateStaffId() {
return createStaffId;
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
index 3e09a48..33c70be 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml
@@ -479,6 +479,7 @@
<select id="selectApiOrderListInPage" resultType="com.matrix.system.app.vo.OrderDetailVo">
select
a.id orderId,
+ a.VIP_ID vipId,
a.ORDER_NO orderNo,
a.ORDER_TIME orderTime,
a.STATU orderStatus,
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
index d2b2a8b..736e68d 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml
@@ -464,6 +464,7 @@
<result property="time" column="time"/>
<result property="bed" column="bed" />
<result property="vipName" column="vipName" />
+ <result property="vipId" column="vipId" />
<result property="timeLength" column="timeLength" />
<result property="status" column="status" />
<result property="createStaffId" column="createStaffId" />
@@ -485,6 +486,7 @@
a.create_staff_id createStaffId,
d.BED_NAME bed,
e.VIP_NAME vipName,
+ e.id vipId,
b.staff_id staffId,
f.su_name beautyName,
g.proj_name projName
--
Gitblit v1.9.1