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

## Fix - 盒数大小区逻辑

This commit is contained in:
sangelxiu1 2025-06-13 15:25:51 +08:00 committed by cabbage
parent 7df34fac00
commit 2ca069697e
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ public class DataStatisticsUtil {
excludeDailySettlementData(detailVOList); excludeDailySettlementData(detailVOList);
}else{ }else{
// 排除注水数据 // 排除注水数据
excludeWaterInjectionData(detailVOList); excludeWaterInjectionData(detailVOList, pkId);
} }
Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRange.getTotalBoxNum(); Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRange.getTotalBoxNum();
if(smallRangeTotalBoxNum < 0){ if(smallRangeTotalBoxNum < 0){
@ -119,17 +119,21 @@ public class DataStatisticsUtil {
/** /**
* 排除昨日日结注水数据 * 排除昨日日结注水数据
* 自己的注水不排除
* @param detailVOList * @param detailVOList
*/ */
public static void excludeWaterInjectionData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList){ public static void excludeWaterInjectionData(List<CuMemberRetailDataStatisticsDetailVO> detailVOList, Long pkId){
detailVOList.parallelStream().forEach(detailVO -> { detailVOList.parallelStream().forEach(detailVO -> {
detailVO.setTotalBoxNum( if(!detailVO.getPkId().equals(pkId)){
detailVO.getTotalBoxNum() detailVO.setTotalBoxNum(
- detailVO.getBigBoxNum() // 注水大区 detailVO.getTotalBoxNum()
- detailVO.getSmallBoxNum() // 注水小区 - detailVO.getBigBoxNum() // 注水大区
); - detailVO.getSmallBoxNum() // 注水小区
);
}
}); });
} }
/** /**
* 增加虚拟分支 主要为 * 增加虚拟分支 主要为
* 1.自己的消费总数 * 1.自己的消费总数
@ -154,7 +158,7 @@ public class DataStatisticsUtil {
CuMemberRetailDataStatisticsDetailVO smallRangeVirtualDetailVO = CuMemberRetailDataStatisticsDetailVO.builder() CuMemberRetailDataStatisticsDetailVO smallRangeVirtualDetailVO = CuMemberRetailDataStatisticsDetailVO.builder()
.pkId(SMALL_RANGE_VIRTUAL_ID) .pkId(SMALL_RANGE_VIRTUAL_ID)
.memberCode(SMALL_RANGE_VIRTUAL_NAME) .memberCode(SMALL_RANGE_VIRTUAL_NAME)
.totalBoxNum(detailVO.getBigBoxNum()) .totalBoxNum(detailVO.getSmallBoxNum())
.totalPv(BigDecimal.ZERO) .totalPv(BigDecimal.ZERO)
.bigBoxNum(0) .bigBoxNum(0)
.smallBoxNum(0) .smallBoxNum(0)