预约列表

KKSU

2023-11-30 dc9ad4801c9492b173af87f9f1d78a4ec6fc2707

预约列表

 src/main/java/cc/mrbird/febs/mall/controller/ApiMallMemberController.java

@@ -106,7 +106,7 @@
    }


    @ApiOperation(value = "资金流水列表")
    @ApiOperation(value = "FCM-资金流水列表")
    @ApiResponses({
            @ApiResponse(code = 200, message = "success", response = MoneyFlowVo.class)
    })

 src/main/java/cc/mrbird/febs/mall/dto/MoneyFlowDto.java

@@ -19,13 +19,13 @@
    @ApiModelProperty(value = "页码", example = "1")
    private Integer pageNum;

    @ApiModelProperty(value = "类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-总监收益 6-社区点补 7-一代收益 8-提现 9-转增 10-支付 11-退款")
    @ApiModelProperty(value = "类型 ")
    private Integer type;

    @ApiModelProperty(value = "类型 1-全部 2-支出 3-收入")
    private Integer inOrOut;

    @ApiModelProperty(value = "流水类型 1-余额 2-赠送积分 3-竞猜积分 4-佣金")
    @ApiModelProperty(value = "流水类型 1-FCM代币 2-令牌 3-NFT")
    private Integer flowType;

    @ApiModelProperty(hidden = true)

 src/main/java/cc/mrbird/febs/mall/mapper/MallMoneyFlowMapper.java

@@ -22,6 +22,8 @@

    IPage<MoneyFlowVo> selectApiMoneyFlowInPage(IPage<MoneyFlowVo> page, @Param("record") MoneyFlowDto moneyFlowDto);

    IPage<MoneyFlowVo> selectApiFcmMoneyFlowInPage(IPage<MoneyFlowVo> page, @Param("record") MoneyFlowDto moneyFlowDto);

    IPage<AdminMoneyFlowListVo> getMoneyFlowListInPage(Page<AdminMoneyFlowListVo> page,  @Param("record")MoneyFlowListDto moneyFlowListDto);

    IPage<AdminMoneyChargeListVo> getMoneyChargeListInPage(Page<AdminMoneyChargeListVo> page, @Param("record")MoneyChargeListDto moneyChargeListDto);

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java

@@ -357,7 +357,8 @@
        IPage<MoneyFlowVo> page = new Page<>(moneyFlowDto.getPageNum(), moneyFlowDto.getPageSize());
        Long id = LoginUserUtil.getLoginUser().getId();
        moneyFlowDto.setMemberId(id);
        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
//        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiMoneyFlowInPage(page, moneyFlowDto);
        IPage<MoneyFlowVo> pages = mallMoneyFlowMapper.selectApiFcmMoneyFlowInPage(page, moneyFlowDto);
        return new FebsResponse().success().data(pages);
    }


 src/main/java/cc/mrbird/febs/mall/vo/MoneyFlowVo.java

@@ -22,20 +22,14 @@
    @ApiModelProperty(value = "金额，有正负")
    private BigDecimal amount;

    @ApiModelProperty(value = "类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-总监收益 6-社区点补 7-一代收益 8-提现 9-转增 10-支付 11-退款")
    @ApiModelProperty(value = "类型")
    private Integer type;

    @ApiModelProperty(value = "类型 1-静态收益 2-直推奖 3-代理收益 4-排名收益 5-总监收益 6-社区点补 7-一代收益 8-提现 9-转增 10-支付 11-退款")
    @ApiModelProperty(value = "流水类型 1-FCM代币 2-令牌 3-NFT")
    private Integer flowType;

    @ApiModelProperty(value = "对方手机号")
    private String phone;

    @ApiModelProperty(value = "代理等级")
    private String memberLevel;

    @ApiModelProperty(value = "提现状态 1-提现中2-成功 3-拒绝")
    private Integer status;
    private String description;

    @ApiModelProperty(value = "时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml

@@ -42,6 +42,30 @@
        order by a.created_time desc
    </select>

    <select id="selectApiFcmMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
        select
        a.*
        from mall_money_flow a
        <where>
            <if test="record.inOrOut == 3">
                and a.amount > 0
            </if>
            <if test="record.inOrOut == 2">
                and 0 > a.amount
            </if>
            <if test="record.memberId != null">
                and a.member_id=#{record.memberId}
            </if>
            <if test="record.flowType != null and record.flowType != ''">
                and a.flow_type=#{record.flowType}
            </if>
            <if test="record.type != null and record.type != ''">
                and a.type=#{record.type}
            </if>
        </where>
        order by a.created_time desc
    </select>

    <select id="getMoneyFlowListInPage" resultType="cc.mrbird.febs.mall.vo.AdminMoneyFlowListVo">
        select
        a.*,