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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
cabbage 2025-06-13 14:00:14 +08:00
parent d50fa4085b cf7924b143
commit 335befb3ca
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File 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,6 +7,7 @@ import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsDetailVO;
import com.hzs.retail.member.vo.CuMemberRetailDataStatisticsResultVO;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
@ -61,11 +62,11 @@ public class DataStatisticsUtil {
}
return CuMemberRetailDataStatisticsResultVO.builder()
.totalBoxNum(total.getTotalBoxNum())
.totalPv(total.getTotalPv())
.totalPv(formatPV(total.getTotalPv()))
.bigRangeTotalBoxNum(bigRange.getTotalBoxNum())
.bigRangeTotalPv(bigRange.getTotalPv())
.bigRangeTotalPv(formatPV(bigRange.getTotalPv()))
.smallRangeTotalBoxNum(smallRangeTotalBoxNum)
.smallRangeTotalPv(smallRangeTotalPv)
.smallRangeTotalPv(formatPV(smallRangeTotalPv))
.build();
}
/**
@ -222,4 +223,11 @@ public class DataStatisticsUtil {
.max(Comparator.comparingInt(CuMemberRetailDataStatisticsDetailVO::getTotalBoxNum))
.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,5 +1,6 @@
package com.hzs.retail.member.vo;
import com.hzs.common.core.annotation.BigDecimalFormat;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -45,14 +46,17 @@ public class CuMemberRetailDataStatisticsResultVO implements Serializable {
/**
* 总业绩
*/
@BigDecimalFormat
private BigDecimal totalPv;
/**
* 大区业绩
*/
@BigDecimalFormat
private BigDecimal bigRangeTotalPv;
/**
* 小区业绩
*/
@BigDecimalFormat
private BigDecimal smallRangeTotalPv;
}