骑行记录表优化和导出

jiangping

2023-10-10 080edcadaec99063016531f1aa3e623b062d3c9b

骑行记录表优化和导出

 server/platform/src/main/java/com/doumee/api/business/MemberRidesController.java

@@ -6,9 +6,12 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.vo.GoodsorderExportVO;
import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MemberRidesQuery;
import com.doumee.service.business.MemberRidesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -83,6 +86,19 @@
        ExcelExporter.build(MemberRidesDTO.class).export(memberRidesService.findPage(pageWrap).getRecords(), "用户骑行记录表", response);
    }

    @ApiOperation("用户骑行记录导出excel")
    @PostMapping("/exportMemberRidesExcel")
    @RequiresPermissions("business:memberrides:exportExcel")
    public void exportMemberRidesExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(MemberRidesDTO.class).exportWithFirstAndEnd(memberRidesService.findPage(pageWrap).getRecords(),"用户骑行记录_"+System.currentTimeMillis(),"用户骑行记录_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
    }
    @ApiOperation("车辆取还记录导出excel")
    @PostMapping("/exportBikeLogExcel")
    @RequiresPermissions("business:memberrides:exportExcel")
    public void exportBikeLogExcel (@RequestBody PageWrap<MemberRidesQuery> pageWrap, HttpServletResponse response) {
        ExcelExporter.build(BikeLogDTO.class).exportWithFirstAndEnd(memberRidesService.findBikeLog(pageWrap).getRecords(),"车辆取还记录_"+System.currentTimeMillis(),"车辆取还记录_"+ DateUtil.getPlusTime2(DateUtil.getCurrentDate()),null, response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @RequiresPermissions("business:memberrides:query")

 server/services/src/main/java/com/doumee/dao/business/model/MemberRides.java

@@ -6,6 +6,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.poi.ss.usermodel.HorizontalAlignment;

import java.util.Date;
import java.math.BigDecimal;

@@ -20,168 +22,134 @@
public class MemberRides {

    @ApiModelProperty(value = "编码")
    @ExcelColumn(name="编码")
    private String id;

    @ApiModelProperty(value = "创建时间")
    @ExcelColumn(name="创建时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    private Date createDate;

    @ApiModelProperty(value = "创建人")
    @ExcelColumn(name="创建人")
    private String creator;

    @ApiModelProperty(value = "编辑时间")
    @ExcelColumn(name="编辑时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    private Date editDate;

    @ApiModelProperty(value = "编辑人")
    @ExcelColumn(name="编辑人")
    private String editor;

    @ApiModelProperty(value = "是否已删除 0未删除 1已删除")
    @ExcelColumn(name="是否已删除 0未删除 1已删除")
    @TableLogic
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="备注")
    private String info;

    @ApiModelProperty(value = "用户编码")
    @ExcelColumn(name="用户编码")
    private String memberId;

    @ApiModelProperty(value = "用户OpenId")
    @ExcelColumn(name="用户OpenId")
    @ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    @TableField(exist = false)
    private String memberOpenid;


    @ApiModelProperty(value = "车辆编码")
    @ExcelColumn(name="车辆编码")
    @ExcelColumn(name="车辆编码",index = 2,width = 10,align = HorizontalAlignment.CENTER)
    private String bikeCode;

    @ApiModelProperty(value = "当前账户余额")
    @ExcelColumn(name="当前账户余额")
    private BigDecimal balance;

    @ApiModelProperty(value = "车辆类型编码")
    @ExcelColumn(name="车辆类型编码")
    private String paramId;

    @ApiModelProperty(value = "车辆类型名称")
    @ExcelColumn(name="车辆类型名称")
    @ExcelColumn(name="车辆类型",index = 3,width = 10,align = HorizontalAlignment.CENTER)
    @TableField(exist = false)
    private String paramName;

    @ApiModelProperty(value = "租车站点编码")
    @ExcelColumn(name="租车站点编码")
    @ExcelColumn(name="租车站点",index = 4,width = 10,align = HorizontalAlignment.CENTER)
    private String rentSiteId;

    @ApiModelProperty(value = "租车锁头编码")
    @ExcelColumn(name="租车锁头编码")
    @ExcelColumn(name="租车锁具",index = 5,width = 10,align = HorizontalAlignment.CENTER)
    private String rentLockId;

    @ApiModelProperty(value = "租车时间")
    @ExcelColumn(name="租车时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    @ExcelColumn(name="租车时间",index = 6,width = 10,align = HorizontalAlignment.CENTER)
    private Date rentDate;

    @ApiModelProperty(value = "租车指令编码")
    @ExcelColumn(name="租车指令编码")
    private String rentCommondD;

    @ApiModelProperty(value = "还车站点编码")
    @ExcelColumn(name="还车站点编码")
    @ExcelColumn(name="归还站点",index = 7,width = 10,align = HorizontalAlignment.CENTER)
    private String backSiteId;

    @ApiModelProperty(value = "还车锁头编码")
    @ExcelColumn(name="还车锁头编码")
    @ExcelColumn(name="归还锁具",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private String backLockId;

    @ApiModelProperty(value = "还车时间")
    @ExcelColumn(name="还车时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    @ExcelColumn(name="归还时间",index = 9,width = 10,align = HorizontalAlignment.CENTER))
    private Date backDate;

    @ApiModelProperty(value = "还车指令编码")
    @ExcelColumn(name="还车指令编码")
    private String backCommondId;

    @ApiModelProperty(value = "起步价")
    @ExcelColumn(name="起步价")
    private BigDecimal basePrice;

    @ApiModelProperty(value = "起步价时间")
    @ExcelColumn(name="起步价时间")
    private Integer baseTime;

    @ApiModelProperty(value = "超出单价")
    @ExcelColumn(name="超出单价")
    private BigDecimal unitPrice;

    @ApiModelProperty(value = "超出时间单位")
    @ExcelColumn(name="超出时间单位")
    private Integer unitTime;

    @ApiModelProperty(value = "骑行价格")
    @ExcelColumn(name="骑行价格")
    private BigDecimal price;

    @ApiModelProperty(value = "骑行实际价格")
    @ExcelColumn(name="骑行实际价格")
    private BigDecimal actualPrice;

    @ApiModelProperty(value = "骑行计费时长")
    @ExcelColumn(name="骑行计费时长")
//    @ExcelColumn(name="骑行计费时长",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    private Integer duration;

    @ApiModelProperty(value = "结算时间")
    @ExcelColumn(name="结算时间")
    //@JsonFormat(pattern = "yyyy-MM-dd")
    private Date closeDate;

    @ApiModelProperty(value = "结算状态 0未结算 1已结束")
    @ExcelColumn(name="结算状态 0未结算 1已结束")
    private Integer closeStatus;

    @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车  3开锁失败")
    private Integer status;
    @ApiModelProperty(value = "关联订单编码(关联goodsorder）")
    @ExcelColumn(name="关联订单编码(关联goodsorder）")
    private String ordreId;

    @ApiModelProperty(value = "是否结算计费车型 0否 1是")
    @ExcelColumn(name="是否结算计费车型 0否 1是")
    private Integer isStandard;

    @ApiModelProperty(value = "计价方案编码(关联pricing_detail)")
    @ExcelColumn(name="计价方案编码(关联pricing_detail)")
    private String pricingDetailId;

    @ApiModelProperty(value = "是否节假日 0不是 1是")
    @ExcelColumn(name="是否节假日 0不是 1是")
    private String isHoliday;

    @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车  3开锁失败")
    @ExcelColumn(name="状态 0请求开锁中 1骑行中 2已还车  3开锁失败")
    private Integer status;

    @ApiModelProperty(value = "还车类型 0正常还车 1强制还车")
    @ExcelColumn(name="还车类型 0正常还车 1强制还车")
    private Integer backType;

    @ApiModelProperty(value = "还车原因")
    @ExcelColumn(name="还车原因")
    private String backReason;

    @ApiModelProperty(value = "还车备注")
    @ExcelColumn(name="还车备注")
    private String backInfo;

    @ApiModelProperty(value = "强制还车操作人(关联system_user)")
    @ExcelColumn(name="强制还车操作人(关联system_user)")
    private String backUserid;

}

 server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
package com.doumee.dao.business.web.request;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;

import java.util.Date;

/**
 * @author T14
 */
@Data
@ApiModel("取车还车记录请求参数")
public class MemberRidesQuery {

    @ApiModelProperty(value = "用户OpenID")
    @ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    private String openid;

    @ApiModelProperty(value = "车辆编号")
    @ExcelColumn(name="车辆编号",index = 2,width = 10,align = HorizontalAlignment.CENTER)
    private String bikeCode;

    @ApiModelProperty(value = "结算状态 0未结算 1已结束")
    @ExcelColumn(name="结算状态 ", valueMapping = "0=未结算;1=已结算;" ,index = 3,width = 10,align = HorizontalAlignment.CENTER)
    private Integer closeStatus;

    @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车  3开锁失败")
    @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
    private Integer status;

    @ApiModelProperty(value = "借出时间起始")
    private Date rentDateStart;

    @ApiModelProperty(value = "借出时间结束")
    private Date rentDateEnd;

    @ApiModelProperty(value = "是否归还 [车辆取还记录(站点) å…¥å‚]")
    private Boolean hasBack;
}

 server/services/src/main/java/com/doumee/dao/business/web/response/BikeLogDTO.java

@@ -3,6 +3,7 @@
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;

import java.util.Date;

@@ -13,44 +14,42 @@
public class BikeLogDTO {

    @ApiModelProperty(value = "用户OpenID")
    @ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    private String openid;

    @ApiModelProperty(value = "车辆编号")
    @ExcelColumn(name="车辆编号",index = 2,width = 10,align = HorizontalAlignment.CENTER)
    private String bikeCode;

    @ApiModelProperty(value = "车辆类型")
    @ExcelColumn(name="车辆类型",index = 3,width = 10,align = HorizontalAlignment.CENTER)
    private String bikeType;

    @ApiModelProperty(value = "租车站点编码")
    @ExcelColumn(name="借出站点",index = 4,width = 10,align = HorizontalAlignment.CENTER)
    private String rentSiteId;

    @ApiModelProperty(value = "租车站点编码")
    private String rentSiteName;

    @ApiModelProperty(value = "租车锁头编码")
    @ExcelColumn(name="借出锁具",index = 6,width = 10,align = HorizontalAlignment.CENTER)
    private String rentLockId;

    @ApiModelProperty(value = "租车锁头编码")
    private String rentLockName;

    @ApiModelProperty(value = "骑行时长")
    @ExcelColumn(name="骑行时长",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private Integer rideTime;

    @ApiModelProperty(value = "租车时间")
    @ApiModelProperty(value = "借出时间")
    @ExcelColumn(name="借出时间",index = 9,width = 10,align = HorizontalAlignment.CENTER)
    private Date rentDate;

    @ApiModelProperty(value = "还车站点编码")
    @ApiModelProperty(value = "还车站点")
    @ExcelColumn(name="归还站点",index = 10,width = 10,align = HorizontalAlignment.CENTER)
    private String backSiteId;

    @ApiModelProperty(value = "还车站点编码")
    private String backSiteName;

    @ApiModelProperty(value = "还车锁头编码")
    @ExcelColumn(name="归还锁具",index = 12,width = 10,align = HorizontalAlignment.CENTER)
    private String backLockId;

    @ApiModelProperty(value = "还车锁头编码")
    private String backLockName;

    @ApiModelProperty(value = "还车时间")
    @ExcelColumn(name="还车时间",index = 14,width = 10,align = HorizontalAlignment.CENTER)
    private Date backDate;
}

 server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesDTO.java

@@ -1,8 +1,10 @@
package com.doumee.dao.business.web.response;

import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;

import java.util.Date;

@@ -10,32 +12,42 @@
 * @author T14
 */
@Data
@ApiModel("骑行记录返回")
public class MemberRidesDTO {

    @ApiModelProperty(value = "用户OpenID")
    @ExcelColumn(name="用户",index = 1,width = 10,align = HorizontalAlignment.CENTER)
    private String openid;

    @ApiModelProperty(value = "车辆编号")
    @ExcelColumn(name="车辆编号",index = 2,width = 10,align = HorizontalAlignment.CENTER)
    private String bikeCode;

    @ApiModelProperty(value = "是否结算")
    private Integer status;

    @ApiModelProperty(value = "车辆类型")
    @ExcelColumn(name="车辆类型")
    @ExcelColumn(name="车辆类型",index = 3,width = 10,align = HorizontalAlignment.CENTER)
    private String bikeType;

    @ExcelColumn(name="结算状态 ", valueMapping = "0=未结算;1=已结算;" ,index = 4,width = 10,align = HorizontalAlignment.CENTER)
    private Integer closeStatus;

    @ApiModelProperty(value = "状态 0请求开锁中 1骑行中 2已还车  3开锁失败")
    @ExcelColumn(name="状态 ", valueMapping = "0=请求开锁中;1=骑行中;2=已还车;3=开锁失败;" ,index = 5,width = 10,align = HorizontalAlignment.CENTER)
    private Integer status;

    @ApiModelProperty(value = "骑行时长")
    @ExcelColumn(name="骑行时长（分)",index = 6,width = 10,align = HorizontalAlignment.CENTER)
    private Integer rideTime;

    @ApiModelProperty(value = "计费时长")
    @ExcelColumn(name="计费时长（分)",index = 7,width = 10,align = HorizontalAlignment.CENTER)
    private Integer duration;

    @ApiModelProperty(value = "租车时间")
    @ApiModelProperty(value = "租车时间"))
    @ExcelColumn(name="租车时间",index = 8,width = 10,align = HorizontalAlignment.CENTER)
    private Date rentDate;

    @ApiModelProperty(value = "还车时间")
    @ExcelColumn(name="还车时间")
    @ExcelColumn(name="还车时间",index = 9,width = 10,align = HorizontalAlignment.CENTER)
    private Date backDate;

}

 server/services/src/main/java/com/doumee/dao/business/web/response/MemberRidesQuery.java

ÎļþÒÑɾ³ý

 server/services/src/main/java/com/doumee/service/business/MemberRidesService.java

@@ -3,9 +3,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MemberRidesQuery;

import java.util.List;


 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java

@@ -1,9 +1,6 @@
package com.doumee.service.business.impl;

import com.doumee.core.constants.Constants;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.DateUtil;
@@ -14,9 +11,9 @@
import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MemberRidesQuery;
import com.doumee.service.business.DeviceService;
import com.doumee.service.business.MemberRidesService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -107,35 +104,15 @@
        return memberRidesMapper.selectList(wrapper);
    }

    /**
     *
     * @param pageWrap åˆ†é¡µå¯¹è±¡
     * @return
     */
    @Override
    public PageData<MemberRidesDTO> findPage(PageWrap<MemberRidesQuery> pageWrap) {
        IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.orderByDesc(MemberRides::getCreateDate);
        queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
                    .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                    .leftJoin(Goodsorder.class,Goodsorder::getId,MemberRides::getOrdreId)
                    .eq(BaseParam::getType, Constants.THREE)
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
                    .like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),MemberRides::getBikeCode,pageWrap.getModel().getBikeCode())
                    .between((Objects.nonNull(pageWrap.getModel().getRentDateStart())&&Objects.nonNull(pageWrap.getModel().getRentDateEnd())),
                            MemberRides::getRentDate,
                            pageWrap.getModel().getRentDateStart(),pageWrap.getModel().getRentDateEnd());
        if (Objects.nonNull(pageWrap.getModel().getStatus())
                && Constants.GOODSORDER_STATUS.CLOSE.getKey().equals(pageWrap.getModel().getStatus())){
            queryWrapper.eq(Goodsorder::getStatus,pageWrap.getModel().getStatus());
        }else if (Objects.nonNull(pageWrap.getModel().getStatus())
                && !Constants.GOODSORDER_STATUS.CLOSE.getKey().equals(pageWrap.getModel().getStatus())){
            queryWrapper.ne(Goodsorder::getStatus,pageWrap.getModel().getStatus());
        }
        queryWrapper.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
                    .selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
                    .selectAs(Goodsorder::getStatus,MemberRidesDTO::getStatus)
                    .selectAs(BaseParam::getName,MemberRidesDTO::getBikeType)
                    .selectAs(MemberRides::getDuration,MemberRidesDTO::getDuration)
                    .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
                    .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
        MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        IPage<MemberRidesDTO> memberRidesDTOIPage = memberRidesJoinMapper.selectJoinPage(page, MemberRidesDTO.class, queryWrapper);
        if (!CollectionUtils.isEmpty(memberRidesDTOIPage.getRecords())){
            memberRidesDTOIPage.getRecords().forEach(s->{
@@ -153,41 +130,11 @@
        return memberRidesMapper.selectCount(wrapper);
    }


    @Override
    public PageData<BikeLogDTO> findBikeLog(PageWrap<MemberRidesQuery> pageWrap) {

        IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.orderByDesc(MemberRides::getCreateDate);
        queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
                .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                .eq(BaseParam::getType, Constants.THREE)
                .like(StringUtils.isNotBlank(pageWrap.getModel().getOpenid()),Member::getOpenid,pageWrap.getModel().getOpenid())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),MemberRides::getBikeCode,pageWrap.getModel().getBikeCode())
                .between((Objects.nonNull(pageWrap.getModel().getRentDateStart())&&Objects.nonNull(pageWrap.getModel().getRentDateEnd())),
                        MemberRides::getRentDate,
                        pageWrap.getModel().getRentDateStart(),pageWrap.getModel().getRentDateEnd());
        if (Objects.nonNull(pageWrap.getModel().getHasBack())
                && pageWrap.getModel().getHasBack()){
            queryWrapper.isNotNull(MemberRides::getBackDate);
        }else if (Objects.nonNull(pageWrap.getModel().getStatus())
                && !pageWrap.getModel().getHasBack()){
            queryWrapper.isNull(MemberRides::getBackDate);
        }
        queryWrapper.orderByDesc(MemberRides::getCreateDate);
        queryWrapper.leftJoin("locks rl on rl.id = t.rent_lock_id and rl.site_id = t.rent_site_id")
                    .leftJoin("sites rs on rs.id = rl.site_id")
                    .leftJoin("locks bl on bl.id = t.rent_lock_id and bl.site_id = t.rent_site_id")
                    .leftJoin("sites bs on bs.id = rl.site_id");
        queryWrapper.selectAs(Member::getOpenid,BikeLogDTO::getOpenid)
                .selectAs(MemberRides::getBikeCode,BikeLogDTO::getBikeCode)
                .selectAs(BaseParam::getName,BikeLogDTO::getBikeType)
                .selectAs(MemberRides::getRentDate,BikeLogDTO::getRentDate)
                .selectAs(MemberRides::getBackDate,BikeLogDTO::getBackDate)
                .select("rs.Name as rentSiteName, rl.name as rentLockName")
                .select("bs.Name as backSiteName, bl.name as backLockName");

        MPJLambdaWrapper<MemberRides> queryWrapper = initQueryParamByModel(pageWrap.getModel());
        IPage<BikeLogDTO> bikeLogDTOIPage = memberRidesJoinMapper.selectJoinPage(page, BikeLogDTO.class, queryWrapper);
        if (!CollectionUtils.isEmpty(bikeLogDTOIPage.getRecords())){
            bikeLogDTOIPage.getRecords().forEach(s->{
@@ -199,6 +146,29 @@
        return PageData.from(bikeLogDTOIPage);
    }

    private MPJLambdaWrapper<MemberRides> initQueryParamByModel(MemberRidesQuery model) {
        MPJLambdaWrapper<MemberRides> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(model);
        queryWrapper.orderByDesc(MemberRides::getCreateDate);
        queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId)
                .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                .eq(BaseParam::getType, Constants.THREE)
                .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
                .like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
        queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
        queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
        queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
        queryWrapper.selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
                .selectAs(MemberRides::getBikeCode,MemberRidesDTO::getBikeCode)
                .selectAs(MemberRides::getCloseStatus,MemberRidesDTO::getCloseStatus)
                .selectAs(MemberRides::getStatus,MemberRidesDTO::getStatus)
                .selectAs(BaseParam::getName,MemberRidesDTO::getBikeType)
                .selectAs(MemberRides::getDuration,MemberRidesDTO::getDuration)
                .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
                .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
        return queryWrapper;
    }

    @Override
    public String getOnlineBike(String memberId){
        MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()