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

jiaosong

2023-10-18 457ffacdf3c34e6da715d1588df8d835535e3b98

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

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

@@ -337,7 +337,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));
        List<SystemDictData> systemDictData = systemDictDataMapper.selectList(wrapper);
        Map<String, SystemDictData> collect = systemDictData.stream().collect(Collectors.toMap(s -> s.getLabel(), s -> s));

@@ -606,6 +606,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());
@@ -654,6 +655,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);