From 050ff0dfc04d4ca2a33ac0e97c98f042b9f95df6 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Wed, 07 Apr 2021 11:56:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/score_shop' into score_shop
---
zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java b/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java
index d392636..a2abe3a 100644
--- a/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java
+++ b/zq-erp/src/main/java/com/matrix/system/app/vo/VipAchieveDataShowVo.java
@@ -21,10 +21,10 @@
@ApiModelProperty(value = "现金业绩")
private BigDecimal cashAmount;
- @ApiModelProperty(value = "售卡业绩")
+ @ApiModelProperty(hidden = true)
private BigDecimal cardAmount;
- @ApiModelProperty(value = "产品业绩")
+ @ApiModelProperty(value = "订单提成")
private BigDecimal goodsAmount;
@ApiModelProperty(value = "划扣业绩")
@@ -36,7 +36,7 @@
@ApiModelProperty(value = "赠送消耗")
private BigDecimal freeConsume;
- @ApiModelProperty(value = "提成")
+ @ApiModelProperty(value = "服务提成")
private BigDecimal commission;
@ApiModelProperty(value = "人头数")
@@ -122,7 +122,7 @@
}
public BigDecimal getPeopleNum() {
- return peopleNum;
+ return peopleNum == null ? peopleNum : peopleNum.setScale(2, BigDecimal.ROUND_DOWN);
}
public void setPeopleNum(BigDecimal peopleNum) {
--
Gitblit v1.9.1