diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index 621211e5d..071c53126 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -48,7 +48,7 @@ public class WxBusinessCircleOrderController extends BaseController { } circleOrder.updateTenantInfo(getTenantInfo()); circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); - final PageInfo page = wxBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); + PageInfo page = wxBusinessCircleOrderService.listAsPage(circleOrder, pageNum, pageSize); return new ResultData(page); } @@ -119,7 +119,7 @@ public class WxBusinessCircleOrderController extends BaseController { circleOrder = new WxBusinessCircleOrder(); } circleOrder.updateTenantInfo(getTenantInfo()); - final PageInfo page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize); + PageInfo page = wxBusinessCircleOrderService.wxPayList(circleOrder, pageNum, pageSize); return new ResultData(page); } @@ -134,7 +134,7 @@ public class WxBusinessCircleOrderController extends BaseController { circleOrder = new WxBusinessCircleOrder(); } circleOrder.updateTenantInfo(getTenantInfo()); - AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderService.aliStatistics(circleOrder); + AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderService.wxStatistics(circleOrder); return new ResultData(aliStatistics); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java index 0d9790380..67044b186 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java @@ -55,8 +55,8 @@ public interface WxBusinessCircleOrderMapper extends CommonMapper wxRefundList(WxBusinessCircleOrder record); - AlipayOrWxStatistics aliPayStatistics(WxBusinessCircleOrder record); + AlipayOrWxStatistics wxPayStatistics(WxBusinessCircleOrder record); - AlipayOrWxStatistics aliRefundStatistics(WxBusinessCircleOrder record); + AlipayOrWxStatistics wxRefundStatistics(WxBusinessCircleOrder record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java index 7dd637efd..86307a6fd 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java @@ -93,6 +93,6 @@ public interface WxBusinessCircleOrderService { PageInfo wxPayList(WxBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize); - AlipayOrWxStatistics aliStatistics(WxBusinessCircleOrder circleOrder); + AlipayOrWxStatistics wxStatistics(WxBusinessCircleOrder circleOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 32cb908cc..a8a09ced6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -399,21 +399,32 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder if (CollectionUtils.isEmpty(pageInfo.getList())) { return pageInfo; } - List list = pageInfo.getList().parallelStream().map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); - record.setMerchantIds(list); - //查询退款数据 - List alipayOrWxStatistics = aliBusinessCircleOrderMapper.aliRefundList(record); + List list = pageInfo.getList().parallelStream().filter(s -> s.getMerchantId() != null) + .map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + Map statisticsMap = null; - if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { - statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); - } + Map merchantNamesMap = null; + if(CollectionUtils.isNotEmpty(list)){ + //查询退款数据 + record.setMerchantIds(list); + List alipayOrWxStatistics = aliBusinessCircleOrderMapper.aliRefundList(record); + + if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { + statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); + } - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setIds(list); - Map merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setIds(list); + merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + } for (AlipayOrWxStatistics statistics:pageInfo.getList()) { - statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + if(merchantNamesMap != null){ + statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + } + if(StringUtils.isBlank(statistics.getMerchantName())){ + statistics.setMerchantName("其他"); + } if(statisticsMap != null){ AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); if(refundstatistics != null){ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 78c32f2e8..7e1a89358 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -574,21 +574,32 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe if (CollectionUtils.isEmpty(pageInfo.getList())) { return pageInfo; } - List list = pageInfo.getList().parallelStream().map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); - record.setMerchantIds(list); - //查询退款数据 - List alipayOrWxStatistics = wxBusinessCircleOrderMapper.wxRefundList(record); + List list = pageInfo.getList().parallelStream().filter(s -> s.getMerchantId() != null) + .map(AlipayOrWxStatistics::getMerchantId).collect(Collectors.toList()); + Map statisticsMap = null; - if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { - statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); - } + Map merchantNamesMap = null; + if(CollectionUtils.isNotEmpty(list)){ + //查询退款数据 + record.setMerchantIds(list); + List alipayOrWxStatistics = wxBusinessCircleOrderMapper.wxRefundList(record); + + if (CollectionUtils.isNotEmpty(alipayOrWxStatistics)) { + statisticsMap = alipayOrWxStatistics.stream().collect(Collectors.toMap(AlipayOrWxStatistics::getMerchantId, s -> s)); + } - WxMerchant wxMerchant = new WxMerchant(); - wxMerchant.setIds(list); - Map merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.setIds(list); + merchantNamesMap = wxMerchantService.getIdAndNamesMap(wxMerchant); + } for (AlipayOrWxStatistics statistics:pageInfo.getList()) { - statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + if(merchantNamesMap != null){ + statistics.setMerchantName(merchantNamesMap.get(statistics.getMerchantId())); + } + if(StringUtils.isBlank(statistics.getMerchantName())){ + statistics.setMerchantName("其他"); + } if(statisticsMap != null){ AlipayOrWxStatistics refundstatistics = statisticsMap.get(statistics.getMerchantId()); if(refundstatistics != null){ @@ -601,7 +612,7 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe } @Override - public AlipayOrWxStatistics aliStatistics(WxBusinessCircleOrder record) { + public AlipayOrWxStatistics wxStatistics(WxBusinessCircleOrder record) { if (StringUtils.isNotEmpty(record.getMerchantName())) { List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); if (!CollectionUtils.isEmpty(ids)) { @@ -611,9 +622,9 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe record.setMerchantIds(ids); } } - AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderMapper.aliPayStatistics(record); + AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderMapper.wxPayStatistics(record); if(aliStatistics.getPayAmount() > 0){ - AlipayOrWxStatistics aliRefundStatistics = wxBusinessCircleOrderMapper.aliRefundStatistics(record); + AlipayOrWxStatistics aliRefundStatistics = wxBusinessCircleOrderMapper.wxRefundStatistics(record); aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 59d8a08a4..8b41c3749 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -248,7 +248,7 @@ GROUP BY merchant_id - order by payAmount desc; + order by payAmount desc SELECT merchant_id as 'merchantId', - IFNULL(SUM(`pay_amount`),0) as 'payAmount', - IFNULL(SUM(`increased_points`),0) as 'payPoints' + IFNULL(SUM(`pay_amount`),0) as 'payAmount', + IFNULL(SUM(`increased_points`),0) as 'payPoints' FROM wx_business_circle_order - where is_refund = 0 and merchant_id is not null + where is_refund = 0 and `tenant_id` = #{tenantId} @@ -280,10 +280,10 @@ GROUP BY merchant_id - order by payAmount desc; + order by payAmount desc - SELECT merchant_id as 'merchantId', IFNULL(SUM(`refund_amount`),0) as 'refundAmount', IFNULL(SUM(`increased_points`),0) as 'refundPoints' @@ -304,7 +304,7 @@ GROUP BY merchant_id - SELECT IFNULL(SUM(`pay_amount`),0) as 'payAmount', IFNULL(SUM(`increased_points`),0) as 'payPoints' @@ -324,7 +324,7 @@ - SELECT IFNULL(SUM(`refund_amount`),0) as 'refundAmount', IFNULL(SUM(`increased_points`),0) as 'refundPoints'