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

jiaosong

2023-10-16 aa6febca297b0e1a68b1877fc9f41885e9fc0c7a

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

@@ -2,10 +2,12 @@

import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
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.MemberRidesDetailResponse;

import java.util.List;

@@ -115,7 +117,25 @@
     */
    String 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);
}