forked from angelo/java-retail-app
parent
8d3408c421
commit
e0921965a7
|
@ -7,6 +7,7 @@ import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsDetailVO;
|
||||||
import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsResultVO;
|
import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsResultVO;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.math.RoundingMode;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -61,11 +62,11 @@ public class DataStatisticsUtil {
|
||||||
}
|
}
|
||||||
return CuMemberRetailDataStatisticsResultVO.builder()
|
return CuMemberRetailDataStatisticsResultVO.builder()
|
||||||
.totalBoxNum(total.getTotalBoxNum())
|
.totalBoxNum(total.getTotalBoxNum())
|
||||||
.totalPv(total.getTotalPv())
|
.totalPv(formatPV(total.getTotalPv()))
|
||||||
.bigRangeTotalBoxNum(bigRange.getTotalBoxNum())
|
.bigRangeTotalBoxNum(bigRange.getTotalBoxNum())
|
||||||
.bigRangeTotalPv(bigRange.getTotalPv())
|
.bigRangeTotalPv(formatPV(bigRange.getTotalPv()))
|
||||||
.smallRangeTotalBoxNum(smallRangeTotalBoxNum)
|
.smallRangeTotalBoxNum(smallRangeTotalBoxNum)
|
||||||
.smallRangeTotalPv(smallRangeTotalPv)
|
.smallRangeTotalPv(formatPV(smallRangeTotalPv))
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
|
@ -222,4 +223,11 @@ public class DataStatisticsUtil {
|
||||||
.max(Comparator.comparingInt(CuMemberRetailDataStatisticsDetailVO::getTotalBoxNum))
|
.max(Comparator.comparingInt(CuMemberRetailDataStatisticsDetailVO::getTotalBoxNum))
|
||||||
.orElse(null);
|
.orElse(null);
|
||||||
}
|
}
|
||||||
|
public static BigDecimal formatPV(BigDecimal pv){
|
||||||
|
return pv.divide(
|
||||||
|
new BigDecimal("10000"),
|
||||||
|
4,
|
||||||
|
RoundingMode.FLOOR
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package com.hzs.retail.member.vo;
|
package com.hzs.retail.member.vo;
|
||||||
|
|
||||||
|
import com.hzs.common.core.annotation.BigDecimalFormat;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
@ -45,14 +46,17 @@ public class CuMemberRetailDataStatisticsResultVO implements Serializable {
|
||||||
/**
|
/**
|
||||||
* 总业绩
|
* 总业绩
|
||||||
*/
|
*/
|
||||||
|
@BigDecimalFormat
|
||||||
private BigDecimal totalPv;
|
private BigDecimal totalPv;
|
||||||
/**
|
/**
|
||||||
* 大区业绩
|
* 大区业绩
|
||||||
*/
|
*/
|
||||||
|
@BigDecimalFormat
|
||||||
private BigDecimal bigRangeTotalPv;
|
private BigDecimal bigRangeTotalPv;
|
||||||
/**
|
/**
|
||||||
* 小区业绩
|
* 小区业绩
|
||||||
*/
|
*/
|
||||||
|
@BigDecimalFormat
|
||||||
private BigDecimal smallRangeTotalPv;
|
private BigDecimal smallRangeTotalPv;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue