From c6c1cb109eea2df0c4c5d2e6714ae85ff2e785fe Mon Sep 17 00:00:00 2001 From: jyy <935090232@qq.com> Date: Tue, 16 Mar 2021 21:50:38 +0800 Subject: [PATCH] 修改redis配置 --- 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