angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:cf7924b14351e79bda1f66e4359029dbd7455d1f
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
..
compare: angelo:01606f64bd6f669f63b6f35b14263f53e18a7e36
Branches Tags
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
angelo:master

No commits in common. "cf7924b14351e79bda1f66e4359029dbd7455d1f" and "01606f64bd6f669f63b6f35b14263f53e18a7e36" have entirely different histories.
cf7924b143 ... 01606f64bd

2 changed files with 3 additions and 15 deletions
Show Stats Expand all files Collapse all files

14
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java
View File

@ -7,7 +7,6 @@ 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;
@ -62,11 +61,11 @@ public class DataStatisticsUtil {
} }
return CuMemberRetailDataStatisticsResultVO.builder() return CuMemberRetailDataStatisticsResultVO.builder()
.totalBoxNum(total.getTotalBoxNum()) .totalBoxNum(total.getTotalBoxNum())
.totalPv(formatPV(total.getTotalPv())) .totalPv(total.getTotalPv())
.bigRangeTotalBoxNum(bigRange.getTotalBoxNum()) .bigRangeTotalBoxNum(bigRange.getTotalBoxNum())
.bigRangeTotalPv(formatPV(bigRange.getTotalPv())) .bigRangeTotalPv(bigRange.getTotalPv())
.smallRangeTotalBoxNum(smallRangeTotalBoxNum) .smallRangeTotalBoxNum(smallRangeTotalBoxNum)
.smallRangeTotalPv(formatPV(smallRangeTotalPv)) .smallRangeTotalPv(smallRangeTotalPv)
.build(); .build();
} }
/** /**
@ -223,11 +222,4 @@ 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
);
}
} }

4
bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/CuMemberRetailDataStatisticsResultVO.java
View File

@ -1,6 +1,5 @@
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;
@ -46,17 +45,14 @@ 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;
} }