BJ_ZTEITS-Developers / parking-cloud-yudao

Commit bb82c631e915c37c96cd69461703c158d7076612

Authored by owen
1 parent ea810bb5

统计：Review修改

Inline Side-by-side
Showing 30 changed files with 274 additions and 207 deletions
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeStatisticsComparisonRespVO.java renamed to yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/common/vo/DataComparisonRespVO.java
  View file @bb82c63
1   -package cn.iocoder.yudao.module.statistics.controller.admin.trade.vo;
  1 +package cn.iocoder.yudao.module.statistics.controller.admin.common.vo;
2 2  
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.AllArgsConstructor;
5 5 import lombok.Data;
6 6 import lombok.NoArgsConstructor;
7 7  
8   -// TODO @疯狂：是不是搞成公用的哈；类似，controller/admin/common，下面直接放它
9   -@Schema(description = "管理后台 - 交易统计对照 Response VO")
  8 +@Schema(description = "管理后台 - 数据对照 Response VO")
10 9 @Data
11 10 @NoArgsConstructor
12 11 @AllArgsConstructor
13   -public class TradeStatisticsComparisonRespVO<T> {
  12 +public class DataComparisonRespVO<T> {
14 13  
15 14 @Schema(description = "当前数据", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
16 15 private T value;
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/MemberStatisticsController.java
  View file @bb82c63
... ... @@ -3,8 +3,8 @@ package cn.iocoder.yudao.module.statistics.controller.admin.member;
3 3 import cn.hutool.core.util.ArrayUtil;
4 4 import cn.iocoder.yudao.framework.common.enums.TerminalEnum;
5 5 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
  6 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
6 7 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.*;
7   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeStatisticsComparisonRespVO;
8 8 import cn.iocoder.yudao.module.statistics.service.member.MemberStatisticsService;
9 9 import io.swagger.v3.oas.annotations.Operation;
10 10 import io.swagger.v3.oas.annotations.tags.Tag;
... ... @@ -79,7 +79,7 @@ public class MemberStatisticsController {
79 79 @GetMapping("/user-count-comparison")
80 80 @Operation(summary = "获得用户数量对照")
81 81 @PreAuthorize("@ss.hasPermission('statistics:member:query')")
82   - public CommonResult<TradeStatisticsComparisonRespVO<MemberCountRespVO>> getUserCountComparison() {
  82 + public CommonResult<DataComparisonRespVO<MemberCountRespVO>> getUserCountComparison() {
83 83 return success(memberStatisticsService.getUserCountComparison());
84 84 }
85 85  
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberAnalyseComparisonRespVO.java
  View file @bb82c63
... ... @@ -7,13 +7,11 @@ import lombok.Data;
7 7 @Data
8 8 public class MemberAnalyseComparisonRespVO {
9 9  
10   - // TODO @疯狂：这个字段，要不改成注册用户量；registerUserCount;
11 10 @Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
12   - private Integer userCount;
  11 + private Integer registerUserCount;
13 12  
14   - // TODO @疯狂：这个字段，名字改成 visitUserCount；有访问，就算活跃；
15 13 @Schema(description = "活跃用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
16   - private Integer activeUserCount;
  14 + private Integer visitUserCount;
17 15  
18 16 @Schema(description = "充值会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "221")
19 17 private Integer rechargeUserCount;
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberAnalyseRespVO.java
  View file @bb82c63
1 1 package cn.iocoder.yudao.module.statistics.controller.admin.member.vo;
2 2  
3   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeStatisticsComparisonRespVO;
  3 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
4 4 import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6  
... ... @@ -8,9 +8,8 @@ import lombok.Data;
8 8 @Data
9 9 public class MemberAnalyseRespVO {
10 10  
11   - // TODO @疯狂：这个字段改成 visitUserCount，保持和 userCount 字段统一
12 11 @Schema(description = "访客数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
13   - private Integer visitorCount;
  12 + private Integer visitUserCount;
14 13  
15 14 @Schema(description = "下单用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
16 15 private Integer orderUserCount;
... ... @@ -22,6 +21,6 @@ public class MemberAnalyseRespVO {
22 21 private Integer atv;
23 22  
24 23 @Schema(description = "对照数据", requiredMode = Schema.RequiredMode.REQUIRED)
25   - private TradeStatisticsComparisonRespVO<MemberAnalyseComparisonRespVO> comparison;
  24 + private DataComparisonRespVO<MemberAnalyseComparisonRespVO> comparison;
26 25  
27 26 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/member/vo/MemberAreaStatisticsRespVO.java
  View file @bb82c63
... ... @@ -15,11 +15,10 @@ public class MemberAreaStatisticsRespVO {
15 15 @Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
16 16 private Integer userCount;
17 17  
18   - // TODO @疯狂：要不 orderCreateUserCount 和 orderPayUserCount 貌似更统一一些；
19   - @Schema(description = "订单创建数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
20   - private Integer orderCreateCount;
21   - @Schema(description = "订单支付数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "512")
22   - private Integer orderPayCount;
  18 + @Schema(description = "下单的会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  19 + private Integer orderCreateUserCount;
  20 + @Schema(description = "支付订单的会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "512")
  21 + private Integer orderPayUserCount;
23 22  
24 23 @Schema(description = "订单支付金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "622")
25 24 private Integer orderPayPrice;
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/TradeStatisticsController.java
  View file @bb82c63
... ... @@ -3,12 +3,15 @@ package cn.iocoder.yudao.module.statistics.controller.admin.trade;
3 3 import cn.hutool.core.util.ArrayUtil;
4 4 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
5 5 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
  6 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
6 7 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.*;
7 8 import cn.iocoder.yudao.module.statistics.convert.trade.TradeStatisticsConvert;
  9 +import cn.iocoder.yudao.module.statistics.dal.dataobject.trade.TradeStatisticsDO;
8 10 import cn.iocoder.yudao.module.statistics.service.trade.AfterSaleStatisticsService;
9 11 import cn.iocoder.yudao.module.statistics.service.trade.BrokerageStatisticsService;
10 12 import cn.iocoder.yudao.module.statistics.service.trade.TradeOrderStatisticsService;
11 13 import cn.iocoder.yudao.module.statistics.service.trade.TradeStatisticsService;
  14 +import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO;
12 15 import cn.iocoder.yudao.module.trade.enums.aftersale.AfterSaleStatusEnum;
13 16 import cn.iocoder.yudao.module.trade.enums.brokerage.BrokerageWithdrawStatusEnum;
14 17 import io.swagger.v3.oas.annotations.Operation;
... ... @@ -47,41 +50,47 @@ public class TradeStatisticsController {
47 50 @GetMapping("/summary")
48 51 @Operation(summary = "获得交易统计")
49 52 @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
50   - public CommonResult<TradeStatisticsComparisonRespVO<TradeSummaryRespVO>> getTradeSummaryComparison() {
51   - // TODO @疯狂：这个要不要 tradeStatisticsService 调用里面的多个方法，组合出最终的 TradeSummaryRespVO；
52   - return success(tradeStatisticsService.getTradeSummaryComparison());
  53 + public CommonResult<DataComparisonRespVO<TradeSummaryRespVO>> getTradeSummaryComparison() {
  54 + // 1.1 昨天的数据
  55 + TradeSummaryRespBO yesterdayData = tradeStatisticsService.getTradeSummaryByDays(-1);
  56 + // 1.2 前天的数据（用于对照昨天的数据）
  57 + TradeSummaryRespBO beforeYesterdayData = tradeStatisticsService.getTradeSummaryByDays(-2);
  58 + // 2.1 本月数据
  59 + TradeSummaryRespBO monthData = tradeStatisticsService.getTradeSummaryByMonths(0);
  60 + // 2.2 上月数据（用于对照本月的数据）
  61 + TradeSummaryRespBO lastMonthData = tradeStatisticsService.getTradeSummaryByMonths(-1);
  62 + // 拼接数据
  63 + return success(TradeStatisticsConvert.INSTANCE.convert(yesterdayData, beforeYesterdayData, monthData, lastMonthData));
53 64 }
54 65  
55 66 // TODO @疯狂：【晚点再改和讨论；等首页的接口出来】这个要不还是叫 analyse，对比选中的时间段，和上一个时间段；类似 MemberStatisticsController 的 getMemberAnalyse
56 67 @GetMapping("/trend/summary")
57 68 @Operation(summary = "获得交易状况统计")
58 69 @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
59   - public CommonResult<TradeStatisticsComparisonRespVO<TradeTrendSummaryRespVO>> getTradeTrendSummaryComparison(
  70 + public CommonResult<DataComparisonRespVO<TradeTrendSummaryRespVO>> getTradeTrendSummaryComparison(
60 71 TradeTrendReqVO reqVO) {
61 72 return success(tradeStatisticsService.getTradeTrendSummaryComparison(ArrayUtil.get(reqVO.getTimes(), 0),
62 73 ArrayUtil.get(reqVO.getTimes(), 1)));
63 74 }
64 75  
65   - // TODO 芋艿：已经 review
66   - // TODO @疯狂：这个要不直接叫 list；它即使就是把每条统计拿出来
67   - @GetMapping("/trend/list")
  76 + @GetMapping("/list")
68 77 @Operation(summary = "获得交易状况明细")
69 78 @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
70   - public CommonResult<List<TradeTrendSummaryRespVO>> getTradeStatisticsList(
71   - TradeTrendReqVO reqVO) {
72   - return success(tradeStatisticsService.getTradeStatisticsList(ArrayUtil.get(reqVO.getTimes(), 0),
73   - ArrayUtil.get(reqVO.getTimes(), 1)));
  79 + public CommonResult<List<TradeTrendSummaryRespVO>> getTradeStatisticsList(TradeTrendReqVO reqVO) {
  80 + List<TradeStatisticsDO> list = tradeStatisticsService.getTradeStatisticsList(ArrayUtil.get(reqVO.getTimes(), 0),
  81 + ArrayUtil.get(reqVO.getTimes(), 1));
  82 + return success(TradeStatisticsConvert.INSTANCE.convertList(list));
74 83 }
75 84  
76   - // TODO @疯狂：这个要不直接叫 export；它即使就是把每条统计导出
77   - @GetMapping("/trend/export-excel")
  85 + @GetMapping("/export-excel")
78 86 @Operation(summary = "导出获得交易状况明细 Excel")
79 87 @PreAuthorize("@ss.hasPermission('statistics:trade:export')")
80 88 public void exportTradeStatisticsExcel(TradeTrendReqVO reqVO, HttpServletResponse response) throws IOException {
81   - List<TradeTrendSummaryRespVO> list = tradeStatisticsService.getTradeStatisticsList(ArrayUtil.get(reqVO.getTimes(), 0),
  89 + List<TradeStatisticsDO> list = tradeStatisticsService.getTradeStatisticsList(ArrayUtil.get(reqVO.getTimes(), 0),
82 90 ArrayUtil.get(reqVO.getTimes(), 1));
83 91 // 导出 Excel
84   - List<TradeTrendSummaryExcelVO> data = TradeStatisticsConvert.INSTANCE.convertList02(list);
  92 + List<TradeTrendSummaryRespVO> voList = TradeStatisticsConvert.INSTANCE.convertList(list);
  93 + List<TradeTrendSummaryExcelVO> data = TradeStatisticsConvert.INSTANCE.convertList02(voList);
85 94 ExcelUtils.write(response, "交易状况.xls", "数据", TradeTrendSummaryExcelVO.class, data);
86 95 }
87 96  
... ... @@ -98,14 +107,14 @@ public class TradeStatisticsController {
98 107 @GetMapping("/order-comparison")
99 108 @Operation(summary = "获得交易订单数量")
100 109 @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
101   - public CommonResult<TradeStatisticsComparisonRespVO<TradeOrderSummaryRespVO>> getOrderComparison() {
  110 + public CommonResult<DataComparisonRespVO<TradeOrderSummaryRespVO>> getOrderComparison() {
102 111 return success(tradeOrderStatisticsService.getOrderComparison());
103 112 }
104 113  
105 114 @GetMapping("/order-count-trend")
106 115 @Operation(summary = "获得订单量趋势统计")
107 116 @PreAuthorize("@ss.hasPermission('statistics:trade:query')")
108   - public CommonResult<List<TradeStatisticsComparisonRespVO<TradeOrderTrendRespVO>>> getOrderCountTrendComparison(@Valid TradeOrderTrendReqVO reqVO) {
  117 + public CommonResult<List<DataComparisonRespVO<TradeOrderTrendRespVO>>> getOrderCountTrendComparison(@Valid TradeOrderTrendReqVO reqVO) {
109 118 return success(tradeOrderStatisticsService.getOrderCountTrendComparison(reqVO));
110 119 }
111 120  
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeTrendSummaryExcelVO.java
  View file @bb82c63
... ... @@ -22,7 +22,7 @@ public class TradeTrendSummaryExcelVO {
22 22 private LocalDate date;
23 23  
24 24 @ExcelProperty(value = "营业额", converter = MoneyConvert.class)
25   - private Integer turnover;
  25 + private Integer turnoverPrice;
26 26  
27 27 @ExcelProperty(value = "商品支付金额", converter = MoneyConvert.class)
28 28 private Integer orderPayPrice;
... ... @@ -34,7 +34,7 @@ public class TradeTrendSummaryExcelVO {
34 34 private Integer expensePrice;
35 35  
36 36 @ExcelProperty(value = "余额支付金额", converter = MoneyConvert.class)
37   - private Integer balancePrice;
  37 + private Integer orderWalletPayPrice;
38 38  
39 39 @ExcelProperty(value = "支付佣金金额", converter = MoneyConvert.class)
40 40 private Integer brokerageSettlementPrice;
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeTrendSummaryRespVO.java
  View file @bb82c63
... ... @@ -16,13 +16,15 @@ public class TradeTrendSummaryRespVO {
16 16 @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY)
17 17 private LocalDate date;
18 18  
19   - // TODO @疯狂，要不加个 turnoverPrice？
20 19 @Schema(description = "营业额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
21   - private Integer turnover; // 营业额 = 商品支付金额 + 充值金额
  20 + private Integer turnoverPrice; // 营业额 = 商品支付金额 + 充值金额
22 21  
23 22 @Schema(description = "订单支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
24 23 private Integer orderPayPrice;
25 24  
  25 + @Schema(description = "余额支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  26 + private Integer orderWalletPayPrice;
  27 +
26 28 @Schema(description = "订单退款金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
27 29 private Integer orderRefundPrice;
28 30  
... ... @@ -35,7 +37,4 @@ public class TradeTrendSummaryRespVO {
35 37 @Schema(description = "支出金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
36 38 private Integer expensePrice; // 余额支付金额 + 支付佣金金额 + 商品退款金额
37 39  
38   - @Schema(description = "余额支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
39   - private Integer balancePrice; // TODO @疯狂：这个字段要不改成：walletPayPrice
40   -
41 40 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/convert/member/MemberStatisticsConvert.java
  View file @bb82c63
... ... @@ -32,8 +32,8 @@ public interface MemberStatisticsConvert {
32 32 return new MemberAreaStatisticsRespVO()
33 33 .setAreaId(area.getId()).setAreaName(area.getName())
34 34 .setUserCount(MapUtil.getInt(userCountMap, area.getId(), 0))
35   - .setOrderCreateCount(ObjUtil.defaultIfNull(orderVo.getOrderCreateCount(), 0))
36   - .setOrderPayCount(ObjUtil.defaultIfNull(orderVo.getOrderPayCount(), 0))
  35 + .setOrderCreateUserCount(ObjUtil.defaultIfNull(orderVo.getOrderCreateUserCount(), 0))
  36 + .setOrderPayUserCount(ObjUtil.defaultIfNull(orderVo.getOrderPayUserCount(), 0))
37 37 .setOrderPayPrice(ObjUtil.defaultIfNull(orderVo.getOrderPayPrice(), 0));
38 38 });
39 39 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/convert/trade/TradeStatisticsConvert.java
  View file @bb82c63
1 1 package cn.iocoder.yudao.module.statistics.convert.trade;
2 2  
3   -import cn.iocoder.yudao.module.statistics.service.trade.bo.WalletSummaryRespBO;
4   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeStatisticsComparisonRespVO;
  3 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
5 4 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeSummaryRespVO;
6 5 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryExcelVO;
7 6 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO;
8 7 import cn.iocoder.yudao.module.statistics.dal.dataobject.trade.TradeStatisticsDO;
  8 +import cn.iocoder.yudao.module.statistics.service.trade.bo.AfterSaleSummaryRespBO;
9 9 import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeOrderSummaryRespBO;
10 10 import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO;
11   -import cn.iocoder.yudao.module.statistics.service.trade.bo.AfterSaleSummaryRespBO;
  11 +import cn.iocoder.yudao.module.statistics.service.trade.bo.WalletSummaryRespBO;
12 12 import org.mapstruct.Mapper;
13 13 import org.mapstruct.factory.Mappers;
14 14  
... ... @@ -25,10 +25,10 @@ public interface TradeStatisticsConvert {
25 25  
26 26 TradeStatisticsConvert INSTANCE = Mappers.getMapper(TradeStatisticsConvert.class);
27 27  
28   - default TradeStatisticsComparisonRespVO<TradeSummaryRespVO> convert(TradeSummaryRespBO yesterdayData,
29   - TradeSummaryRespBO beforeYesterdayData,
30   - TradeSummaryRespBO monthData,
31   - TradeSummaryRespBO lastMonthData) {
  28 + default DataComparisonRespVO<TradeSummaryRespVO> convert(TradeSummaryRespBO yesterdayData,
  29 + TradeSummaryRespBO beforeYesterdayData,
  30 + TradeSummaryRespBO monthData,
  31 + TradeSummaryRespBO lastMonthData) {
32 32 return convert(convert(yesterdayData, monthData), convert(beforeYesterdayData, lastMonthData));
33 33 }
34 34  
... ... @@ -39,10 +39,10 @@ public interface TradeStatisticsConvert {
39 39 .setMonthOrderCount(monthData.getCount()).setMonthPayPrice(monthData.getSummary());
40 40 }
41 41  
42   - TradeStatisticsComparisonRespVO<TradeSummaryRespVO> convert(TradeSummaryRespVO value, TradeSummaryRespVO reference);
  42 + DataComparisonRespVO<TradeSummaryRespVO> convert(TradeSummaryRespVO value, TradeSummaryRespVO reference);
43 43  
44   - TradeStatisticsComparisonRespVO<TradeTrendSummaryRespVO> convert(TradeTrendSummaryRespVO value,
45   - TradeTrendSummaryRespVO reference);
  44 + DataComparisonRespVO<TradeTrendSummaryRespVO> convert(TradeTrendSummaryRespVO value,
  45 + TradeTrendSummaryRespVO reference);
46 46  
47 47 List<TradeTrendSummaryExcelVO> convertList02(List<TradeTrendSummaryRespVO> list);
48 48  
... ... @@ -50,4 +50,20 @@ public interface TradeStatisticsConvert {
50 50 AfterSaleSummaryRespBO afterSaleSummary, Integer brokerageSettlementPrice,
51 51 WalletSummaryRespBO walletSummary);
52 52  
  53 + List<TradeTrendSummaryRespVO> convertList(List<TradeStatisticsDO> list);
  54 +
  55 + default TradeTrendSummaryRespVO convert(TradeStatisticsDO tradeStatistics) {
  56 + return new TradeTrendSummaryRespVO()
  57 + .setDate(tradeStatistics.getTime().toLocalDate())
  58 + // 营业额 = 商品支付金额 + 充值金额
  59 + .setTurnoverPrice(tradeStatistics.getOrderPayPrice() + tradeStatistics.getRechargePayPrice())
  60 + .setOrderPayPrice(tradeStatistics.getOrderPayPrice())
  61 + .setRechargePrice(tradeStatistics.getRechargePayPrice())
  62 + // 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
  63 + .setExpensePrice(tradeStatistics.getOrderWalletPayPrice() + tradeStatistics.getBrokerageSettlementPrice() + tradeStatistics.getAfterSaleRefundPrice())
  64 + .setOrderWalletPayPrice(tradeStatistics.getOrderWalletPayPrice())
  65 + .setBrokerageSettlementPrice(tradeStatistics.getBrokerageSettlementPrice())
  66 + .setOrderRefundPrice(tradeStatistics.getAfterSaleRefundPrice());
  67 + }
  68 +
53 69 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/dataobject/trade/TradeStatisticsDO.java
  View file @bb82c63
... ... @@ -48,11 +48,6 @@ public class TradeStatisticsDO extends TenantBaseDO {
48 48 * 总支付金额，单位：分
49 49 */
50 50 private Integer orderPayPrice;
51   - // TODO @疯狂：这个字段改成 walletPayPrice，然后挪到 rechargePayCount 前面；
52   - /**
53   - * 总支付金额（余额），单位：分
54   - */
55   - private Integer orderWalletPayPrice;
56 51  
57 52 /**
58 53 * 退款订单数
... ... @@ -69,6 +64,10 @@ public class TradeStatisticsDO extends TenantBaseDO {
69 64 private Integer brokerageSettlementPrice;
70 65  
71 66 /**
  67 + * 总支付金额（余额），单位：分
  68 + */
  69 + private Integer orderWalletPayPrice;
  70 + /**
72 71 * 充值订单数
73 72 * <p>
74 73 * 从 PayWalletRechargeDO 计算
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/infra/ApiAccessLogStatisticsMapper.java
  View file @bb82c63
... ... @@ -16,12 +16,12 @@ import java.time.LocalDateTime;
16 16 @SuppressWarnings("rawtypes")
17 17 public interface ApiAccessLogStatisticsMapper extends BaseMapperX {
18 18  
19   - Integer selectIpCountByCreateTimeBetween(@Param("userType") Integer userType,
20   - @Param("beginTime") LocalDateTime beginTime,
21   - @Param("endTime") LocalDateTime endTime);
  19 + Integer selectIpCountByUserTypeAndCreateTimeBetween(@Param("userType") Integer userType,
  20 + @Param("beginTime") LocalDateTime beginTime,
  21 + @Param("endTime") LocalDateTime endTime);
22 22  
23   - Integer selectUserCountByCreateTimeBetween(@Param("userType") Integer userType,
24   - @Param("beginTime") LocalDateTime beginTime,
25   - @Param("endTime") LocalDateTime endTime);
  23 + Integer selectUserCountByUserTypeAndCreateTimeBetween(@Param("userType") Integer userType,
  24 + @Param("beginTime") LocalDateTime beginTime,
  25 + @Param("endTime") LocalDateTime endTime);
26 26  
27 27 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/member/MemberStatisticsMapper.java
  View file @bb82c63
1 1 package cn.iocoder.yudao.module.statistics.dal.mysql.member;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
4   -import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO;
5 4 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberRegisterCountRespVO;
6 5 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberSexStatisticsRespVO;
  6 +import cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO;
7 7 import org.apache.ibatis.annotations.Mapper;
8 8 import org.apache.ibatis.annotations.Param;
9 9  
... ... @@ -19,9 +19,7 @@ import java.util.List;
19 19 @SuppressWarnings("rawtypes")
20 20 public interface MemberStatisticsMapper extends BaseMapperX {
21 21  
22   - // TODO @芋艿：已经 review
23   - // TODO @疯狂：要不还是搞下 bo？虽然可能冗余了点~~
24   - List<MemberAreaStatisticsRespVO> selectSummaryListByAreaId();
  22 + List<MemberAreaStatisticsRespBO> selectSummaryListByAreaId();
25 23  
26 24 List<MemberSexStatisticsRespVO> selectSummaryListBySex();
27 25  
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/mysql/trade/TradeStatisticsMapper.java
  View file @bb82c63
1 1 package cn.iocoder.yudao.module.statistics.dal.mysql.trade;
2 2  
3 3 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
  4 +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
4 5 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO;
5 6 import cn.iocoder.yudao.module.statistics.dal.dataobject.trade.TradeStatisticsDO;
6 7 import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO;
... ... @@ -21,14 +22,20 @@ public interface TradeStatisticsMapper extends BaseMapperX&lt;TradeStatisticsDO&gt; {
21 22 TradeSummaryRespBO selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
22 23 @Param("endTime") LocalDateTime endTime);
23 24  
24   - TradeTrendSummaryRespVO selectByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
25   - @Param("endTime") LocalDateTime endTime);
  25 + TradeTrendSummaryRespVO selectVoByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
  26 + @Param("endTime") LocalDateTime endTime);
26 27  
27   - // TODO @芋艿：已经 review
28   - List<TradeTrendSummaryRespVO> selectListByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
29   - @Param("endTime") LocalDateTime endTime);
  28 + default List<TradeStatisticsDO> selectListByTimeBetween(LocalDateTime beginTime, LocalDateTime endTime) {
  29 + return selectList(new LambdaQueryWrapperX<TradeStatisticsDO>()
  30 + .between(TradeStatisticsDO::getTime, beginTime, endTime));
  31 + }
30 32  
31 33 Integer selectExpensePriceByTimeBetween(@Param("beginTime") LocalDateTime beginTime,
32 34 @Param("endTime") LocalDateTime endTime);
33 35  
  36 + default TradeStatisticsDO selectByTimeBetween(LocalDateTime beginTime, LocalDateTime endTime) {
  37 + return selectOne(new LambdaQueryWrapperX<TradeStatisticsDO>()
  38 + .between(TradeStatisticsDO::getTime, beginTime, endTime));
  39 + }
  40 +
34 41 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/job/trade/TradeStatisticsJob.java
  View file @bb82c63
1 1 package cn.iocoder.yudao.module.statistics.job.trade;
2 2  
  3 +import cn.hutool.core.convert.Convert;
  4 +import cn.hutool.core.util.NumberUtil;
3 5 import cn.hutool.core.util.StrUtil;
4 6 import cn.iocoder.yudao.framework.quartz.core.handler.JobHandler;
5 7 import cn.iocoder.yudao.framework.tenant.core.job.TenantJob;
... ... @@ -19,11 +21,24 @@ public class TradeStatisticsJob implements JobHandler {
19 21 @Resource
20 22 private TradeStatisticsService tradeStatisticsService;
21 23  
  24 + /**
  25 + * 执行交易统计任务
  26 + *
  27 + * @param param 要统计的天数，只能是正整数，1 代表昨日数据
  28 + * @return 统计结果
  29 + */
22 30 @Override
23 31 @TenantJob
24 32 public String execute(String param) {
25   - String times = tradeStatisticsService.statisticsYesterdayTrade();
26   - return StrUtil.format("交易统计耗时: {}", times);
  33 + if (NumberUtil.isInteger(param)) {
  34 + throw new RuntimeException("交易统计任务的参数只能为是正整数");
  35 + }
  36 + Integer days = Convert.toInt(param, 0);
  37 + if (days < 1) {
  38 + throw new RuntimeException("交易统计任务的参数只能为是正整数");
  39 + }
  40 + String result = tradeStatisticsService.statisticsTrade(days);
  41 + return StrUtil.format("交易统计:\n{}", result);
27 42 }
28 43  
29 44 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/infra/ApiAccessLogStatisticsService.java
  View file @bb82c63
... ... @@ -9,8 +9,6 @@ import java.time.LocalDateTime;
9 9 */
10 10 public interface ApiAccessLogStatisticsService {
11 11  
12   - // TODO @疯狂：需要传递 userType；因为访问日志，可能涉及多种用户类型；
13   - // TODO @疯狂：方法名，要不改成 getUserCount；原因：让它更业务无关
14 12 /**
15 13 * 获取活跃用户数量
16 14 *
... ... @@ -19,10 +17,8 @@ public interface ApiAccessLogStatisticsService {
19 17 * @param endTime 截止时间
20 18 * @return 活跃用户数量
21 19 */
22   - Integer getActiveUserCount(Integer userType, LocalDateTime beginTime, LocalDateTime endTime);
  20 + Integer getUserCount(Integer userType, LocalDateTime beginTime, LocalDateTime endTime);
23 21  
24   - // TODO @疯狂：需要传递 userType；因为访问日志，可能涉及多种用户类型；
25   - // TODO @疯狂：方法名，要不改成 getIpCount；原因：让它更业务无关
26 22 /**
27 23 * 获取访问用户数量
28 24 *
... ... @@ -31,6 +27,6 @@ public interface ApiAccessLogStatisticsService {
31 27 * @param endTime 截止时间
32 28 * @return 访问用户数量
33 29 */
34   - Integer getVisitorUserCount(Integer userType, LocalDateTime beginTime, LocalDateTime endTime);
  30 + Integer getIpCount(Integer userType, LocalDateTime beginTime, LocalDateTime endTime);
35 31  
36 32 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/infra/ApiAccessLogStatisticsServiceImpl.java
  View file @bb82c63
... ... @@ -20,13 +20,13 @@ public class ApiAccessLogStatisticsServiceImpl implements ApiAccessLogStatistics
20 20 private ApiAccessLogStatisticsMapper apiAccessLogStatisticsMapper;
21 21  
22 22 @Override
23   - public Integer getActiveUserCount(Integer userType, LocalDateTime beginTime, LocalDateTime endTime) {
24   - return apiAccessLogStatisticsMapper.selectUserCountByCreateTimeBetween(userType, beginTime, endTime);
  23 + public Integer getUserCount(Integer userType, LocalDateTime beginTime, LocalDateTime endTime) {
  24 + return apiAccessLogStatisticsMapper.selectUserCountByUserTypeAndCreateTimeBetween(userType, beginTime, endTime);
25 25 }
26 26  
27 27 @Override
28   - public Integer getVisitorUserCount(Integer userType, LocalDateTime beginTime, LocalDateTime endTime) {
29   - return apiAccessLogStatisticsMapper.selectIpCountByCreateTimeBetween(userType, beginTime, endTime);
  28 + public Integer getIpCount(Integer userType, LocalDateTime beginTime, LocalDateTime endTime) {
  29 + return apiAccessLogStatisticsMapper.selectIpCountByUserTypeAndCreateTimeBetween(userType, beginTime, endTime);
30 30 }
31 31  
32 32 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsService.java
  View file @bb82c63
1 1 package cn.iocoder.yudao.module.statistics.service.member;
2 2  
  3 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
3 4 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.*;
4   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeStatisticsComparisonRespVO;
5 5  
6 6 import java.time.LocalDateTime;
7 7 import java.util.List;
... ... @@ -59,6 +59,6 @@ public interface MemberStatisticsService {
59 59 *
60 60 * @return 用户数量量统计对照
61 61 */
62   - TradeStatisticsComparisonRespVO<MemberCountRespVO> getUserCountComparison();
  62 + DataComparisonRespVO<MemberCountRespVO> getUserCountComparison();
63 63  
64 64 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/MemberStatisticsServiceImpl.java
  View file @bb82c63
... ... @@ -5,11 +5,12 @@ import cn.hutool.core.util.NumberUtil;
5 5 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
6 6 import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum;
7 7 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
  8 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
8 9 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.*;
9   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeStatisticsComparisonRespVO;
10 10 import cn.iocoder.yudao.module.statistics.convert.member.MemberStatisticsConvert;
11 11 import cn.iocoder.yudao.module.statistics.dal.mysql.member.MemberStatisticsMapper;
12 12 import cn.iocoder.yudao.module.statistics.service.infra.ApiAccessLogStatisticsService;
  13 +import cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO;
13 14 import cn.iocoder.yudao.module.statistics.service.pay.PayWalletStatisticsService;
14 15 import cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO;
15 16 import cn.iocoder.yudao.module.statistics.service.trade.TradeOrderStatisticsService;
... ... @@ -63,14 +64,14 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
63 64 // TODO @疯狂：可能得把每个省的用户，都查询出来，然后去 order 那边 in；因为要按照这些人为基础来计算；；用户规模量大可能不太好，但是暂时就先这样搞吧 = =
64 65 Map<Integer, Integer> userCountMap = convertMap(memberStatisticsMapper.selectSummaryListByAreaId(),
65 66 vo -> AreaUtils.getParentIdByType(vo.getAreaId(), AreaTypeEnum.PROVINCE),
66   - MemberAreaStatisticsRespVO::getUserCount, Integer::sum);
  67 + MemberAreaStatisticsRespBO::getUserCount, Integer::sum);
67 68 // 统计订单
68 69 Map<Integer, MemberAreaStatisticsRespVO> orderMap = convertMap(tradeOrderStatisticsService.getSummaryListByAreaId(),
69 70 vo -> AreaUtils.getParentIdByType(vo.getAreaId(), AreaTypeEnum.PROVINCE),
70 71 vo -> vo,
71 72 (a, b) -> new MemberAreaStatisticsRespVO()
72   - .setOrderCreateCount(a.getOrderCreateCount() + b.getOrderCreateCount())
73   - .setOrderPayCount(a.getOrderPayCount() + b.getOrderPayCount())
  73 + .setOrderCreateUserCount(a.getOrderCreateUserCount() + b.getOrderCreateUserCount())
  74 + .setOrderPayUserCount(a.getOrderPayUserCount() + b.getOrderPayUserCount())
74 75 .setOrderPayPrice(a.getOrderPayPrice() + b.getOrderPayPrice()));
75 76 // 拼接数据
76 77 return MemberStatisticsConvert.INSTANCE.convertList(AreaUtils.getByType(AreaTypeEnum.PROVINCE, area -> area), userCountMap, orderMap);
... ... @@ -96,19 +97,19 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
96 97 atv = NumberUtil.div(payPrice, payUserCount).intValue();
97 98 }
98 99 return new MemberAnalyseRespVO()
99   - .setVisitorCount(apiAccessLogStatisticsService.getVisitorUserCount(UserTypeEnum.MEMBER.getValue(), beginTime, endTime))
  100 + .setVisitUserCount(apiAccessLogStatisticsService.getIpCount(UserTypeEnum.MEMBER.getValue(), beginTime, endTime))
100 101 .setOrderUserCount(tradeOrderStatisticsService.getOrderUserCount(beginTime, endTime))
101 102 .setPayUserCount(payUserCount)
102 103 .setAtv(atv)
103   - .setComparison(new TradeStatisticsComparisonRespVO<>(vo, reference));
  104 + .setComparison(new DataComparisonRespVO<>(vo, reference));
104 105 }
105 106  
106 107 private MemberAnalyseComparisonRespVO getMemberAnalyseComparisonData(LocalDateTime beginTime, LocalDateTime endTime) {
107 108 Integer rechargeUserCount = Optional.ofNullable(payWalletStatisticsService.getUserRechargeSummary(beginTime, endTime))
108 109 .map(RechargeSummaryRespBO::getRechargeUserCount).orElse(0);
109 110 return new MemberAnalyseComparisonRespVO()
110   - .setUserCount(memberStatisticsMapper.selectUserCount(beginTime, endTime))
111   - .setActiveUserCount(apiAccessLogStatisticsService.getActiveUserCount(UserTypeEnum.MEMBER.getValue(), beginTime, endTime))
  111 + .setRegisterUserCount(memberStatisticsMapper.selectUserCount(beginTime, endTime))
  112 + .setVisitUserCount(apiAccessLogStatisticsService.getUserCount(UserTypeEnum.MEMBER.getValue(), beginTime, endTime))
112 113 .setRechargeUserCount(rechargeUserCount);
113 114 }
114 115  
... ... @@ -124,14 +125,14 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
124 125 }
125 126  
126 127 @Override
127   - public TradeStatisticsComparisonRespVO<MemberCountRespVO> getUserCountComparison() {
  128 + public DataComparisonRespVO<MemberCountRespVO> getUserCountComparison() {
128 129 // 今日时间范围
129 130 LocalDateTime beginOfToday = LocalDateTimeUtil.beginOfDay(LocalDateTime.now());
130 131 LocalDateTime endOfToday = LocalDateTimeUtil.endOfDay(beginOfToday);
131 132 // 昨日时间范围
132 133 LocalDateTime beginOfYesterday = LocalDateTimeUtil.beginOfDay(beginOfToday.minusDays(1));
133 134 LocalDateTime endOfYesterday = LocalDateTimeUtil.endOfDay(beginOfYesterday);
134   - return new TradeStatisticsComparisonRespVO<MemberCountRespVO>()
  135 + return new DataComparisonRespVO<MemberCountRespVO>()
135 136 .setValue(getUserCount(beginOfToday, endOfToday))
136 137 .setReference(getUserCount(beginOfYesterday, endOfYesterday));
137 138 }
... ... @@ -139,7 +140,7 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
139 140 private MemberCountRespVO getUserCount(LocalDateTime beginTime, LocalDateTime endTime) {
140 141 return new MemberCountRespVO()
141 142 .setCreateUserCount(memberStatisticsMapper.selectUserCount(beginTime, endTime))
142   - .setVisitUserCount(apiAccessLogStatisticsService.getVisitorUserCount(UserTypeEnum.MEMBER.getValue(), beginTime, endTime));
  143 + .setVisitUserCount(apiAccessLogStatisticsService.getIpCount(UserTypeEnum.MEMBER.getValue(), beginTime, endTime));
143 144 }
144 145  
145 146 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/member/bo/MemberAreaStatisticsRespBO.java 0 → 100644
  View file @bb82c63
  1 +package cn.iocoder.yudao.module.statistics.service.member.bo;
  2 +
  3 +import io.swagger.v3.oas.annotations.media.Schema;
  4 +import lombok.Data;
  5 +
  6 +@Schema(description = "管理后台 - 会员地区统计 Response BO")
  7 +@Data
  8 +public class MemberAreaStatisticsRespBO {
  9 +
  10 + /**
  11 + * 省份编号
  12 + */
  13 + private Integer areaId;
  14 + /**
  15 + * 省份名称
  16 + */
  17 + private String areaName;
  18 +
  19 + /**
  20 + * 会员数量
  21 + */
  22 + private Integer userCount;
  23 +
  24 + /**
  25 + * 下单的会员数量
  26 + */
  27 + private Integer orderCreateUserCount;
  28 + /**
  29 + * 支付订单的会员数量
  30 + */
  31 + private Integer orderPayUserCount;
  32 +
  33 + /**
  34 + * 订单支付金额，单位：分
  35 + */
  36 + private Integer orderPayPrice;
  37 +
  38 +}
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/pay/bo/RechargeSummaryRespBO.java
  View file @bb82c63
... ... @@ -3,15 +3,21 @@ package cn.iocoder.yudao.module.statistics.service.pay.bo;
3 3 import io.swagger.v3.oas.annotations.media.Schema;
4 4 import lombok.Data;
5 5  
6   -// TODO @疯狂：BO 不用写 swagger 注解哈，写注释就好啦；
7   -@Schema(description = "管理后台 - 充值统计 Response VO")
  6 +/**
  7 + * 充值统计 Response BO
  8 + */
  9 +@Schema(description = "管理后台 - ")
8 10 @Data
9 11 public class RechargeSummaryRespBO {
10 12  
11   - @Schema(description = "充值会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "221")
  13 + /**
  14 + * 充值会员数量
  15 + */
12 16 private Integer rechargeUserCount;
13 17  
14   - @Schema(description = "充值金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
  18 + /**
  19 + * 充值金额
  20 + */
15 21 private Integer rechargePrice;
16 22  
17 23 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeOrderStatisticsService.java
  View file @bb82c63
1 1 package cn.iocoder.yudao.module.statistics.service.trade;
2 2  
  3 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
3 4 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO;
4 5 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.*;
5 6 import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeOrderSummaryRespBO;
... ... @@ -73,7 +74,7 @@ public interface TradeOrderStatisticsService {
73 74 *
74 75 * @return 销售额对照
75 76 */
76   - TradeStatisticsComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison();
  77 + DataComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison();
77 78  
78 79 /**
79 80 * 获得订单量趋势统计
... ... @@ -81,6 +82,6 @@ public interface TradeOrderStatisticsService {
81 82 * @param reqVO 统计参数
82 83 * @return 订单量趋势统计
83 84 */
84   - List<TradeStatisticsComparisonRespVO<TradeOrderTrendRespVO>> getOrderCountTrendComparison(TradeOrderTrendReqVO reqVO);
  85 + List<DataComparisonRespVO<TradeOrderTrendRespVO>> getOrderCountTrendComparison(TradeOrderTrendReqVO reqVO);
85 86  
86 87 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeOrderStatisticsServiceImpl.java
  View file @bb82c63
... ... @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.date.LocalDateTimeUtil;
5 5 import cn.hutool.core.util.ObjUtil;
6 6 import cn.iocoder.yudao.module.pay.enums.order.PayOrderStatusEnum;
  7 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
7 8 import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO;
8 9 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.*;
9 10 import cn.iocoder.yudao.module.statistics.dal.mysql.trade.TradeOrderStatisticsMapper;
... ... @@ -71,8 +72,8 @@ public class TradeOrderStatisticsServiceImpl implements TradeOrderStatisticsServ
71 72 }
72 73  
73 74 @Override
74   - public TradeStatisticsComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison() {
75   - return new TradeStatisticsComparisonRespVO<TradeOrderSummaryRespVO>()
  75 + public DataComparisonRespVO<TradeOrderSummaryRespVO> getOrderComparison() {
  76 + return new DataComparisonRespVO<TradeOrderSummaryRespVO>()
76 77 .setValue(getPayPriceSummary(LocalDateTime.now()))
77 78 .setReference(getPayPriceSummary(LocalDateTime.now().minusDays(1)));
78 79 }
... ... @@ -85,7 +86,7 @@ public class TradeOrderStatisticsServiceImpl implements TradeOrderStatisticsServ
85 86 }
86 87  
87 88 @Override
88   - public List<TradeStatisticsComparisonRespVO<TradeOrderTrendRespVO>> getOrderCountTrendComparison(TradeOrderTrendReqVO reqVO) {
  89 + public List<DataComparisonRespVO<TradeOrderTrendRespVO>> getOrderCountTrendComparison(TradeOrderTrendReqVO reqVO) {
89 90 // 查询当前数据
90 91 List<TradeOrderTrendRespVO> value = getOrderCountTrend(reqVO.getType(), reqVO.getBeginTime(), reqVO.getEndTime());
91 92 // 查询对照数据
... ... @@ -94,7 +95,7 @@ public class TradeOrderStatisticsServiceImpl implements TradeOrderStatisticsServ
94 95 List<TradeOrderTrendRespVO> reference = getOrderCountTrend(reqVO.getType(), referenceBeginTime, referenceEndTime);
95 96  
96 97 return IntStream.range(0, value.size())
97   - .mapToObj(index -> new TradeStatisticsComparisonRespVO<TradeOrderTrendRespVO>()
  98 + .mapToObj(index -> new DataComparisonRespVO<TradeOrderTrendRespVO>()
98 99 .setValue(CollUtil.get(value, index))
99 100 .setReference(CollUtil.get(reference, index)))
100 101 .collect(Collectors.toList());
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeStatisticsService.java
  View file @bb82c63
1 1 package cn.iocoder.yudao.module.statistics.service.trade;
2 2  
3   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeStatisticsComparisonRespVO;
4   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeSummaryRespVO;
  3 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
5 4 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO;
  5 +import cn.iocoder.yudao.module.statistics.dal.dataobject.trade.TradeStatisticsDO;
  6 +import cn.iocoder.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO;
6 7  
7 8 import java.time.LocalDateTime;
8 9 import java.util.List;
... ... @@ -15,18 +16,11 @@ import java.util.List;
15 16 public interface TradeStatisticsService {
16 17  
17 18 /**
18   - * 获得交易统计
19   - *
20   - * @return 统计数据对照
21   - */
22   - TradeStatisticsComparisonRespVO<TradeSummaryRespVO> getTradeSummaryComparison();
23   -
24   - /**
25 19 * 获得交易状况统计对照
26 20 *
27 21 * @return 统计数据对照
28 22 */
29   - TradeStatisticsComparisonRespVO<TradeTrendSummaryRespVO> getTradeTrendSummaryComparison(
  23 + DataComparisonRespVO<TradeTrendSummaryRespVO> getTradeTrendSummaryComparison(
30 24 LocalDateTime beginTime, LocalDateTime endTime);
31 25  
32 26 /**
... ... @@ -45,14 +39,30 @@ public interface TradeStatisticsService {
45 39 * @param endTime 结束时间
46 40 * @return 统计数据列表
47 41 */
48   - List<TradeTrendSummaryRespVO> getTradeStatisticsList(LocalDateTime beginTime, LocalDateTime endTime);
  42 + List<TradeStatisticsDO> getTradeStatisticsList(LocalDateTime beginTime, LocalDateTime endTime);
49 43  
50 44 // TODO 芋艿：已经 review；
51 45 /**
52   - * 统计昨日交易
  46 + * 统计指定天数的交易数据
  47 + *
  48 + * @return 统计结果
  49 + */
  50 + String statisticsTrade(Integer days);
  51 +
  52 + /**
  53 + * 统计指定日期的交易数据
  54 + *
  55 + * @param days 增加的天数
  56 + * @return 交易数据
  57 + */
  58 + TradeSummaryRespBO getTradeSummaryByDays(int days);
  59 +
  60 + /**
  61 + * 统计指定月份的交易数据
53 62 *
54   - * @return 耗时
  63 + * @param months 增加的月数
  64 + * @return 交易数据
55 65 */
56   - String statisticsYesterdayTrade();
  66 + TradeSummaryRespBO getTradeSummaryByMonths(int months);
57 67  
58 68 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/TradeStatisticsServiceImpl.java
  View file @bb82c63
1 1 package cn.iocoder.yudao.module.statistics.service.trade;
2 2  
  3 +import cn.hutool.core.date.DatePattern;
3 4 import cn.hutool.core.date.LocalDateTimeUtil;
4 5 import cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils;
5   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeStatisticsComparisonRespVO;
6   -import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeSummaryRespVO;
  6 +import cn.iocoder.yudao.module.statistics.controller.admin.common.vo.DataComparisonRespVO;
7 7 import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO;
8 8 import cn.iocoder.yudao.module.statistics.convert.trade.TradeStatisticsConvert;
9 9 import cn.iocoder.yudao.module.statistics.dal.dataobject.trade.TradeStatisticsDO;
... ... @@ -21,6 +21,8 @@ import javax.annotation.Resource;
21 21 import java.time.Duration;
22 22 import java.time.LocalDateTime;
23 23 import java.util.List;
  24 +import java.util.stream.Collectors;
  25 +import java.util.stream.IntStream;
24 26  
25 27 /**
26 28 * 交易统计 Service 实现类
... ... @@ -44,51 +46,27 @@ public class TradeStatisticsServiceImpl implements TradeStatisticsService {
44 46 private PayWalletStatisticsService payWalletStatisticsService;
45 47  
46 48 @Override
47   - public TradeStatisticsComparisonRespVO<TradeSummaryRespVO> getTradeSummaryComparison() {
48   - // 1.1 昨天的数据
49   - TradeSummaryRespBO yesterdayData = getTradeSummaryByDays(-1);
50   - // 1.2 前天的数据（用于对照昨天的数据）
51   - TradeSummaryRespBO beforeYesterdayData = getTradeSummaryByDays(-2);
52   - // 2.1 本月数据
53   - TradeSummaryRespBO monthData = getTradeSummaryByMonths(0);
54   - // 2.2 上月数据（用于对照本月的数据）
55   - TradeSummaryRespBO lastMonthData = getTradeSummaryByMonths(-1);
56   - // 转换返回
57   - return TradeStatisticsConvert.INSTANCE.convert(yesterdayData, beforeYesterdayData, monthData, lastMonthData);
58   - }
59   -
60   - /**
61   - * 统计指定日期的交易数据
62   - *
63   - * @param days 增加的天数
64   - * @return 交易数据
65   - */
66   - private TradeSummaryRespBO getTradeSummaryByDays(int days) {
  49 + public TradeSummaryRespBO getTradeSummaryByDays(int days) {
67 50 LocalDateTime date = LocalDateTime.now().plusDays(days);
68 51 return tradeStatisticsMapper.selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween(
69 52 LocalDateTimeUtil.beginOfDay(date), LocalDateTimeUtil.endOfDay(date));
70 53 }
71 54  
72   - /**
73   - * 统计指定月份的交易数据
74   - *
75   - * @param months 增加的月数
76   - * @return 交易数据
77   - */
78   - private TradeSummaryRespBO getTradeSummaryByMonths(int months) {
  55 + @Override
  56 + public TradeSummaryRespBO getTradeSummaryByMonths(int months) {
79 57 LocalDateTime monthDate = LocalDateTime.now().plusMonths(months);
80 58 return tradeStatisticsMapper.selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween(
81 59 LocalDateTimeUtils.beginOfMonth(monthDate), LocalDateTimeUtils.endOfMonth(monthDate));
82 60 }
83 61  
84 62 @Override
85   - public TradeStatisticsComparisonRespVO<TradeTrendSummaryRespVO> getTradeTrendSummaryComparison(LocalDateTime beginTime,
86   - LocalDateTime endTime) {
  63 + public DataComparisonRespVO<TradeTrendSummaryRespVO> getTradeTrendSummaryComparison(LocalDateTime beginTime,
  64 + LocalDateTime endTime) {
87 65 // 统计数据
88   - TradeTrendSummaryRespVO value = tradeStatisticsMapper.selectByTimeBetween(beginTime, endTime);
  66 + TradeTrendSummaryRespVO value = tradeStatisticsMapper.selectVoByTimeBetween(beginTime, endTime);
89 67 // 对照数据
90 68 LocalDateTime referenceBeginTime = beginTime.minus(Duration.between(beginTime, endTime));
91   - TradeTrendSummaryRespVO reference = tradeStatisticsMapper.selectByTimeBetween(referenceBeginTime, beginTime);
  69 + TradeTrendSummaryRespVO reference = tradeStatisticsMapper.selectVoByTimeBetween(referenceBeginTime, beginTime);
92 70 return TradeStatisticsConvert.INSTANCE.convert(value, reference);
93 71 }
94 72  
... ... @@ -97,41 +75,60 @@ public class TradeStatisticsServiceImpl implements TradeStatisticsService {
97 75 return tradeStatisticsMapper.selectExpensePriceByTimeBetween(beginTime, endTime);
98 76 }
99 77  
100   - // TODO @疯狂：是不是直接返回 TradeStatisticsDO；上层在去聚合？
101 78 @Override
102   - public List<TradeTrendSummaryRespVO> getTradeStatisticsList(LocalDateTime beginTime, LocalDateTime endTime) {
  79 + public List<TradeStatisticsDO> getTradeStatisticsList(LocalDateTime beginTime, LocalDateTime endTime) {
103 80 return tradeStatisticsMapper.selectListByTimeBetween(beginTime, endTime);
104 81 }
105 82  
106 83 @Override
107   - public String statisticsYesterdayTrade() {
108   - // TODO @疯狂：如果已经统计，则跳过；
109   - // TODO @疯狂：改成 statisticsTrade，然后传入 days，统计多少天；days 通过 job 传参；方便把历史给统计出来；或者大家有的时候要修复数据（会 fix 业务数据，然后清理统计表），重新统计的时候；
110   - // 1. 从各个数据表，统计对应数据
111   - LocalDateTime yesterday = LocalDateTime.now().minusDays(1);
112   - LocalDateTime beginTime = LocalDateTimeUtil.beginOfDay(yesterday);
113   - LocalDateTime endTime = LocalDateTimeUtil.endOfDay(yesterday);
114   - // 1.1 统计订单
115   - StopWatch stopWatch = new StopWatch("交易统计");
  84 + public String statisticsTrade(Integer days) {
  85 + LocalDateTime today = LocalDateTime.now();
  86 + return IntStream.rangeClosed(1, days)
  87 + .parallel()
  88 + .mapToObj(day -> statisticsTrade(today.minusDays(day)))
  89 + .sorted()
  90 + .collect(Collectors.joining("\n"));
  91 + }
  92 +
  93 + /**
  94 + * 统计交易数据
  95 + *
  96 + * @param date 需要统计的日期
  97 + * @return 统计结果
  98 + */
  99 + private String statisticsTrade(LocalDateTime date) {
  100 + // 1. 处理统计时间范围
  101 + LocalDateTime beginTime = LocalDateTimeUtil.beginOfDay(date);
  102 + LocalDateTime endTime = LocalDateTimeUtil.endOfDay(date);
  103 + String dateStr = DatePattern.NORM_DATE_FORMAT.format(date);
  104 + // 2. 检查该日是否已经统计过
  105 + TradeStatisticsDO entity = tradeStatisticsMapper.selectByTimeBetween(beginTime, endTime);
  106 + if (entity != null) {
  107 + return dateStr + " 数据已存在，如果需要重新统计，请先删除对应的数据";
  108 + }
  109 +
  110 + // 3. 从各个数据表，统计对应数据
  111 + StopWatch stopWatch = new StopWatch(dateStr);
  112 + // 3.1 统计订单
116 113 stopWatch.start("统计订单");
117 114 TradeOrderSummaryRespBO orderSummary = tradeOrderStatisticsService.getOrderSummary(beginTime, endTime);
118 115 stopWatch.stop();
119   - // 1.2 统计售后
  116 + // 3.2 统计售后
120 117 stopWatch.start("统计售后");
121 118 AfterSaleSummaryRespBO afterSaleSummary = afterSaleStatisticsService.getAfterSaleSummary(beginTime, endTime);
122 119 stopWatch.stop();
123   - // 1.3 统计佣金
  120 + // 3.3 统计佣金
124 121 stopWatch.start("统计佣金");
125 122 Integer brokerageSettlementPrice = brokerageStatisticsService.getBrokerageSettlementPriceSummary(beginTime, endTime);
126 123 stopWatch.stop();
127   - // 1.4 统计充值
  124 + // 3.4 统计充值
128 125 stopWatch.start("统计充值");
129 126 WalletSummaryRespBO walletSummary = payWalletStatisticsService.getWalletSummary(beginTime, endTime);
130 127 stopWatch.stop();
131 128  
132   - // 2. 插入数据
133   - TradeStatisticsDO entity = TradeStatisticsConvert.INSTANCE.convert(yesterday, orderSummary, afterSaleSummary,
134   - brokerageSettlementPrice, walletSummary);
  129 + // 4. 插入数据
  130 + entity = TradeStatisticsConvert.INSTANCE.convert(date, orderSummary, afterSaleSummary, brokerageSettlementPrice,
  131 + walletSummary);
135 132 tradeStatisticsMapper.insert(entity);
136 133 return stopWatch.prettyPrint();
137 134 }
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml
  View file @bb82c63
... ... @@ -2,7 +2,7 @@
2 2 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
3 3 <mapper namespace="cn.iocoder.yudao.module.statistics.dal.mysql.infra.ApiAccessLogStatisticsMapper">
4 4  
5   - <select id="selectIpCountByCreateTimeBetween" resultType="java.lang.Integer">
  5 + <select id="selectIpCountByUserTypeAndCreateTimeBetween" resultType="java.lang.Integer">
6 6 SELECT COUNT(DISTINCT user_ip)
7 7 FROM infra_api_access_log
8 8 WHERE user_type = #{userType}
... ... @@ -10,7 +10,7 @@
10 10 AND deleted = FALSE
11 11 </select>
12 12  
13   - <select id="selectUserCountByCreateTimeBetween" resultType="java.lang.Integer">
  13 + <select id="selectUserCountByUserTypeAndCreateTimeBetween" resultType="java.lang.Integer">
14 14 SELECT COUNT(DISTINCT user_id)
15 15 FROM infra_api_access_log
16 16 WHERE user_id > 0
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/member/MemberStatisticsMapper.xml
  View file @bb82c63
... ... @@ -3,7 +3,7 @@
3 3 <mapper namespace="cn.iocoder.yudao.module.statistics.dal.mysql.member.MemberStatisticsMapper">
4 4  
5 5 <select id="selectSummaryListByAreaId"
6   - resultType="cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO">
  6 + resultType="cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO">
7 7 SELECT area_id, COUNT(1) AS userCount
8 8 FROM member_user
9 9 WHERE deleted = FALSE
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/pay/PayWalletStatisticsMapper.xml
  View file @bb82c63
... ... @@ -32,9 +32,8 @@
32 32  
33 33 <select id="selectRechargeSummaryGroupByWalletId"
34 34 resultType="cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO">
35   - <!-- TODO @疯狂：是不是不用 group by，而是通过 DISTINCT wallet_id 更合适哈？ -->
36   - SELECT COUNT(1) AS rechargeUserCount,
37   - SUM(pay_price) AS rechargePrice
  35 + SELECT COUNT(DISTINCT wallet_id) AS rechargeUserCount,
  36 + SUM(pay_price) AS rechargePrice
38 37 FROM pay_wallet_recharge
39 38 WHERE pay_status = #{payStatus}
40 39 <if test="beginTime != null">
... ... @@ -44,7 +43,6 @@
44 43 AND pay_time &lt;= #{endTime}
45 44 </if>
46 45 AND deleted = FALSE
47   - GROUP BY wallet_id
48 46 </select>
49 47  
50 48 <select id="selectRechargePriceSummary" resultType="java.lang.Integer">
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml
  View file @bb82c63
... ... @@ -4,14 +4,14 @@
4 4 <select id="selectSummaryListByAreaId"
5 5 resultType="cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberAreaStatisticsRespVO">
6 6 SELECT receiver_area_id AS areaId,
7   - (SELECT COUNT(1)
  7 + (SELECT COUNT(DISTINCT s.user_id)
8 8 FROM trade_order AS s
9   - WHERE s.receiver_area_id = m.receiver_area_id) AS orderCreateCount,
10   - (SELECT COUNT(1)
  9 + WHERE s.receiver_area_id = m.receiver_area_id) AS orderCreateUserCount,
  10 + (SELECT COUNT(DISTINCT s.user_id)
11 11 FROM trade_order AS s
12 12 WHERE s.receiver_area_id = m.receiver_area_id
13 13 AND s.pay_status = TRUE
14   - AND s.deleted = FALSE) AS orderPayCount,
  14 + AND s.deleted = FALSE) AS orderPayUserCount,
15 15 (SELECT SUM(s.pay_price)
16 16 FROM trade_order AS s
17 17 WHERE s.receiver_area_id = m.receiver_area_id
... ...
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeStatisticsMapper.xml
  View file @bb82c63
... ... @@ -11,16 +11,16 @@
11 11 AND deleted = FALSE
12 12 </select>
13 13  
14   - <select id="selectByTimeBetween"
  14 + <select id="selectVoByTimeBetween"
15 15 resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO">
16 16 SELECT
17 17 -- 营业额 = 商品支付金额 + 充值金额
18   - SUM(order_pay_price + recharge_pay_price) AS turnover,
  18 + SUM(order_pay_price + recharge_pay_price) AS turnoverPrice,
19 19 SUM(order_pay_price) AS orderPayPrice,
20 20 SUM(recharge_pay_price) AS rechargePrice,
21 21 -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
22 22 SUM(order_wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice,
23   - SUM(order_wallet_pay_price) AS balancePrice,
  23 + SUM(order_wallet_pay_price) AS orderWalletPayPrice,
24 24 SUM(brokerage_settlement_price) AS brokerageSettlementPrice,
25 25 SUM(after_sale_refund_price) AS orderRefundPrice
26 26 FROM trade_statistics
... ... @@ -28,25 +28,6 @@
28 28 AND deleted = FALSE
29 29 </select>
30 30  
31   - <select id="selectListByTimeBetween"
32   - resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO">
33   - SELECT DATE_FORMAT(time, '%Y-%m-%d') AS date,
34   - -- 营业额 = 商品支付金额 + 充值金额
35   - SUM(order_pay_price + recharge_pay_price) AS turnover,
36   - SUM(order_pay_price) AS orderPayPrice,
37   - SUM(recharge_pay_price) AS rechargePrice,
38   - -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
39   - SUM(order_wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice,
40   - SUM(order_wallet_pay_price) AS balancePrice,
41   - SUM(brokerage_settlement_price) AS brokerageSettlementPrice,
42   - SUM(after_sale_refund_price) AS orderRefundPrice
43   - FROM trade_statistics
44   - WHERE time BETWEEN #{beginTime} AND #{endTime}
45   - AND deleted = FALSE
46   - <!-- TODO @疯狂：已经不用 group by，它就是每天统计一条； -->
47   - GROUP BY date
48   - </select>
49   -
50 31 <select id="selectExpensePriceByTimeBetween" resultType="java.lang.Integer">
51 32 SELECT -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
52 33 SUM(order_wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice
... ...