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

jiaosong

2023-10-25 cc3bbf14c5fde619c23e5502c8583889e94deacc

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

@@ -217,8 +217,8 @@
                .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId)
                .like(StringUtils.isNotBlank(model.getOpenid()),Member::getOpenid,model.getOpenid())
                .like(StringUtils.isNotBlank(model.getBikeCode()),MemberRides::getBikeCode,model.getBikeCode());
        queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
        queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
        queryWrapper.ge(model.getStartDate()!=null, MemberRides::getRentDate,model.getStartDate());
        queryWrapper.le(model.getEndDate()!=null, MemberRides::getRentDate,model.getEndDate());
        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());
@@ -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());
        //记录操作日志
@@ -338,7 +338,7 @@
        }
        QueryWrapper<SystemDictData> wrapper = new QueryWrapper<>();
        wrapper.lambda()
                .in(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));

@@ -354,8 +354,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);
@@ -380,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());