111

k94314517

2023-10-17 1e22fd4f9b5e1e6beb95d68a74c0311f2300762a

111

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

@@ -108,4 +108,9 @@
    @ExcelColumn(name="用户编码（关联member表）")
    private String memberId;

    @ApiModelProperty(value = "车辆类型编码（关联base_param)")
    @ExcelColumn(name="车辆类型编码（关联base_param)")
    private String typeId;


}

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

@@ -25,6 +25,9 @@
    @ApiModelProperty(value = "车辆编码")
    private String bikeCode;

    @ApiModelProperty(value = "车辆类型编码（关联base_param)")
    private String typeId;

    @ApiModelProperty(value = "经度", example = "1")
    private BigDecimal longitude;


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

@@ -29,6 +29,12 @@
    @ApiModelProperty(value = "骑行结束时间")
    private Date rideEndTime;

    @ApiModelProperty(value = "骑行开始时间-短时间")
    private String rideStartTimeStr;

    @ApiModelProperty(value = "骑行结束时间-短时间")
    private String rideEndTimeStr;

    @ApiModelProperty(value = "骑行时长")
    private Integer rideTime;


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

@@ -2,6 +2,7 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.web.request.MemberRidesQuery;
@@ -115,7 +116,7 @@
     * @param memberId
     * @return
     */
    String getOnlineBike(String memberId);
    MemberRides getOnlineBike(String memberId);

    /**
     * 扫码解锁

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

@@ -165,6 +165,7 @@
        BeanUtils.copyProperties(repairRequest,bikeRepair);
        bikeRepair.setCreateDate(new Date());
        bikeRepair.setIsdeleted(Constants.ZERO);
        bikeRepair.setStatus(Constants.ZERO);
        bikeRepair.setId(Constants.getUUID());
        bikeRepairMapper.insert(bikeRepair);
        //处理附件信息

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

@@ -288,8 +288,10 @@
                }
                memberRidesResponse.setRideId(memberRides.getId());
                memberRidesResponse.setRideStartTime(memberRides.getRentDate());
                memberRidesResponse.setRideStartTimeStr(DateUtil.DateToStr(memberRides.getRentDate(),"HH:mm"));
                memberRidesResponse.setRideEndTime(memberRides.getBackDate());
                memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRidesResponse.getRideStartTime(),memberRidesResponse.getRideEndTime()));
                memberRidesResponse.setRideEndTimeStr(DateUtil.DateToStr(memberRides.getBackDate(),"HH:mm"));
                memberRidesResponse.setRideTime(DateUtil.betweenMin(memberRides.getRentDate(),memberRides.getBackDate()));
                memberRidesResponse.setBikeCode(memberRides.getBikeCode());
                memberRidesResponse.setBasePrice(memberRides.getBasePrice());
                memberRidesResponse.setBaseTime(memberRides.getBaseTime());

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

@@ -237,7 +237,7 @@
    }

    @Override
    public String getOnlineBike(String memberId){
    public MemberRides getOnlineBike(String memberId){
        MemberRides memberRides = memberRidesMapper.selectOne(new QueryWrapper<MemberRides>()
                .eq("isdeleted", Constants.ZERO)
                .eq("member_id",memberId)
@@ -247,7 +247,7 @@
        if(Objects.isNull(memberRides)){
            return null;
        }
        return memberRides.getBikeCode();
        return memberRides;
    }

    /**

 server/web/src/main/java/com/doumee/api/web/AccountApi.java

@@ -67,7 +67,7 @@


    public static void main(String[] args) {
        JwtPayLoad payLoad = new JwtPayLoad("07a9f07178864e57bf1fb34e7a321f08");
        JwtPayLoad payLoad = new JwtPayLoad("d0a92489d26d43e182a1b8b75e1d9836");
        System.out.println(JwtTokenUtil.generateToken(payLoad));
    }


 server/web/src/main/java/com/doumee/api/web/BusinessApi.java

@@ -7,10 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.BaseParam;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.model.RentSite;
import com.doumee.dao.business.model.Transactions;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
@@ -130,7 +127,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<String> onlineBike() {
    public ApiResponse<MemberRides> onlineBike() {
        return  ApiResponse.success("查询成功",memberRidesService.getOnlineBike(getMemberId()));
    }