3
0
Fork 0

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

This commit is contained in:
cabbage 2025-06-14 09:45:38 +08:00
commit da6ffb525d
1 changed files with 8 additions and 8 deletions

View File

@ -83,7 +83,7 @@ public class DataStatisticsUtil {
* @param detailVOList * @param detailVOList
*/ */
public static void calcDetailVOTotalField(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){ public static void calcDetailVOTotalField(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){
detailVOList.parallelStream().forEach(detailVO -> { detailVOList.stream().forEach(detailVO -> {
detailVO.setTotalBoxNum( detailVO.setTotalBoxNum(
detailVO.getConsumeBoxNum() // 个人累计消费盒数(日结) detailVO.getConsumeBoxNum() // 个人累计消费盒数(日结)
// + detailVO.getNewBoxNum() // 个人新增盒数(日结) // + detailVO.getNewBoxNum() // 个人新增盒数(日结)
@ -110,7 +110,7 @@ public class DataStatisticsUtil {
* @param detailVOList * @param detailVOList
*/ */
public static void excludeDailySettlementData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList){ public static void excludeDailySettlementData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList){
detailVOList.parallelStream().forEach(detailVO -> { detailVOList.stream().forEach(detailVO -> {
detailVO.setTotalBoxNum( detailVO.setTotalBoxNum(
detailVO.getTotalBoxNum() detailVO.getTotalBoxNum()
- detailVO.getTeamBoxNum() // 团队累计消费盒数(日结) - detailVO.getTeamBoxNum() // 团队累计消费盒数(日结)
@ -127,7 +127,7 @@ public class DataStatisticsUtil {
* @param detailVOList * @param detailVOList
*/ */
public static void excludeWaterInjectionData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){ public static void excludeWaterInjectionData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){
detailVOList.parallelStream().forEach(detailVO -> { detailVOList.stream().forEach(detailVO -> {
if(!detailVO.getPkId().equals(pkId)){ if(!detailVO.getPkId().equals(pkId)){
detailVO.setTotalBoxNum( detailVO.setTotalBoxNum(
detailVO.getTotalBoxNum() detailVO.getTotalBoxNum()
@ -220,7 +220,7 @@ public class DataStatisticsUtil {
* @return * @return
*/ */
public static CuMemberRetailDataStatisticsDetailVO getDetailVOByPKID(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){ public static CuMemberRetailDataStatisticsDetailVO getDetailVOByPKID(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){
return detailVOList.parallelStream().filter(o -> o.getPkId().equals(pkId)).findFirst().orElse(null); return detailVOList.stream().filter(o -> o.getPkId().equals(pkId)).findFirst().orElse(null);
} }
/** /**
@ -229,19 +229,19 @@ public class DataStatisticsUtil {
*/ */
public static PageResult<MarketDynamicsDetailVO> getMarketDynamicsAssemblyData(List<MarketDynamicsDetailVO> detailVOList, MarketDynamicsQueryDateParam param){ public static PageResult<MarketDynamicsDetailVO> getMarketDynamicsAssemblyData(List<MarketDynamicsDetailVO> detailVOList, MarketDynamicsQueryDateParam param){
if(StrUtil.isNotEmpty(param.getKeyWords())){ if(StrUtil.isNotEmpty(param.getKeyWords())){
detailVOList = detailVOList.parallelStream().filter(o -> param.getKeyWords().contains(o.getMemberCode()) || param.getKeyWords().contains(o.getMemberName())).collect(Collectors.toList()); detailVOList = detailVOList.stream().filter(o -> o.getMemberCode().contains(param.getKeyWords()) || o.getMemberName().contains(param.getKeyWords())).collect(Collectors.toList());
} }
MarketDynamicsDetailVO bigRange = detailVOList.parallelStream() MarketDynamicsDetailVO bigRange = detailVOList.stream()
.max(Comparator.comparingInt(MarketDynamicsDetailVO::getTotalBoxNum)) .max(Comparator.comparingInt(MarketDynamicsDetailVO::getTotalBoxNum))
.orElse(null); .orElse(null);
detailVOList = detailVOList.parallelStream().filter(o -> !o.getPkId().equals(bigRange.getPkId())).collect(Collectors.toList()); detailVOList = detailVOList.stream().filter(o -> !o.getPkId().equals(bigRange.getPkId())).collect(Collectors.toList());
PageResult<MarketDynamicsDetailVO> result = MemoryPageUtils.paginate(detailVOList, param.getPageNum(), param.getPageSize()); PageResult<MarketDynamicsDetailVO> result = MemoryPageUtils.paginate(detailVOList, param.getPageNum(), param.getPageSize());
result.setBigRange(bigRange); result.setBigRange(bigRange);
return result; return result;
} }
private static Integer getMaxTotalBoxNum(List<CuMemberRetailDataStatisticsDetailVO> detailVOList) { private static Integer getMaxTotalBoxNum(List<CuMemberRetailDataStatisticsDetailVO> detailVOList) {
return detailVOList.parallelStream() return detailVOList.stream()
.map(CuMemberRetailDataStatisticsDetailVO::getTotalBoxNum) .map(CuMemberRetailDataStatisticsDetailVO::getTotalBoxNum)
.filter(Objects::nonNull) .filter(Objects::nonNull)
.max(Integer::compare) .max(Integer::compare)