Compare commits
	
		
			No commits in common. "2bd224b3d4f6f70837d2cc037737302890ac48f8" and "a46ec5257e64a5c2a3409cff1fff5cbec070d893" have entirely different histories.
		
	
	
		
			2bd224b3d4
			...
			a46ec5257e
		
	
		| 
						 | 
					@ -180,7 +180,7 @@ public class DataStatisticsUtil {
 | 
				
			||||||
                .memberCode(SELF_VIRTUAL_NAME)
 | 
					                .memberCode(SELF_VIRTUAL_NAME)
 | 
				
			||||||
                .totalBoxNum(
 | 
					                .totalBoxNum(
 | 
				
			||||||
                        detailVO.getConsumeBoxNum()
 | 
					                        detailVO.getConsumeBoxNum()
 | 
				
			||||||
//                        + detailVO.getNewBoxNum()
 | 
					                        + detailVO.getNewBoxNum()
 | 
				
			||||||
                        + detailVO.getSNewBoxNum()
 | 
					                        + detailVO.getSNewBoxNum()
 | 
				
			||||||
                )
 | 
					                )
 | 
				
			||||||
                .totalPv(
 | 
					                .totalPv(
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -887,7 +887,7 @@
 | 
				
			||||||
            NVL( NVL( currentMonth.NEW_CONSUME_PV, 0 ) + NVL( currentMonth.TEAM_NEW_PV, 0 ), 0 ) yesterdayPv,
 | 
					            NVL( NVL( currentMonth.NEW_CONSUME_PV, 0 ) + NVL( currentMonth.TEAM_NEW_PV, 0 ), 0 ) yesterdayPv,
 | 
				
			||||||
            NVL( NVL( currentMonth.NEW_BOX_NUM, 0 ) + NVL( currentMonth.TEAM_NEW_BOX_NUM, 0 ), 0 ) yesterdayBoxNum,
 | 
					            NVL( NVL( currentMonth.NEW_BOX_NUM, 0 ) + NVL( currentMonth.TEAM_NEW_BOX_NUM, 0 ), 0 ) yesterdayBoxNum,
 | 
				
			||||||
            NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + NVL( currentDay.NEW_CONSUME_PV, 0 ) + NVL( currentDay.TEAM_NEW_PV, 0 ), 0 ) currentMonthPv,
 | 
					            NVL( NVL( currentMonth.MONTH_CONSUME_PV, 0 ) + NVL( currentDay.NEW_CONSUME_PV, 0 ) + NVL( currentDay.TEAM_NEW_PV, 0 ), 0 ) currentMonthPv,
 | 
				
			||||||
            NVL( NVL( currentMonth.MONTH_BOX_NUM, 0 ) + NVL( currentMonth.TEAM_MONTH_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) currentMonthBoxNum,
 | 
					            NVL( NVL( currentMonth.MONTH_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) currentMonthBoxNum,
 | 
				
			||||||
            NVL( lastMonth.MONTH_CONSUME_PV, 0 ) lastMonthPv,
 | 
					            NVL( lastMonth.MONTH_CONSUME_PV, 0 ) lastMonthPv,
 | 
				
			||||||
            NVL( lastMonth.MONTH_BOX_NUM, 0 ) lastMonthBoxNum,
 | 
					            NVL( lastMonth.MONTH_BOX_NUM, 0 ) lastMonthBoxNum,
 | 
				
			||||||
            NVL( NVL( currentMonth.CONSUME_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) totalBoxNum
 | 
					            NVL( NVL( currentMonth.CONSUME_BOX_NUM, 0 ) + NVL( currentDay.NEW_BOX_NUM, 0 ) + NVL( currentDay.TEAM_NEW_BOX_NUM, 0 ), 0 ) totalBoxNum
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue