mirror of
				https://gitee.com/hhyykk/ipms-sjy.git
				synced 2025-11-04 12:18:42 +08:00 
			
		
		
		
	code review:会员统计
This commit is contained in:
		@@ -30,13 +30,15 @@ public class MemberStatisticsController {
 | 
			
		||||
    @Resource
 | 
			
		||||
    private MemberStatisticsService memberStatisticsService;
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    @GetMapping("/summary")
 | 
			
		||||
    @Operation(summary = "获得会员统计")
 | 
			
		||||
    @Operation(summary = "获得会员统计(实时统计)")
 | 
			
		||||
    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
 | 
			
		||||
    public CommonResult<MemberSummaryRespVO> getMemberSummary() {
 | 
			
		||||
        return success(memberStatisticsService.getMemberSummary());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    @GetMapping("/analyse")
 | 
			
		||||
    @Operation(summary = "获得会员分析数据")
 | 
			
		||||
    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
 | 
			
		||||
@@ -45,6 +47,7 @@ public class MemberStatisticsController {
 | 
			
		||||
                ArrayUtil.get(reqVO.getTimes(), 0), ArrayUtil.get(reqVO.getTimes(), 1)));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    @GetMapping("/get-area-statistics-list")
 | 
			
		||||
    @Operation(summary = "按照省份,获得会员统计列表")
 | 
			
		||||
    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
 | 
			
		||||
@@ -52,6 +55,7 @@ public class MemberStatisticsController {
 | 
			
		||||
        return success(memberStatisticsService.getMemberAreaStatisticsList());
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    @GetMapping("/get-sex-statistics-list")
 | 
			
		||||
    @Operation(summary = "按照性别,获得会员统计列表")
 | 
			
		||||
    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
 | 
			
		||||
@@ -64,6 +68,7 @@ public class MemberStatisticsController {
 | 
			
		||||
    @PreAuthorize("@ss.hasPermission('statistics:member:query')")
 | 
			
		||||
    public CommonResult<List<MemberTerminalStatisticsRespVO>> getMemberTerminalStatisticsList() {
 | 
			
		||||
        // TODO 疯狂:这个可以晚点写,因为 user = = 上还没记录 terminal
 | 
			
		||||
        // TODO @疯狂:在 member_user 上,增加 registerTerminal 字段,基于它来统计哈;
 | 
			
		||||
        List<MemberTerminalStatisticsRespVO> list = convertList(TerminalEnum.values(),
 | 
			
		||||
                t -> new MemberTerminalStatisticsRespVO()
 | 
			
		||||
                        .setTerminal(t.getTerminal()).setUserCount(t.getTerminal() * 100));
 | 
			
		||||
 
 | 
			
		||||
@@ -7,9 +7,11 @@ import lombok.Data;
 | 
			
		||||
@Data
 | 
			
		||||
public class MemberAnalyseComparisonRespVO {
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:这个字段,要不改成注册用户量;registerUserCount;
 | 
			
		||||
    @Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer userCount;
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:这个字段,名字改成 visitUserCount;有访问,就算活跃;
 | 
			
		||||
    @Schema(description = "活跃用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer activeUserCount;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +8,7 @@ import lombok.Data;
 | 
			
		||||
@Data
 | 
			
		||||
public class MemberAnalyseRespVO {
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:这个字段改成 visitUserCount,保持和 userCount 字段统一
 | 
			
		||||
    @Schema(description = "访客数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer visitorCount;
 | 
			
		||||
 | 
			
		||||
@@ -17,7 +18,7 @@ public class MemberAnalyseRespVO {
 | 
			
		||||
    @Schema(description = "成交用户数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer payUserCount;
 | 
			
		||||
 | 
			
		||||
    @Schema(description = "客单价", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    @Schema(description = "客单价,单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer atv;
 | 
			
		||||
 | 
			
		||||
    @Schema(description = "对照数据", requiredMode = Schema.RequiredMode.REQUIRED)
 | 
			
		||||
 
 | 
			
		||||
@@ -15,10 +15,12 @@ public class MemberAreaStatisticsRespVO {
 | 
			
		||||
    @Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer userCount;
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:要不 orderCreateUserCount 和 orderPayUserCount 貌似更统一一些;
 | 
			
		||||
    @Schema(description = "订单创建数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer orderCreateCount;
 | 
			
		||||
    @Schema(description = "订单支付数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "512")
 | 
			
		||||
    private Integer orderPayCount;
 | 
			
		||||
 | 
			
		||||
    @Schema(description = "订单支付金额,单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "622")
 | 
			
		||||
    private Integer orderPayPrice;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -10,6 +10,7 @@ public class MemberSexStatisticsRespVO {
 | 
			
		||||
    @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
 | 
			
		||||
    private Integer sex;
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:要不还是其它字段,我们也补全,这样方便使用的用户,做定制化;就保持和 MemberAreaStatisticsRespVO 一致;
 | 
			
		||||
    @Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer userCount;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -13,10 +13,11 @@ public class MemberSummaryRespVO {
 | 
			
		||||
    @Schema(description = "充值会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "221")
 | 
			
		||||
    private Integer rechargeUserCount;
 | 
			
		||||
 | 
			
		||||
    @Schema(description = "充值金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    @Schema(description = "充值金额,单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer rechargePrice;
 | 
			
		||||
 | 
			
		||||
    @Schema(description = "支出金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer expensePrice;
 | 
			
		||||
    // TODO @疯狂:要不干脆这个字段改成:orderPayPrice??
 | 
			
		||||
    @Schema(description = "支出金额,单位:分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer expensePrice; // 只计算 mall 交易订单的支付金额,不考虑退款
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -10,6 +10,7 @@ public class MemberTerminalStatisticsRespVO {
 | 
			
		||||
    @Schema(description = "终端", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
 | 
			
		||||
    private Integer terminal;
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:要不 orderCreateUserCount 和 orderPayUserCount 貌似更统一一些;
 | 
			
		||||
    @Schema(description = "会员数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
 | 
			
		||||
    private Integer userCount;
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
import lombok.NoArgsConstructor;
 | 
			
		||||
 | 
			
		||||
// TODO @疯狂:是不是搞成公用的哈;类似,controller/admin/common,下面直接放它
 | 
			
		||||
@Schema(description = "管理后台 - 交易统计对照 Response VO")
 | 
			
		||||
@Data
 | 
			
		||||
@NoArgsConstructor
 | 
			
		||||
 
 | 
			
		||||
@@ -14,9 +14,11 @@ import java.time.LocalDateTime;
 | 
			
		||||
@Mapper
 | 
			
		||||
public interface ApiAccessLogStatisticsMapper extends BaseMapperX<Object> {
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:是不是 selectIpCount
 | 
			
		||||
    Integer selectCountByIp(@Param("beginTime") LocalDateTime beginTime,
 | 
			
		||||
                            @Param("endTime") LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:是不是 selectUserCount
 | 
			
		||||
    Integer selectCountByUserId(@Param("beginTime") LocalDateTime beginTime,
 | 
			
		||||
                                @Param("endTime") LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -17,10 +17,13 @@ import java.util.List;
 | 
			
		||||
@Mapper
 | 
			
		||||
public interface MemberStatisticsMapper extends BaseMapperX<Object> {
 | 
			
		||||
 | 
			
		||||
    // TODO @芋艿:已经 review
 | 
			
		||||
    // TODO @疯狂:要不还是搞下 bo?虽然可能冗余了点~~
 | 
			
		||||
    List<MemberAreaStatisticsRespVO> selectSummaryListByAreaId();
 | 
			
		||||
 | 
			
		||||
    List<MemberSexStatisticsRespVO> selectSummaryListBySex();
 | 
			
		||||
 | 
			
		||||
    // TODO @芋艿:已经 review
 | 
			
		||||
    Integer selectUserCount(@Param("beginTime") LocalDateTime beginTime,
 | 
			
		||||
                            @Param("endTime") LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -29,6 +29,7 @@ public interface PayWalletStatisticsMapper extends BaseMapperX<TradeStatisticsDO
 | 
			
		||||
                                                            @Param("endTime") LocalDateTime endTime,
 | 
			
		||||
                                                            @Param("bizType") Integer bizType);
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review;
 | 
			
		||||
    RechargeSummaryRespBO selectRechargeSummaryGroupByWalletId(@Param("beginTime") LocalDateTime beginTime,
 | 
			
		||||
                                                               @Param("endTime") LocalDateTime endTime,
 | 
			
		||||
                                                               @Param("payStatus") Boolean payStatus);
 | 
			
		||||
 
 | 
			
		||||
@@ -17,6 +17,7 @@ import java.util.List;
 | 
			
		||||
@Mapper
 | 
			
		||||
public interface TradeOrderStatisticsMapper extends BaseMapperX<TradeStatisticsDO> {
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    List<MemberAreaStatisticsRespVO> selectSummaryListByAreaId();
 | 
			
		||||
 | 
			
		||||
    Integer selectCountByCreateTimeBetween(@Param("beginTime") LocalDateTime beginTime,
 | 
			
		||||
@@ -25,12 +26,15 @@ public interface TradeOrderStatisticsMapper extends BaseMapperX<TradeStatisticsD
 | 
			
		||||
    Integer selectCountByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
 | 
			
		||||
                                        @Param("endTime") LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    Integer selectSummaryPriceByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
 | 
			
		||||
                                               @Param("endTime") LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    Integer selectUserCountByCreateTimeBetween(@Param("beginTime") LocalDateTime beginTime,
 | 
			
		||||
                                               @Param("endTime") LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    Integer selectUserCountByPayTimeBetween(@Param("beginTime") LocalDateTime beginTime,
 | 
			
		||||
                                            @Param("endTime") LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -9,6 +9,8 @@ import java.time.LocalDateTime;
 | 
			
		||||
 */
 | 
			
		||||
public interface ApiAccessLogStatisticsService {
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:需要传递 userType;因为访问日志,可能涉及多种用户类型;
 | 
			
		||||
    // TODO @疯狂:方法名,要不改成 getUserCount;原因:让它更业务无关
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取活跃用户数量
 | 
			
		||||
     *
 | 
			
		||||
@@ -18,6 +20,8 @@ public interface ApiAccessLogStatisticsService {
 | 
			
		||||
     */
 | 
			
		||||
    Integer getActiveUserCount(LocalDateTime beginTime, LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:需要传递 userType;因为访问日志,可能涉及多种用户类型;
 | 
			
		||||
    // TODO @疯狂:方法名,要不改成 getIpCount;原因:让它更业务无关
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取访问用户数量
 | 
			
		||||
     *
 | 
			
		||||
 
 | 
			
		||||
@@ -28,4 +28,5 @@ public class ApiAccessLogStatisticsServiceImpl implements ApiAccessLogStatistics
 | 
			
		||||
    public Integer getVisitorUserCount(LocalDateTime beginTime, LocalDateTime endTime) {
 | 
			
		||||
        return apiAccessLogStatisticsMapper.selectCountByIp(beginTime, endTime);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -15,13 +15,24 @@ import java.util.List;
 | 
			
		||||
 */
 | 
			
		||||
public interface MemberStatisticsService {
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取会员统计
 | 
			
		||||
     * 获取会员统计(实时统计)
 | 
			
		||||
     *
 | 
			
		||||
     * @return 会员统计
 | 
			
		||||
     */
 | 
			
		||||
    MemberSummaryRespVO getMemberSummary();
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取用户分析数据
 | 
			
		||||
     *
 | 
			
		||||
     * @param beginTime 起始时间
 | 
			
		||||
     * @param endTime   截止时间
 | 
			
		||||
     * @return 用户分析数据
 | 
			
		||||
     */
 | 
			
		||||
    MemberAnalyseRespVO getMemberAnalyse(LocalDateTime beginTime, LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 按照省份,获得会员统计列表
 | 
			
		||||
     *
 | 
			
		||||
@@ -36,13 +47,4 @@ public interface MemberStatisticsService {
 | 
			
		||||
     */
 | 
			
		||||
    List<MemberSexStatisticsRespVO> getMemberSexStatisticsList();
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取用户分析数据
 | 
			
		||||
     *
 | 
			
		||||
     * @param beginTime 起始时间
 | 
			
		||||
     * @param endTime   截止时间
 | 
			
		||||
     * @return 用户分析数据
 | 
			
		||||
     */
 | 
			
		||||
    MemberAnalyseRespVO getMemberAnalyse(LocalDateTime beginTime, LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -5,7 +5,6 @@ import cn.iocoder.yudao.framework.ip.core.enums.AreaTypeEnum;
 | 
			
		||||
import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
 | 
			
		||||
import cn.iocoder.yudao.module.statistics.controller.admin.member.vo.*;
 | 
			
		||||
import cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeStatisticsComparisonRespVO;
 | 
			
		||||
import cn.iocoder.yudao.module.statistics.convert.member.MemberStatisticsConvert;
 | 
			
		||||
import cn.iocoder.yudao.module.statistics.dal.mysql.member.MemberStatisticsMapper;
 | 
			
		||||
import cn.iocoder.yudao.module.statistics.service.infra.ApiAccessLogStatisticsService;
 | 
			
		||||
import cn.iocoder.yudao.module.statistics.service.pay.PayWalletStatisticsService;
 | 
			
		||||
@@ -14,6 +13,7 @@ import cn.iocoder.yudao.module.statistics.service.trade.TradeOrderStatisticsServ
 | 
			
		||||
import cn.iocoder.yudao.module.statistics.service.trade.TradeStatisticsService;
 | 
			
		||||
import org.springframework.stereotype.Service;
 | 
			
		||||
import org.springframework.validation.annotation.Validated;
 | 
			
		||||
import cn.iocoder.yudao.module.statistics.convert.member.MemberStatisticsConvert;
 | 
			
		||||
 | 
			
		||||
import javax.annotation.Resource;
 | 
			
		||||
import java.time.Duration;
 | 
			
		||||
@@ -45,9 +45,20 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
 | 
			
		||||
    @Resource
 | 
			
		||||
    private ApiAccessLogStatisticsService apiAccessLogStatisticsService;
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public MemberSummaryRespVO getMemberSummary() {
 | 
			
		||||
        RechargeSummaryRespBO rechargeSummary = payWalletStatisticsService.getUserRechargeSummary(null, null);
 | 
			
		||||
        // TODO @疯狂:1)这里是实时统计,不好走走 TradeStatistics 表;2)因为这个放在商城下,所以只考虑订单数据,即按照 trade_order 的 pay_price 并且已支付来计算;
 | 
			
		||||
        Integer expensePrice = tradeStatisticsService.getExpensePrice(null, null);
 | 
			
		||||
        Integer userCount = memberStatisticsMapper.selectUserCount(null, null);
 | 
			
		||||
        return MemberStatisticsConvert.INSTANCE.convert(rechargeSummary, expensePrice, userCount);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public List<MemberAreaStatisticsRespVO> getMemberAreaStatisticsList() {
 | 
			
		||||
        // 统计用户
 | 
			
		||||
        // TODO @疯狂:要处理下,未知省份;就是没填写省份的情况;
 | 
			
		||||
        // TODO @疯狂:可能得把每个省的用户,都查询出来,然后去 order 那边 in;因为要按照这些人为基础来计算;;用户规模量大可能不太好,但是暂时就先这样搞吧 = =
 | 
			
		||||
        Map<Integer, Integer> userCountMap = convertMap(memberStatisticsMapper.selectSummaryListByAreaId(),
 | 
			
		||||
                vo -> AreaUtils.getParentIdByType(vo.getAreaId(), AreaTypeEnum.PROVINCE),
 | 
			
		||||
                MemberAreaStatisticsRespVO::getUserCount, Integer::sum);
 | 
			
		||||
@@ -63,22 +74,22 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
 | 
			
		||||
        return MemberStatisticsConvert.INSTANCE.convertList(AreaUtils.getByType(AreaTypeEnum.PROVINCE, area -> area), userCountMap, orderMap);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public List<MemberSexStatisticsRespVO> getMemberSexStatisticsList() {
 | 
			
		||||
        return memberStatisticsMapper.selectSummaryListBySex();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    // TODO @疯狂:这个方法,要不拆成:1)controller 调用 getMemberAnalyseComparisonData;2)tradeOrderStatisticsService.getPayUserCount;3)tradeOrderStatisticsService.getOrderPayPrice;4)。。。
 | 
			
		||||
    // TODO 就是说:分析交给 controller 去组合;
 | 
			
		||||
    @Override
 | 
			
		||||
    public MemberAnalyseRespVO getMemberAnalyse(LocalDateTime beginTime, LocalDateTime endTime) {
 | 
			
		||||
        // 对照数据
 | 
			
		||||
        MemberAnalyseComparisonRespVO vo = getMemberAnalyseComparisonData(beginTime, endTime);
 | 
			
		||||
        // TODO @疯狂:如果时间段这么处理,会不会 beginTime 重叠了。因为是 <= 一个时间;如果数据库插入的是 ,xxxx-yy-zz 00:00:00 的话,它既满足 >= ? 也满足 <= ;(如果不好理解,微信聊)
 | 
			
		||||
        LocalDateTime referenceBeginTime = beginTime.minus(Duration.between(beginTime, endTime));
 | 
			
		||||
        MemberAnalyseComparisonRespVO reference = getMemberAnalyseComparisonData(referenceBeginTime, beginTime);
 | 
			
		||||
 | 
			
		||||
        Integer payUserCount = tradeOrderStatisticsService.getPayUserCount(beginTime, endTime);
 | 
			
		||||
        // 计算客单价
 | 
			
		||||
        // TODO @疯狂:这个可能有点特殊,要按照 create_time 来查询;不然它的漏斗就不统一;因为是访问数量 > 今日下单人 > 今日支付人;是一个统一的维度;
 | 
			
		||||
        Integer payUserCount = tradeOrderStatisticsService.getPayUserCount(beginTime, endTime);
 | 
			
		||||
        int atv = 0;
 | 
			
		||||
        if (payUserCount != null && payUserCount > 0) {
 | 
			
		||||
            // TODO @疯狂:类似上面的 payUserCount
 | 
			
		||||
            Integer payPrice = tradeOrderStatisticsService.getOrderPayPrice(beginTime, endTime);
 | 
			
		||||
            atv = NumberUtil.div(payPrice, payUserCount).intValue();
 | 
			
		||||
        }
 | 
			
		||||
@@ -90,15 +101,6 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
 | 
			
		||||
                .setComparison(new TradeStatisticsComparisonRespVO<>(vo, reference));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public MemberSummaryRespVO getMemberSummary() {
 | 
			
		||||
        RechargeSummaryRespBO rechargeSummary = payWalletStatisticsService.getUserRechargeSummary(null, null);
 | 
			
		||||
        Integer expensePrice = tradeStatisticsService.getExpensePrice(null, null);
 | 
			
		||||
        Integer userCount = memberStatisticsMapper.selectUserCount(null, null);
 | 
			
		||||
 | 
			
		||||
        return MemberStatisticsConvert.INSTANCE.convert(rechargeSummary, expensePrice, userCount);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private MemberAnalyseComparisonRespVO getMemberAnalyseComparisonData(LocalDateTime beginTime, LocalDateTime endTime) {
 | 
			
		||||
        Integer rechargeUserCount = Optional.ofNullable(payWalletStatisticsService.getUserRechargeSummary(beginTime, endTime))
 | 
			
		||||
                .map(RechargeSummaryRespBO::getRechargeUserCount).orElse(0);
 | 
			
		||||
@@ -108,4 +110,10 @@ public class MemberStatisticsServiceImpl implements MemberStatisticsService {
 | 
			
		||||
                .setRechargeUserCount(rechargeUserCount);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Override
 | 
			
		||||
    public List<MemberSexStatisticsRespVO> getMemberSexStatisticsList() {
 | 
			
		||||
        // TODO @疯狂:需要考虑,用户性别为空,则是“未知”
 | 
			
		||||
        return memberStatisticsMapper.selectSummaryListBySex();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.statistics.service.pay.bo;
 | 
			
		||||
import io.swagger.v3.oas.annotations.media.Schema;
 | 
			
		||||
import lombok.Data;
 | 
			
		||||
 | 
			
		||||
// TODO @疯狂:BO 不用写 swagger 注解哈,写注释就好啦;
 | 
			
		||||
@Schema(description = "管理后台 - 充值统计 Response VO")
 | 
			
		||||
@Data
 | 
			
		||||
public class RechargeSummaryRespBO {
 | 
			
		||||
 
 | 
			
		||||
@@ -22,6 +22,7 @@ public interface TradeOrderStatisticsService {
 | 
			
		||||
     */
 | 
			
		||||
    TradeOrderSummaryRespBO getOrderSummary(LocalDateTime beginTime, LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取地区订单统计
 | 
			
		||||
     *
 | 
			
		||||
@@ -29,15 +30,17 @@ public interface TradeOrderStatisticsService {
 | 
			
		||||
     */
 | 
			
		||||
    List<MemberAreaStatisticsRespVO> getSummaryListByAreaId();
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取下单用户数量
 | 
			
		||||
     *
 | 
			
		||||
     * @param beginTime 起始时间
 | 
			
		||||
     * @param endTime   截止时间
 | 
			
		||||
     * @return 支付下单数量
 | 
			
		||||
     * @return 下单用户数量
 | 
			
		||||
     */
 | 
			
		||||
    Integer getOrderUserCount(LocalDateTime beginTime, LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取支付用户数量
 | 
			
		||||
     *
 | 
			
		||||
@@ -47,6 +50,7 @@ public interface TradeOrderStatisticsService {
 | 
			
		||||
     */
 | 
			
		||||
    Integer getPayUserCount(LocalDateTime beginTime, LocalDateTime endTime);
 | 
			
		||||
 | 
			
		||||
    // TODO 芋艿:已经 review
 | 
			
		||||
    /**
 | 
			
		||||
     * 获取支付金额
 | 
			
		||||
     *
 | 
			
		||||
 
 | 
			
		||||
@@ -32,6 +32,8 @@ public interface TradeStatisticsService {
 | 
			
		||||
    /**
 | 
			
		||||
     * 获得交易状况统计
 | 
			
		||||
     *
 | 
			
		||||
     * @param beginTime 开始时间
 | 
			
		||||
     * @param endTime 结束时间
 | 
			
		||||
     * @return 统计数据对照
 | 
			
		||||
     */
 | 
			
		||||
    Integer getExpensePrice(LocalDateTime beginTime, LocalDateTime endTime);
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,7 @@
 | 
			
		||||
<mapper namespace="cn.iocoder.yudao.module.statistics.dal.mysql.infra.ApiAccessLogStatisticsMapper">
 | 
			
		||||
 | 
			
		||||
    <select id="selectCountByIp" resultType="java.lang.Integer">
 | 
			
		||||
        <!-- TODO @疯狂:distinct 会不会更合适哈 -->
 | 
			
		||||
        SELECT COUNT(1)
 | 
			
		||||
        FROM infra_api_access_log
 | 
			
		||||
        WHERE create_time BETWEEN #{beginTime} AND #{endTime}
 | 
			
		||||
@@ -11,6 +12,7 @@
 | 
			
		||||
    </select>
 | 
			
		||||
 | 
			
		||||
    <select id="selectCountByUserId" resultType="java.lang.Integer">
 | 
			
		||||
        <!-- TODO @疯狂:distinct 会不会更合适哈 -->
 | 
			
		||||
        SELECT COUNT(1)
 | 
			
		||||
        FROM infra_api_access_log
 | 
			
		||||
        WHERE user_id > 0
 | 
			
		||||
 
 | 
			
		||||
@@ -31,6 +31,7 @@
 | 
			
		||||
 | 
			
		||||
    <select id="selectRechargeSummaryGroupByWalletId"
 | 
			
		||||
            resultType="cn.iocoder.yudao.module.statistics.service.pay.bo.RechargeSummaryRespBO">
 | 
			
		||||
        <!-- TODO @疯狂:是不是不用 group by,而是通过 DISTINCT wallet_id 更合适哈? -->
 | 
			
		||||
        SELECT COUNT(1)       AS rechargeUserCount,
 | 
			
		||||
               SUM(pay_price) AS rechargePrice
 | 
			
		||||
        FROM pay_wallet_recharge
 | 
			
		||||
 
 | 
			
		||||
@@ -49,7 +49,7 @@
 | 
			
		||||
    <select id="selectExpensePriceByTimeBetween" resultType="java.lang.Integer">
 | 
			
		||||
        SELECT -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
 | 
			
		||||
               SUM(order_wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice
 | 
			
		||||
          FROM trade_statistics
 | 
			
		||||
        FROM trade_statistics
 | 
			
		||||
        WHERE deleted = FALSE
 | 
			
		||||
        <if test="beginTime != null">
 | 
			
		||||
            AND time >= #{beginTime}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user