From ba7ef6a2cfeff873da48469cc775c5f928ea45e8 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Nov 2021 17:19:38 +0800
Subject: [PATCH] Merge branch 'ty_fix' into score_shop
---
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java | 12 ++++++++++++
zq-erp/src/main/java/com/matrix/system/app/vo/ServiceProjVo.java | 12 ++++++++++++
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml | 4 ++++
3 files changed, 28 insertions(+), 0 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 c9b6e8b..6fb3473 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
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -25,6 +26,9 @@
@ApiModelProperty(value = "套餐来源，转让，购买")
private String source;
+
+ @ApiModelProperty(value = "划扣金额")
+ private BigDecimal price;
@ApiModelProperty(value = "时长")
private Integer timeLength;
@@ -149,4 +153,12 @@
public void setBalance(Double balance) {
this.balance = balance;
}
+
+ public BigDecimal getPrice() {
+ return price;
+ }
+
+ public void setPrice(BigDecimal price) {
+ this.price = price;
+ }
}
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
index 67df2c9..fb43859 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/ServiceTcVo.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@@ -36,6 +37,9 @@
@ApiModelProperty(value = "若套餐为任选套餐 则判断是否无限次 Y是 N否")
private String isInfinite;
+
+ @ApiModelProperty(value = "来源")
+ private String source;
@ApiModelProperty(value = "套餐内产品")
List<ServiceProjVo> proj;
@@ -150,4 +154,12 @@
public void setStatus(String status) {
this.status = status;
}
+
+ public String getSource() {
+ return source;
+ }
+
+ public void setSource(String source) {
+ this.source = source;
+ }
}
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
index 957d259..17b4ddf 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml
@@ -892,6 +892,8 @@
<collection property="taocanProjUse" ofType="com.matrix.system.hive.bean.SysProjUse">
<id property="id" column="proj_info_id" />
<result property="projName" column="proj_proj_name"/>
+ <result property="source" column="proj_source"/>
+ <result property="price" column="proj_price"/>
<result property="failTime" column="proj_FAIL_TIME"/>
<result property="surplusCount" column="proj_SURPLUS_COUNT"/>
<result property="timeLength" column="proj_time_length"/>
@@ -913,6 +915,8 @@
e.SURPLUS_COUNT proj_SURPLUS_COUNT,
e.id proj_info_id,
e.proj_id proj_projId,
+ e.source proj_source,
+ e.price proj_price,
e.status proj_status,
f.time_length proj_time_length,
f.img proj_img
--
Gitblit v1.9.1