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

Compare commits

base: angelo:b0658f1bc3f5c4a52dc439b6bdedfb73ee5135ee
Branches Tags
angelo:master
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
..
compare: angelo:2f6e9da59892ef3a4f6a891fe98de9cc460ee11b
Branches Tags
angelo:test
angelo:dev
angelo:online
angelo:feat_shared_reg
angelo:master

No commits in common. "b0658f1bc3f5c4a52dc439b6bdedfb73ee5135ee" and "2f6e9da59892ef3a4f6a891fe98de9cc460ee11b" have entirely different histories.
b0658f1bc3 ... 2f6e9da598

1 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

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

@ -52,6 +52,8 @@ public class DataStatisticsUtil {
calcDetailVOTotalField(detailVOList, pkId); calcDetailVOTotalField(detailVOList, pkId);
addVirtualBranch(detailVOList, pkId); addVirtualBranch(detailVOList, pkId);
CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId); CuMemberRetailDataStatisticsDetailVO total = getDetailVOByPKID(detailVOList, pkId);
CuMemberRetailDataStatisticsDetailVO bigRangeBox = getBigRangeBoxDetailVO(detailVOList, pkId);
CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
if(EYesNo.NO.getIntValue() == cuMember.getIsActivate()){ if(EYesNo.NO.getIntValue() == cuMember.getIsActivate()){
// 昨日非激活 排除昨日日结表数据 // 昨日非激活 排除昨日日结表数据
excludeDailySettlementData(detailVOList); excludeDailySettlementData(detailVOList);
@ -59,8 +61,6 @@ public class DataStatisticsUtil {
// 排除注水数据 // 排除注水数据
excludeWaterInjectionData(detailVOList, pkId); excludeWaterInjectionData(detailVOList, pkId);
} }
CuMemberRetailDataStatisticsDetailVO bigRangeBox = getBigRangeBoxDetailVO(detailVOList, pkId);
CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRangeBox.getTotalBoxNum(); Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRangeBox.getTotalBoxNum();
if(smallRangeTotalBoxNum < 0){ if(smallRangeTotalBoxNum < 0){
smallRangeTotalBoxNum = 0; smallRangeTotalBoxNum = 0;