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

业绩除万,四位小数

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

@@ -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
+        );
+    }
 }

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

@@ -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;
 }