20211216

xiaoyong931011

2021-12-22 6c920885a9bc407f2f05e204ae9769631c4c80e7

20211216

 src/main/java/cc/mrbird/febs/video/controller/AdminVideoMemberController.java

@@ -6,6 +6,7 @@
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.video.dto.AdminSetVipDto;
import cc.mrbird.febs.video.entity.AppVersion;
import cc.mrbird.febs.video.entity.VideoVipOrderInfoEntity;
import cc.mrbird.febs.video.service.IAdminVideoMemberService;
import cc.mrbird.febs.video.entity.VideoMemberEntity;
import lombok.RequiredArgsConstructor;
@@ -33,6 +34,15 @@
        return new FebsResponse().success().data(data);
    }

    /**
     * 会员订单列表
     */
    @GetMapping("getOrders")
    public FebsResponse getOrders(VideoVipOrderInfoEntity videoVipOrderInfoEntity, QueryRequest request) {
        Map<String, Object> data = getDataTable(adminVideoMemberService.getOrders(videoVipOrderInfoEntity, request));
        return new FebsResponse().success().data(data);
    }

    @PostMapping("resetPwd/{id}")
    @ControllerEndpoint(operation = "会员列表---重置密码", exceptionMessage = "操作失败")
    public FebsResponse resetPwd(@PathVariable("id") Long id) {

 src/main/java/cc/mrbird/febs/video/controller/ViewVideoMemberController.java

@@ -34,6 +34,17 @@


    /**
     * 会员订单列表
     * @return
     */
    @GetMapping("orderList")
    @RequiresPermissions("orderList:view")
    public String orderList() {
        return FebsUtil.view("videoMember/orderList");
    }


    /**
     * 会员列表-设置会员
     * @param id
     * @return

 src/main/java/cc/mrbird/febs/video/entity/VideoMemberEntity.java

@@ -97,11 +97,4 @@
     */
    public static final Integer ACCOUNT_TYPE_TEST = 2;

    @TableField(exist = false)
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date buyTime;

    @TableField(exist = false)
//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date expireTime;
}

 src/main/java/cc/mrbird/febs/video/mapper/VideoMemberMapper.java

@@ -2,7 +2,9 @@

import cc.mrbird.febs.video.entity.AppVersion;
import cc.mrbird.febs.video.entity.VideoMemberEntity;
import cc.mrbird.febs.video.entity.VideoVipOrderInfoEntity;
import cc.mrbird.febs.video.vo.AdminVideoMemberEntityVo;
import cc.mrbird.febs.video.vo.AdminVideoVipOrderInfoVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -19,4 +21,6 @@
    IPage<AdminVideoMemberEntityVo> selectVideoMemberListInPage(Page<VideoMemberEntity> page, @Param("record")VideoMemberEntity videoMember);

    IPage<AppVersion> getAppVersionListInPage(Page<AppVersion> page, AppVersion appVersion);

    IPage<AdminVideoVipOrderInfoVo> selectAdminVideoVipOrderInfoVoInPage(Page<VideoMemberEntity> page, @Param("record")VideoVipOrderInfoEntity videoVipOrderInfoEntity);
}

 src/main/java/cc/mrbird/febs/video/service/IAdminVideoMemberService.java

@@ -5,8 +5,10 @@
import cc.mrbird.febs.video.dto.AdminSetVipDto;
import cc.mrbird.febs.video.entity.AppVersion;
import cc.mrbird.febs.video.entity.VideoMemberEntity;
import cc.mrbird.febs.video.entity.VideoVipOrderInfoEntity;
import cc.mrbird.febs.video.vo.AdminVideoMemberEntityVo;
import cc.mrbird.febs.video.vo.AdminVideoMemberVo;
import cc.mrbird.febs.video.vo.AdminVideoVipOrderInfoVo;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -35,4 +37,6 @@
    FebsResponse updateAppVersion(AppVersion appVersion);

    AppVersion getAppVersionInfoById(long id);

    IPage<AdminVideoVipOrderInfoVo> getOrders(VideoVipOrderInfoEntity videoVipOrderInfoEntity, QueryRequest request);
}

 src/main/java/cc/mrbird/febs/video/service/impl/AdminVideoMemberServiceImpl.java

@@ -7,6 +7,7 @@
import cc.mrbird.febs.video.entity.AppVersion;
import cc.mrbird.febs.video.entity.VideoMemberEntity;
import cc.mrbird.febs.video.entity.VideoVipInfoEntity;
import cc.mrbird.febs.video.entity.VideoVipOrderInfoEntity;
import cc.mrbird.febs.video.enumeration.VipTypeEnum;
import cc.mrbird.febs.video.mapper.AppVersionMapper;
import cc.mrbird.febs.video.mapper.VideoMemberMapper;
@@ -15,6 +16,7 @@
import cc.mrbird.febs.video.service.IApiVideoMemberService;
import cc.mrbird.febs.video.vo.AdminVideoMemberEntityVo;
import cc.mrbird.febs.video.vo.AdminVideoMemberVo;
import cc.mrbird.febs.video.vo.AdminVideoVipOrderInfoVo;
import cn.hutool.core.date.DateField;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -185,5 +187,12 @@
        return appVersionMapper.selectById(id);
    }

    @Override
    public IPage<AdminVideoVipOrderInfoVo> getOrders(VideoVipOrderInfoEntity videoVipOrderInfoEntity, QueryRequest request) {
        Page<VideoMemberEntity> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminVideoVipOrderInfoVo> adminVideoVipOrderInfoVos = this.baseMapper.selectAdminVideoVipOrderInfoVoInPage(page, videoVipOrderInfoEntity);
        return adminVideoVipOrderInfoVos;
    }


}

 src/main/java/cc/mrbird/febs/video/vo/AdminVideoMemberEntityVo.java

@@ -1,7 +1,5 @@
package cc.mrbird.febs.video.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;


 src/main/java/cc/mrbird/febs/video/vo/AdminVideoVipOrderInfoVo.java

New file
@@ -0,0 +1,9 @@
package cc.mrbird.febs.video.vo;

import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "AdminVideoVipOrderInfoVo", description = "返回参数类")
public class AdminVideoVipOrderInfoVo {
}

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

@@ -48,4 +48,11 @@
        select a.* from app_version a
    </select>

    <select id="selectAdminVideoVipOrderInfoVoInPage" resultType="cc.mrbird.febs.video.vo.AdminVideoVipOrderInfoVo">
        SELECT
        a.*
        FROM video_vip_order_info a
        order by a.CREATED_TIME desc
    </select>

</mapper>