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

jiangping

2025-03-18 1b0cf0db5c82ea8308d2f338973a91555787c34d

 server/services/src/main/java/com/doumee/service/business/MemberRidesService.java

@@ -2,10 +2,13 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.web.request.MemberRidesQuery;
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.dao.business.web.response.MemberRidesQuery;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;

import java.util.List;

@@ -99,7 +102,7 @@
     */
    long count(MemberRides memberRides);


    MemberRides findJoinById(String id);
    /**
     * 分页查询
     *
@@ -113,6 +116,29 @@
     * @param memberId
     * @return
     */
    String getOnlineBike(String memberId);
    MemberRides getOnlineBike(String memberId);

    /**
     * 扫码解锁
     * @param code
     * @param memberId
     * @return
     */
    MemberRidesDetailResponse openLock(String code, String memberId);

    /**
     * 刷新解锁情况
     * @param id
     * @return
     */
    MemberRidesDetailResponse refreshLock(String id);
    void updateDuration(MemberRides memberRides);

    void forceBack(MemberRides memberRides);

    int mqttCloseBikeEvent(MemberRides bikes);

    int mqttLockInfoEvent(Locks locks);

    void autoRefreshLockStatus();
}