|
|
@@ -193,12 +193,12 @@ public class CockpitScreenServiceImpl implements CockpitScreenService { |
|
|
|
|
|
|
|
|
CountOrderTrendVO.OrderInfo orderInfo = new CountOrderTrendVO.OrderInfo(); |
|
|
CountOrderTrendVO.OrderInfo orderInfo = new CountOrderTrendVO.OrderInfo(); |
|
|
BigDecimal orderAmount = tradeOrder.stream().map(MonthOrderMapping::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO); |
|
|
BigDecimal orderAmount = tradeOrder.stream().map(MonthOrderMapping::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO); |
|
|
orderInfo.setAmount(orderAmount.divide(BigDecimal.valueOf(100))); |
|
|
|
|
|
|
|
|
orderInfo.setAmount(orderAmount.divide(BigDecimal.valueOf(100), CommonConstant.SCALE_2, RoundingMode.HALF_UP)); |
|
|
orderInfo.setCount(tradeOrder.stream().map(MonthOrderMapping::getCount).reduce(Integer::sum).orElse(0)); |
|
|
orderInfo.setCount(tradeOrder.stream().map(MonthOrderMapping::getCount).reduce(Integer::sum).orElse(0)); |
|
|
|
|
|
|
|
|
CountOrderTrendVO.VerifiedOrderInfo verifiedOrderInfo = new CountOrderTrendVO.VerifiedOrderInfo(); |
|
|
CountOrderTrendVO.VerifiedOrderInfo verifiedOrderInfo = new CountOrderTrendVO.VerifiedOrderInfo(); |
|
|
BigDecimal verifiedOrderAmount = verifiedOrder.stream().map(MonthOrderMapping::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO); |
|
|
BigDecimal verifiedOrderAmount = verifiedOrder.stream().map(MonthOrderMapping::getAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO); |
|
|
verifiedOrderInfo.setAmount(verifiedOrderAmount.divide(BigDecimal.valueOf(100))); |
|
|
|
|
|
|
|
|
verifiedOrderInfo.setAmount(verifiedOrderAmount.divide(BigDecimal.valueOf(100), CommonConstant.SCALE_2, RoundingMode.HALF_UP)); |
|
|
verifiedOrderInfo.setCount(verifiedOrder.stream().map(MonthOrderMapping::getCount).reduce(Integer::sum).orElse(0)); |
|
|
verifiedOrderInfo.setCount(verifiedOrder.stream().map(MonthOrderMapping::getCount).reduce(Integer::sum).orElse(0)); |
|
|
verifiedOrderInfo.setUserCount(verifiedOrder.stream().map(MonthOrderMapping::getUserCount).reduce(Integer::sum).orElse(0)); |
|
|
verifiedOrderInfo.setUserCount(verifiedOrder.stream().map(MonthOrderMapping::getUserCount).reduce(Integer::sum).orElse(0)); |
|
|
|
|
|
|
|
|
@@ -217,11 +217,11 @@ public class CockpitScreenServiceImpl implements CockpitScreenService { |
|
|
|
|
|
|
|
|
BigDecimal totalTradingAmount = BigDecimal.ZERO; |
|
|
BigDecimal totalTradingAmount = BigDecimal.ZERO; |
|
|
BigDecimal totalVerifiedAmount = BigDecimal.ZERO; |
|
|
BigDecimal totalVerifiedAmount = BigDecimal.ZERO; |
|
|
BigDecimal todayTradingAmount = BigDecimal.ZERO; |
|
|
|
|
|
|
|
|
BigDecimal yesterdayTradingAmount = BigDecimal.ZERO; |
|
|
for (String tenantId : tenantIds) { |
|
|
for (String tenantId : tenantIds) { |
|
|
totalTradingAmount = totalTradingAmount.add(wxCouponOrderMapper.sumOrderAmount(tenantId, null, null)); |
|
|
totalTradingAmount = totalTradingAmount.add(wxCouponOrderMapper.sumOrderAmount(tenantId, null, null)); |
|
|
totalVerifiedAmount = totalVerifiedAmount.add(wxCouponOrderMapper.sumOrderAmount(tenantId, EnumCouponOrderStatus.COUPON_ORDER_USED.getCode(), new Date())); |
|
|
|
|
|
todayTradingAmount = todayTradingAmount.add(wxCouponOrderMapper.sumOrderAmount(tenantId, null, new Date())); |
|
|
|
|
|
|
|
|
totalVerifiedAmount = totalVerifiedAmount.add(wxCouponOrderMapper.sumOrderAmount(tenantId, EnumCouponOrderStatus.COUPON_ORDER_USED.getCode(), null)); |
|
|
|
|
|
yesterdayTradingAmount = yesterdayTradingAmount.add(wxCouponOrderMapper.sumOrderAmount(tenantId, null, DateUtils.getPreviousDay())); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
if(wxMallService.isgroupSupport(tenantInfo)){ |
|
|
if(wxMallService.isgroupSupport(tenantInfo)){ |
|
|
@@ -229,26 +229,26 @@ public class CockpitScreenServiceImpl implements CockpitScreenService { |
|
|
tenantInfo.setTenantId(null); |
|
|
tenantInfo.setTenantId(null); |
|
|
} |
|
|
} |
|
|
Integer totalUserCount = wxCUserBasicInfoMapper.countUser(tenantInfo.getTenantId(), tenantInfo.getFinalTenantId(), null, null); |
|
|
Integer totalUserCount = wxCUserBasicInfoMapper.countUser(tenantInfo.getTenantId(), tenantInfo.getFinalTenantId(), null, null); |
|
|
Integer todayUserCount = wxCUserBasicInfoMapper.countUser(tenantInfo.getTenantId(), tenantInfo.getFinalTenantId(), new Date(), new Date()); |
|
|
|
|
|
|
|
|
Integer yesterdayUserCount = wxCUserBasicInfoMapper.countUser(tenantInfo.getTenantId(), tenantInfo.getFinalTenantId(), DateUtils.getPreviousDay(), DateUtils.getPreviousDay()); |
|
|
Integer weekUserCount = wxCUserBasicInfoMapper.countUser(tenantInfo.getTenantId(), tenantInfo.getFinalTenantId(), DateUtils.getFirstDayForCurrWeek(), DateUtils.getLastDayForCurrWeek()); |
|
|
Integer weekUserCount = wxCUserBasicInfoMapper.countUser(tenantInfo.getTenantId(), tenantInfo.getFinalTenantId(), DateUtils.getFirstDayForCurrWeek(), DateUtils.getLastDayForCurrWeek()); |
|
|
|
|
|
|
|
|
Integer totalMerchantCount = wxMerchantMapper.countMerchant(tenantIds); |
|
|
Integer totalMerchantCount = wxMerchantMapper.countMerchant(tenantIds); |
|
|
SumVisitDTO sumVisit = wxUserVisitMapper.sumVisit(tenantIds, null); |
|
|
SumVisitDTO sumVisit = wxUserVisitMapper.sumVisit(tenantIds, null); |
|
|
SumVisitDTO todaySumVisit = wxUserVisitMapper.sumVisit(tenantIds, new Date()); |
|
|
|
|
|
|
|
|
SumVisitDTO yesterdaySumVisit = wxUserVisitMapper.sumVisit(tenantIds, DateUtils.getPreviousDay()); |
|
|
Integer carUserCount = wxCUserCarMapper.countCarUser(tenantIds); |
|
|
Integer carUserCount = wxCUserCarMapper.countCarUser(tenantIds); |
|
|
|
|
|
|
|
|
CountBasicVO vo = new CountBasicVO(); |
|
|
CountBasicVO vo = new CountBasicVO(); |
|
|
vo.setTotalTradingAmount(totalTradingAmount.divide(BigDecimal.valueOf(100))); |
|
|
|
|
|
vo.setTotalVerifiedAmount(totalVerifiedAmount.divide(BigDecimal.valueOf(100))); |
|
|
|
|
|
|
|
|
vo.setTotalTradingAmount(totalTradingAmount.divide(BigDecimal.valueOf(100), CommonConstant.SCALE_2, RoundingMode.HALF_UP)); |
|
|
|
|
|
vo.setTotalVerifiedAmount(totalVerifiedAmount.divide(BigDecimal.valueOf(100), CommonConstant.SCALE_2, RoundingMode.HALF_UP)); |
|
|
vo.setTotalMerchantCount(totalMerchantCount); |
|
|
vo.setTotalMerchantCount(totalMerchantCount); |
|
|
vo.setTotalUserCount(totalUserCount); |
|
|
vo.setTotalUserCount(totalUserCount); |
|
|
vo.setTotalReachUserCount(sumVisit.getUv()); |
|
|
vo.setTotalReachUserCount(sumVisit.getUv()); |
|
|
vo.setWeekUserCount(weekUserCount); |
|
|
vo.setWeekUserCount(weekUserCount); |
|
|
vo.setCarUserCount(carUserCount); |
|
|
vo.setCarUserCount(carUserCount); |
|
|
|
|
|
|
|
|
vo.setTodayPvCount(todaySumVisit.getPv()); |
|
|
|
|
|
vo.setTodayUserCount(todayUserCount); |
|
|
|
|
|
vo.setTodayTradingAmount(todayTradingAmount.divide(BigDecimal.valueOf(100))); |
|
|
|
|
|
|
|
|
vo.setYesterdayPvCount(yesterdaySumVisit.getPv()); |
|
|
|
|
|
vo.setYesterdayUserCount(yesterdayUserCount); |
|
|
|
|
|
vo.setYesterdayTradingAmount(yesterdayTradingAmount.divide(BigDecimal.valueOf(100), CommonConstant.SCALE_2, RoundingMode.HALF_UP)); |
|
|
return vo; |
|
|
return vo; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|