骑行时长减免和强制还车

jiangping

2023-10-10 d07f43ac85889efc0a4e8e465b9b6777b24da192

骑行时长减免和强制还车

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

@@ -101,5 +101,8 @@
    @ApiModelProperty(value = "操作结果 0成功 1失败", example = "1")
    @ExcelColumn(name="操作结果 0成功 1失败")
    private Integer result;
    @ApiModelProperty(value = "操作结果 0成功 1失败", example = "1")
    @ExcelColumn(name="操作结果 0成功 1失败")
    private Integer result;

}

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

@@ -61,7 +61,7 @@

    @ApiModelProperty(value = "可退金额", example = "1")
    @ExcelColumn(name="可退回押金（元）" )
    private BigDecimal canBanlance;
    private BigDecimal canBalance;

    @ApiModelProperty(value = "交易金额", example = "1")
    @ExcelColumn(name="交易金额")

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

@@ -218,11 +218,11 @@
            throw  new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"对不起，只能针对已还车且未结算的数据进行操作！" );
        }
        if(Constants.formatIntegerNum(memberRides.getDuration()) == Constants.formatIntegerNum(model.getDuration())){
            throw  new BusinessException( ResponseStatus.BAD_REQUEST.getCode(),"对不起，！" );
            throw  new BusinessException( ResponseStatus.BAD_REQUEST.getCode(),"对不起，时长未发生改变，无需修改！" );
        }
        int actTime =  DateUtil.betweenMin(model.getRentDate(), model.getBackDate());
        if(memberRides.getDuration() > actTime){

            throw  new BusinessException( ResponseStatus.BAD_REQUEST.getCode(),"对不起，计费时长不能超过实际借出时长！" );
        }
        MemberRides update = new MemberRides();
        update.setId(model.getId());

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

@@ -127,7 +127,7 @@
                vo.setOpenid(order.getOpenid());
                vo.setDoneDate(order.getDoneDate());
                vo.setMoney(Constants.formatDecimalNum(order.getMoney()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
                vo.setCanBanlance(Constants.formatDecimalNum(order.getCanBanlance()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
                vo.setCanBanlance(Constants.formatDecimalNum(order.getCanBalance()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_UP));
                vo.setOnlineOrderid(order.getOnlineOrderid());
                vo.setPayOnlineOrderid(order.getPayOnlineOrderid());
                vo.setCreatorName(order.getCreatorName());