jiaosong
2023-10-18 b44832493c6d1f9db88e28e757be1e83846ed938
#单位提交 分转换元
已修改5个文件
14 ■■■■■ 文件已修改
server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/services/src/main/java/com/doumee/dao/business/web/request/BikeRepairDTO.java
@@ -15,6 +15,9 @@
@ApiModel("车辆问题上报信息列表")
public class BikeRepairDTO {
    @ApiModelProperty(value = "编码")
    private String id;
    @ApiModelProperty(value = "用户")
    private String openid;
server/services/src/main/java/com/doumee/dao/business/web/request/MemberRidesQuery.java
@@ -41,4 +41,7 @@
    private Boolean hasBack;
    @ApiModelProperty(value = "结算订单号")
    private String goodsorderId;
    @ApiModelProperty(value = "还车类型 0正常还车 1强制还车")
    private Integer backType;
}
server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java
@@ -62,6 +62,12 @@
    @ApiModelProperty("停止服务结束")
    private String stopServeEndtime = "";
    @ApiModelProperty("停止服务结束")
    private String leaseNotice = "";
    @ApiModelProperty("停止服务结束")
    private String leaseNoticeUrl = "";
    /**
     * 对象驼峰属性转下划线
     * @param object
server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java
@@ -115,6 +115,7 @@
        updateWrapper
                .lambda()
                .eq(BaseParam::getId,baseParam.getId())
                .set(BaseParam::getRequired,baseParam.getRequired())
                .set(BaseParam::getName,baseParam.getName())
                .set(BaseParam::getSortnum,baseParam.getSortnum())
                .set(BaseParam::getEditDate,new Date())
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -221,6 +221,7 @@
        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.eq(model.getGoodsorderId()!=null,MemberRides::getStatus, model.getStatus());
        queryWrapper.eq(MemberRides::getBackType, Constants.ZERO);
        queryWrapper.in(MemberRides::getStatus,
                Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));