## 业绩汇总数据显示(309);
This commit is contained in:
		
							parent
							
								
									9ba58f66ac
								
							
						
					
					
						commit
						56a18ad2cf
					
				| 
						 | 
				
			
			@ -3255,9 +3255,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
 | 
			
		|||
            // 注册
 | 
			
		||||
            BigDecimal reAmount = BigDecimal.ZERO;
 | 
			
		||||
            BigDecimal reAchieve = BigDecimal.ZERO;
 | 
			
		||||
            if (memberMeritsSummaryMap.get(EOrderType.REGISTER_ORDER.getValue()) != null) {
 | 
			
		||||
                reAmount = memberMeritsSummaryMap.get(EOrderType.REGISTER_ORDER.getValue()).getAmount();
 | 
			
		||||
                reAchieve = memberMeritsSummaryMap.get(EOrderType.REGISTER_ORDER.getValue()).getAchieve();
 | 
			
		||||
            if (memberMeritsSummaryMap.get(EOrderType.RETAIL_REGISTER.getValue()) != null) {
 | 
			
		||||
                reAmount = memberMeritsSummaryMap.get(EOrderType.RETAIL_REGISTER.getValue()).getAmount();
 | 
			
		||||
                reAchieve = memberMeritsSummaryMap.get(EOrderType.RETAIL_REGISTER.getValue()).getAchieve();
 | 
			
		||||
            }
 | 
			
		||||
            censusSummaryVo.setRegisterAmount(reAmount);
 | 
			
		||||
            censusSummaryVo.setRegisterPv(reAchieve);
 | 
			
		||||
| 
						 | 
				
			
			@ -3265,9 +3265,9 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
 | 
			
		|||
            // 升级
 | 
			
		||||
            BigDecimal upAmount = BigDecimal.ZERO;
 | 
			
		||||
            BigDecimal upAchieve = BigDecimal.ZERO;
 | 
			
		||||
            if (memberMeritsSummaryMap.get(EOrderType.UPGRADE_ORDER.getValue()) != null) {
 | 
			
		||||
                upAmount = memberMeritsSummaryMap.get(EOrderType.UPGRADE_ORDER.getValue()).getAmount();
 | 
			
		||||
                upAchieve = memberMeritsSummaryMap.get(EOrderType.UPGRADE_ORDER.getValue()).getAchieve();
 | 
			
		||||
            if (memberMeritsSummaryMap.get(EOrderType.RETAIL_UPGRADE.getValue()) != null) {
 | 
			
		||||
                upAmount = memberMeritsSummaryMap.get(EOrderType.RETAIL_UPGRADE.getValue()).getAmount();
 | 
			
		||||
                upAchieve = memberMeritsSummaryMap.get(EOrderType.RETAIL_UPGRADE.getValue()).getAchieve();
 | 
			
		||||
            }
 | 
			
		||||
            censusSummaryVo.setUpgradeAmount(upAmount);
 | 
			
		||||
            censusSummaryVo.setUpgradePv(upAchieve);
 | 
			
		||||
| 
						 | 
				
			
			@ -3279,13 +3279,13 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
 | 
			
		|||
            // 复购订单
 | 
			
		||||
            BigDecimal repurchaseAmount = BigDecimal.ZERO;
 | 
			
		||||
            BigDecimal repurchaseAchieve = BigDecimal.ZERO;
 | 
			
		||||
            if (memberMeritsSummaryMap.get(EOrderType.REPURCHASE_ORDER.getValue()) != null) {
 | 
			
		||||
                repurchaseAmount = memberMeritsSummaryMap.get(EOrderType.REPURCHASE_ORDER.getValue()).getAmount();
 | 
			
		||||
                repurchaseAchieve = memberMeritsSummaryMap.get(EOrderType.REPURCHASE_ORDER.getValue()).getAchieve();
 | 
			
		||||
            if (memberMeritsSummaryMap.get(EOrderType.RETAIL_REPURCHASE.getValue()) != null) {
 | 
			
		||||
                repurchaseAmount = memberMeritsSummaryMap.get(EOrderType.RETAIL_REPURCHASE.getValue()).getAmount();
 | 
			
		||||
                repurchaseAchieve = memberMeritsSummaryMap.get(EOrderType.RETAIL_REPURCHASE.getValue()).getAchieve();
 | 
			
		||||
            }
 | 
			
		||||
            // 复消
 | 
			
		||||
            if (memberMeritsSummaryMap.get(EOrderType.CONSUME_ORDER.getValue()) != null) {
 | 
			
		||||
                repurchaseAmount = repurchaseAmount.add(memberMeritsSummaryMap.get(EOrderType.CONSUME_ORDER.getValue()).getAmount());
 | 
			
		||||
                repurchaseAmount = repurchaseAmount.add(memberMeritsSummaryMap.get(EOrderType.RETAIL_CONSUME.getValue()).getAmount());
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            // 复购
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue