From a5144f17a240a91ae9203c795ec52816becbc731 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 17 Sep 2021 14:38:25 +0800
Subject: [PATCH] bug123
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 11 +++++++++++
zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml | 4 +++-
2 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
index 8f9cbbb..d0fd4d8 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java
@@ -39,6 +39,9 @@
@ApiModelProperty(value = "快过期 1-是 2-否")
private String isInvalid;
+ @ApiModelProperty(value = " 使用情况余额")
+ private Double balance;
+
@ApiModelProperty(value = "项目状态 有效/无效")
private String status;
@@ -124,6 +127,14 @@
}
}
+ public Double getBalance() {
+ return balance;
+ }
+
+ public void setBalance(Double balance) {
+ this.balance = balance;
+ }
+
public void setStatus(String status) {
this.status = status;
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml
index 0d608c5..e8fc10b 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseDao.xml
@@ -621,8 +621,10 @@
group by b.id) t
</select>
+ <!-- 美度不显示赠送金额 IFNULL(sum(IFNULL(gift_money, 0)),0)+-->
<select id="selectVipCardTotalMoney" resultType="java.lang.Double">
- SELECT IFNULL(sum(IFNULL(gift_money, 0)),0)+ IFNULL(sum(IFNULL(real_money, 0)),0) from money_card_use where vip_id=#{vipId} and `status` ='有效'
+
+ SELECT IFNULL(sum(IFNULL(real_money, 0)),0) from money_card_use where vip_id=#{vipId} and `status` ='有效'
</select>
--
Gitblit v1.9.1