Merge remote-tracking branch 'origin/dev' into dev

k94314517

2023-10-24 be4bfd2dac75cf4249ef30f85c4fbb07d0dcc67f

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

@@ -273,7 +273,7 @@
            throw  new BusinessException( ResponseStatus.DATA_EMPTY );
        }
        if(Constants.formatIntegerNum(model.getStatus()) != Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()||
        Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ONE){
        Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ZERO){
            throw  new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"对不起，只能针对已还车且未结算的数据进行操作！" );
        }
        if(Constants.formatIntegerNum(memberRides.getDuration()) == Constants.formatIntegerNum(model.getDuration())){
@@ -299,17 +299,17 @@
        log.setActInfo(memberRides.getBackInfo());
        log.setActReason(memberRides.getBackReason());
        log.setIsdeleted(Constants.ZERO);
        log.setCreateDate(update.getBackDate());
        log.setCreateDate(new Date());
        log.setCreator(user.getId());
        log.setBeforeContent(beforeContent);
        log.setAfterContent(after);
        log.setUserId(user.getId());
        log.setUserType(Constants.ONE);
        log.setParam(JSONObject.toJSONString(memberRides ));
        log.setType(Constants.ActionLogObjType.memberrides);
        log.setObjType(Constants.ActionLogObjType.memberrides);
        log.setResult(Constants.ZERO);
        log.setObjId(model.getId());
        log.setObjType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
        log.setType(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getKey());
        log.setContent(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getInfo());
        log.setTitle(Constants.ACTIONLOG_TYPE.UPDATE_DURATION.getName());
        //记录操作日志
@@ -357,7 +357,8 @@
        Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
        Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
        //计算骑行计费时长
        update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
        update.setDuration( rideTime > freeRentTime  ? rideTime : 0 );
        //update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
        memberRidesMapper.updateById(update);
        //修改前
        String beforeContent = JSONObject.toJSONString(model);
@@ -382,17 +383,17 @@
        ActionLog log = new ActionLog();
        log.setId(Constants.getUUID());
        log.setIsdeleted(Constants.ZERO);
        log.setCreateDate(update.getBackDate());
        log.setCreateDate(new Date());
        log.setCreator(user.getId());
        log.setBeforeContent(beforeContent);
        log.setAfterContent(after);
        log.setUserId(user.getId());
        log.setUserType(Constants.ONE);
        log.setParam(JSONObject.toJSONString(memberRides ));
        log.setType(Constants.ActionLogObjType.memberrides);
        log.setObjType(Constants.ActionLogObjType.memberrides);
        log.setResult(Constants.ZERO);
        log.setObjId(model.getId());
        log.setObjType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
        log.setType(Constants.ACTIONLOG_TYPE.FORCE_BACK.getKey());
        log.setContent(Constants.ACTIONLOG_TYPE.FORCE_BACK.getInfo());
        log.setTitle(Constants.ACTIONLOG_TYPE.FORCE_BACK.getName());
        log.setActInfo(memberRides.getBackInfo());