# 财务管理 修改

jiaosong

2023-10-24 1a11e4022a6b53a82bb45cda009ae653cdb55ab2

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

@@ -220,7 +220,9 @@
        queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
        queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
        queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
        queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
        queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
//        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()));
        queryWrapper
@@ -271,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())){
@@ -304,12 +306,13 @@
        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());
        log.setActInfo(memberRides.getInfo());
        //记录操作日志
        actionLogMapper.insert(log);

@@ -336,7 +339,7 @@
        }
        QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .eq(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK));
                .in(SystemDictData::getLabel, Arrays.asList(Constants.FORCE_BACK_SITE,Constants.FORCE_BACK_LOCK,Constants.FREE_RENT_TIME));
        List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
        Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));

@@ -352,8 +355,11 @@
        update.setStatus(Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey());
        update.setBackSiteId(collect.get(Constants.FORCE_BACK_SITE).getCode());
        update.setBackLockId(collect.get(Constants.FORCE_BACK_LOCK).getCode());
        Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
        Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
        //计算骑行计费时长
        update.setDuration(DateUtil.betweenMin(model.getRentDate(), update.getBackDate()));
        update.setDuration( rideTime > freeRentTime  ? rideTime : 0 );
        //update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
        memberRidesMapper.updateById(update);
        //修改前
        String beforeContent = JSONObject.toJSONString(model);
@@ -385,14 +391,15 @@
        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());
        log.setActReason(memberRides.getBackReason());
        log.setActInfo(memberRides.getInfo());
        //记录操作日志
        actionLogMapper.insert(log);

@@ -605,6 +612,7 @@
            bikes.setId(Constants.getUUID());
            bikes.setIsdeleted(Constants.ZERO);
            bikes.setCreateDate(new Date());
            bikes.setEditDate(bikes.getCreateDate());
            bikes.setSiteId(model.getSiteId());
            bikes.setLockId(model.getCode());
            bikes.setCode(model.getBikeCode());
@@ -653,6 +661,7 @@
            sites.setCode(locks.getSiteId());
            sites.setId(locks.getSiteId());
            sites.setCreateDate(date);
            sites.setEditDate(date);
            sites.setStatus(Constants.ZERO);
            sites.setEditDate(date);
            sites.setLockNum(1);
@@ -724,7 +733,9 @@
        update.setBackLockId(param.getBackLockId());
        update.setBackSiteId(param.getBackSiteId());
        update.setBackCommondId(param.getBackCommondId());
        int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
//        int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
        int min = DateUtil.betweenMin(memberRides.getRentDate(),date);//实际骑行时间
        int duration = min>freeTime?min:0;
        update.setDuration(duration>0?duration:0);
        update.setBackType(Constants.ONE);
        update.setBackInfo("用户正常还车");