Compare commits
	
		
			No commits in common. "cf7924b14351e79bda1f66e4359029dbd7455d1f" and "01606f64bd6f669f63b6f35b14263f53e18a7e36" have entirely different histories.
		
	
	
		
			cf7924b143
			...
			01606f64bd
		
	
		| 
						 | 
				
			
			@ -7,7 +7,6 @@ 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;
 | 
			
		||||
| 
						 | 
				
			
			@ -62,11 +61,11 @@ public class DataStatisticsUtil {
 | 
			
		|||
        }
 | 
			
		||||
        return CuMemberRetailDataStatisticsResultVO.builder()
 | 
			
		||||
                .totalBoxNum(total.getTotalBoxNum())
 | 
			
		||||
                .totalPv(formatPV(total.getTotalPv()))
 | 
			
		||||
                .totalPv(total.getTotalPv())
 | 
			
		||||
                .bigRangeTotalBoxNum(bigRange.getTotalBoxNum())
 | 
			
		||||
                .bigRangeTotalPv(formatPV(bigRange.getTotalPv()))
 | 
			
		||||
                .bigRangeTotalPv(bigRange.getTotalPv())
 | 
			
		||||
                .smallRangeTotalBoxNum(smallRangeTotalBoxNum)
 | 
			
		||||
                .smallRangeTotalPv(formatPV(smallRangeTotalPv))
 | 
			
		||||
                .smallRangeTotalPv(smallRangeTotalPv)
 | 
			
		||||
                .build();
 | 
			
		||||
    }
 | 
			
		||||
    /**
 | 
			
		||||
| 
						 | 
				
			
			@ -223,11 +222,4 @@ 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
 | 
			
		||||
        );
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,6 +1,5 @@
 | 
			
		|||
package com.hzs.retail.member.vo;
 | 
			
		||||
 | 
			
		||||
import com.hzs.common.core.annotation.BigDecimalFormat;
 | 
			
		||||
import lombok.AllArgsConstructor;
 | 
			
		||||
import lombok.Builder;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
| 
						 | 
				
			
			@ -46,17 +45,14 @@ public class CuMemberRetailDataStatisticsResultVO implements Serializable {
 | 
			
		|||
    /**
 | 
			
		||||
     * 总业绩
 | 
			
		||||
     */
 | 
			
		||||
    @BigDecimalFormat
 | 
			
		||||
    private BigDecimal totalPv;
 | 
			
		||||
    /**
 | 
			
		||||
     * 大区业绩
 | 
			
		||||
     */
 | 
			
		||||
    @BigDecimalFormat
 | 
			
		||||
    private BigDecimal bigRangeTotalPv;
 | 
			
		||||
    /**
 | 
			
		||||
     * 小区业绩
 | 
			
		||||
     */
 | 
			
		||||
    @BigDecimalFormat
 | 
			
		||||
    private BigDecimal smallRangeTotalPv;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue