diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoOrderBusinessStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoOrderBusinessStatistics.java index 02caa27a2..0e3de0717 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoOrderBusinessStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoOrderBusinessStatistics.java @@ -14,7 +14,7 @@ public class WxVtwoOrderBusinessStatistics implements Serializable { private String businessName; private Integer businessCount; - private BigDecimal sumMoney; + private BigDecimal orderMoney; private Double countRatio; private Double moneyRatio; diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoOrderCountStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoOrderCountStatistics.java index b5a592b39..9bd01fb3a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoOrderCountStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoOrderCountStatistics.java @@ -14,6 +14,6 @@ public class WxVtwoOrderCountStatistics implements Serializable { private Integer userCount; private Integer orderCount; - private BigDecimal sumMoney; + private BigDecimal orderMoney; private Integer merchantCount; } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoSettlementStatistics.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoSettlementStatistics.java index c73283105..d17ba7c2a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoSettlementStatistics.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxVtwoSettlementStatistics.java @@ -15,4 +15,7 @@ public class WxVtwoSettlementStatistics implements Serializable { private Integer merchantCount; private BigDecimal mallPrice; private BigDecimal merchantPrice; + + private double mallRatio; + private double merchantRatio; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantSettlementServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantSettlementServiceImpl.java index a664eca60..42f3e3470 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantSettlementServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityGrantSettlementServiceImpl.java @@ -222,7 +222,10 @@ public class WxVtwoActivityGrantSettlementServiceImpl extends ServiceImpl activityAwardList = wxVtwoActivityAwardService.findActivityAwardList(statisticsVo.getActivityId(), statisticsVo.getTenantId()); List awardGrantStatistics = wxVtwoActivityGrantAwardService.awardItemStatistics(statisticsVo); @@ -204,8 +206,8 @@ public class WxVtwoActivityGrantStatisticsServiceImpl implements WxVtwoActivityG } awardGrantStatisticsList.add(awardGrantStatisticsItem); } + return awardGrantStatisticsList.stream().sorted(Comparator.comparing(WxVtwoAwardGrantStatistics::getCountRatio).reversed()).collect(Collectors.toList()); } - return awardGrantStatisticsList; } } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityOrderServiceImpl.java index 2645ae3b7..e9c5ae97a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxVtwoActivityOrderServiceImpl.java @@ -473,7 +473,7 @@ public class WxVtwoActivityOrderServiceImpl extends ServiceImpl businessStatistics = wxVtwoActivityOrderMapper.getBusinessStatistics(activityOrder); if(businessStatistics != null && !businessStatistics.isEmpty()){ Map bussinessMap = wxBusinessService.findAllMap(activityOrder); - BigDecimal totalMoney = businessStatistics.stream().map(WxVtwoOrderBusinessStatistics::getSumMoney).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal totalMoney = businessStatistics.stream().map(WxVtwoOrderBusinessStatistics::getOrderMoney).reduce(BigDecimal.ZERO, BigDecimal::add); int totalCount = businessStatistics.size(); for (WxVtwoOrderBusinessStatistics statistics : businessStatistics){ statistics.setBusinessName(statistics.getBusinessId() == null?"其他":bussinessMap.get(statistics.getBusinessId()).getTitle()); - statistics.setMoneyRatio(statistics.getSumMoney().divide(totalMoney,4, RoundingMode.HALF_UP).doubleValue()); + statistics.setMoneyRatio(statistics.getOrderMoney().divide(totalMoney,4, RoundingMode.HALF_UP).doubleValue()); statistics.setCountRatio(new BigDecimal(statistics.getBusinessCount()).divide(new BigDecimal(totalCount),4, RoundingMode.HALF_UP).doubleValue()); } return businessStatistics.stream().sorted(Comparator.comparing(WxVtwoOrderBusinessStatistics::getMoneyRatio).reversed()).collect(Collectors.toList()); diff --git a/mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml index cac48346a..1312f1b1f 100644 --- a/mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxVtwoActivityOrderMapper.xml @@ -188,7 +188,7 @@ select business_id businessId, count(1) businessCount, - IFNULL(sum(order_money),0) sumMoney + IFNULL(sum(order_money),0) orderMoney from wx_vtwo_activity_order group by business_id