From 7041612a1667926d834c032b5fca5bea3f3027d9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 05 Jan 2021 15:16:42 +0800
Subject: [PATCH] modify
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml | 4 +++-
zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java | 12 ++++++++++++
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java
index bd3239d..04cfadd 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/VipInfoListVo.java
@@ -1,5 +1,6 @@
package com.matrix.system.app.vo;
+import com.matrix.system.hive.bean.SysVipLevel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -27,6 +28,9 @@
@ApiModelProperty(value = "门店简称")
private String shopName;
+
+ @ApiModelProperty(value = "会员等级对象")
+ private String vipLevel;
public String getVipName() {
return vipName;
@@ -75,4 +79,12 @@
public void setShopName(String shopName) {
this.shopName = shopName;
}
+
+ public String getVipLevel() {
+ return vipLevel;
+ }
+
+ public void setVipLevel(String vipLevel) {
+ this.vipLevel = vipLevel;
+ }
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
index dc70747..417b21f 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysVipInfoDao.xml
@@ -1262,7 +1262,8 @@
a.PHONE phone,
a.photo photo,
b.arriveCnt arriveCnt,
- g.shop_short_name shopName
+ g.shop_short_name shopName,
+ z.level_name vipLevel
from sys_vip_info a
left join (
select x.vip_id, count(1) arriveCnt from (
@@ -1280,6 +1281,7 @@
group by date_format(datatime, '%Y-%m-%d'), vip_id
) x group by x.vip_id
) b on a.ID=b.vip_id
+ left join sys_vip_level z on a.level_id=z.id
<!-- 本月消费 -->
<if test="record.sort == 'used'">
left join (
--
Gitblit v1.9.1