diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index 738268f1d..c2b6919f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -127,4 +127,19 @@ public class AliBusinessCircleOrderController extends BaseController { return new ResultData(page); } + @ApiOperation("统计接口2") + @GetMapping("aliStatistics") + @ApiImplicitParams({ + }) + @SystemControllerLog(description = "-统计") + public ResultData aliStatistics(@ModelAttribute AliBusinessCircleOrder circleOrder) { + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::aliStatistics"); + if (null == circleOrder) { + circleOrder = new AliBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + AlipayOrWxStatistics aliStatistics = aliBusinessCircleOrderService.aliStatistics(circleOrder); + return new ResultData(aliStatistics); + } + } 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 e2fa3a37d..621211e5d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -123,4 +123,19 @@ public class WxBusinessCircleOrderController extends BaseController { return new ResultData(page); } + @ApiOperation("统计接口2") + @GetMapping("wxStatistics") + @ApiImplicitParams({ + }) + @SystemControllerLog(description = "-统计") + public ResultData wxStatistics(@ModelAttribute WxBusinessCircleOrder circleOrder) { + logger.debug("[" + getIpAddr() + "] WxBusinessCircleOrderController::wxPayList"); + if (null == circleOrder) { + circleOrder = new WxBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderService.aliStatistics(circleOrder); + return new ResultData(aliStatistics); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java index fda372577..b2df06155 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/AliBusinessCircleOrderMapper.java @@ -53,4 +53,8 @@ public interface AliBusinessCircleOrderMapper extends CommonMapper aliRefundList(AliBusinessCircleOrder record); + AlipayOrWxStatistics aliPayStatistics(AliBusinessCircleOrder record); + + AlipayOrWxStatistics aliRefundStatistics(AliBusinessCircleOrder record); + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java index 4cc42da7f..0d9790380 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessCircleOrderMapper.java @@ -1,6 +1,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; +import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.vo.AlipayOrWxStatistics; @@ -54,4 +55,8 @@ public interface WxBusinessCircleOrderMapper extends CommonMapper wxRefundList(WxBusinessCircleOrder record); + AlipayOrWxStatistics aliPayStatistics(WxBusinessCircleOrder record); + + AlipayOrWxStatistics aliRefundStatistics(WxBusinessCircleOrder record); + } diff --git a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java index cd2ebe841..22a99ec34 100644 --- a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java @@ -60,4 +60,6 @@ public interface AliBusinessCircleOrderService { Integer sumCircleRefundAmount(BusinessCircleBase circleOrder); PageInfo aliPayList(AliBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize); + + AlipayOrWxStatistics aliStatistics(AliBusinessCircleOrder circleOrder); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java index 19a7dfd13..7dd637efd 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.BusinessCircleBase; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.TenantEntity; @@ -92,4 +93,6 @@ public interface WxBusinessCircleOrderService { PageInfo wxPayList(WxBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize); + AlipayOrWxStatistics aliStatistics(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 0bf5e3b60..32cb908cc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -424,4 +424,25 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder } return pageInfo; } + + @Override + public AlipayOrWxStatistics aliStatistics(AliBusinessCircleOrder record) { + if (StringUtils.isNotEmpty(record.getMerchantName())) { + List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); + if (!CollectionUtils.isEmpty(ids)) { + record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); + } + } + AlipayOrWxStatistics aliStatistics = aliBusinessCircleOrderMapper.aliPayStatistics(record); + if(aliStatistics.getPayAmount() > 0){ + AlipayOrWxStatistics aliRefundStatistics = aliBusinessCircleOrderMapper.aliRefundStatistics(record); + aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); + aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); + } + + return aliStatistics; + } } 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 6c3e4e6f1..78c32f2e8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -600,5 +600,26 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe return pageInfo; } + @Override + public AlipayOrWxStatistics aliStatistics(WxBusinessCircleOrder record) { + if (StringUtils.isNotEmpty(record.getMerchantName())) { + List ids = wxMerchantService.selectByMerchantIds(record.getMerchantName()); + if (!CollectionUtils.isEmpty(ids)) { + record.setMerchantIds(ids); + }else{ + ids.add(-999l); + record.setMerchantIds(ids); + } + } + AlipayOrWxStatistics aliStatistics = wxBusinessCircleOrderMapper.aliPayStatistics(record); + if(aliStatistics.getPayAmount() > 0){ + AlipayOrWxStatistics aliRefundStatistics = wxBusinessCircleOrderMapper.aliRefundStatistics(record); + aliStatistics.setRefundAmount(aliRefundStatistics.getRefundAmount()); + aliStatistics.setRefundPoints(aliRefundStatistics.getRefundPoints()); + } + + return aliStatistics; + } + } diff --git a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml index 45cc3382f..59d8a08a4 100644 --- a/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/AliBusinessCircleOrderMapper.xml @@ -272,4 +272,45 @@ GROUP BY merchant_id + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml index e145f7460..979714afc 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessCircleOrderMapper.xml @@ -283,7 +283,7 @@ order by payAmount desc; - SELECT merchant_id as 'merchantId', IFNULL(SUM(`refund_amount`),0) as 'refundAmount', IFNULL(SUM(`increased_points`),0) as 'refundPoints' @@ -304,4 +304,44 @@ GROUP BY merchant_id + + + + \ No newline at end of file