#车型序号内置

jiaosong

2023-10-17 e24375b5bde4ddfb55a520f104fb6136e456522e

#车型序号内置

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

@@ -58,4 +58,13 @@

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


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

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

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

@@ -116,8 +116,8 @@
        MPJLambdaWrapper<BikeRepair> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.leftJoin(Member.class,Member::getId,BikeRepair::getMemberId)
                    .leftJoin(Bikes.class,Bikes::getId,BikeRepair::getBinkeId)
                    .leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId);
                    .leftJoin(Bikes.class,Bikes::getCode,BikeRepair::getBinkeId)
                    .leftJoin(BaseParam.class,BaseParam::getId,BikeRepair::getTypeId);
        queryWrapper.selectAll(BikeRepair.class)
                    .selectAs(Member::getOpenid,BikeRepairDTO::getOpenid)
                    .selectAs(Bikes::getCode,BikeRepairDTO::getBikeCode)

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

@@ -514,6 +514,8 @@
            refundDTO.setReason(reason);
            refundDTO.setType(Constants.REFUND_TYPE.BACK.getKey());
            Refund refund = wxMiniUtilService.wxRefund(refundDTO);
        }else {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"退款金额不允许超过"+canBalance);
        }
    }


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

@@ -221,6 +221,8 @@
        queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
        queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
        queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
        queryWrapper.in(MemberRides::getStatus,
                Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
        queryWrapper
                .selectAs(MemberRides::getId,MemberRidesDTO::getId)
                .selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
@@ -232,7 +234,9 @@
                .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
                .selectAs(MemberRides::getRentLockId,MemberRidesDTO::getRentLockId)
                .selectAs(MemberRides::getRentSiteId,MemberRidesDTO::getRentSiteId)
                .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
                .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate)
                .selectAs(MemberRides::getBackSiteId,MemberRidesDTO::getBackSiteId)
                .selectAs(MemberRides::getBackLockId,MemberRidesDTO::getBackLockId);
        return queryWrapper;
    }