Compare commits
	
		
			No commits in common. "53ad5fc0bd9a8cb9e0f74816535c41baf7670869" and "936e404e7094c8aa7bb5e7c0bac15cf291107969" have entirely different histories.
		
	
	
		
			53ad5fc0bd
			...
			936e404e70
		
	
		| 
						 | 
					@ -865,16 +865,16 @@ public class BonusSettleRangeHandle extends BonusSettleHandle {
 | 
				
			||||||
            // 累计盒数、业绩,不管激活不激活都处理,兼容不激活判断显示有问题
 | 
					            // 累计盒数、业绩,不管激活不激活都处理,兼容不激活判断显示有问题
 | 
				
			||||||
            if (isSecond) {
 | 
					            if (isSecond) {
 | 
				
			||||||
                // 当天,秒结处理
 | 
					                // 当天,秒结处理
 | 
				
			||||||
                targetMemberRangeExt.setAllTeamNewBoxNum(targetMemberRangeExt.getAllTeamNewBoxNum().subtract(boxNum));
 | 
					                targetMemberRangeExt.setAllTeamNewBoxNum(targetMemberRangeExt.getAllTeamNewBoxNum().add(boxNum));
 | 
				
			||||||
                targetMemberRangeExt.setAllTeamNewPv(targetMemberRangeExt.getAllTeamNewPv().subtract(orderAchieve));
 | 
					                targetMemberRangeExt.setAllTeamNewPv(targetMemberRangeExt.getAllTeamNewPv().add(orderAchieve));
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
                // 非当天,日结处理
 | 
					                // 非当天,日结处理
 | 
				
			||||||
                targetMemberRangeExt.setAllTeamNewBoxNum(targetMemberRangeExt.getAllTeamNewBoxNum().subtract(boxNum));
 | 
					                targetMemberRangeExt.setAllTeamNewBoxNum(targetMemberRangeExt.getAllTeamNewBoxNum().add(boxNum));
 | 
				
			||||||
                targetMemberRangeExt.setAllTeamBoxNum(targetMemberRangeExt.getAllTeamBoxNum().subtract(boxNum));
 | 
					                targetMemberRangeExt.setAllTeamBoxNum(targetMemberRangeExt.getAllTeamBoxNum().add(boxNum));
 | 
				
			||||||
                targetMemberRangeExt.setAllTeamMonthBoxNum(targetMemberRangeExt.getAllTeamMonthBoxNum().subtract(boxNum));
 | 
					                targetMemberRangeExt.setAllTeamMonthBoxNum(targetMemberRangeExt.getAllTeamMonthBoxNum().add(boxNum));
 | 
				
			||||||
                targetMemberRangeExt.setAllTeamNewPv(targetMemberRangeExt.getAllTeamNewPv().subtract(orderAchieve));
 | 
					                targetMemberRangeExt.setAllTeamNewPv(targetMemberRangeExt.getAllTeamNewPv().add(orderAchieve));
 | 
				
			||||||
                targetMemberRangeExt.setAllTeamConsumePv(targetMemberRangeExt.getAllTeamConsumePv().subtract(orderAchieve));
 | 
					                targetMemberRangeExt.setAllTeamConsumePv(targetMemberRangeExt.getAllTeamConsumePv().add(orderAchieve));
 | 
				
			||||||
                targetMemberRangeExt.setAllTeamMonthPv(targetMemberRangeExt.getAllTeamMonthPv().subtract(orderAchieve));
 | 
					                targetMemberRangeExt.setAllTeamMonthPv(targetMemberRangeExt.getAllTeamMonthPv().add(orderAchieve));
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            // 激活的账号才能累计业绩和盒数(有注册、升级订单)
 | 
					            // 激活的账号才能累计业绩和盒数(有注册、升级订单)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue