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

jiaosong

2023-10-25 cc3bbf14c5fde619c23e5502c8583889e94deacc

 server/web/src/main/java/com/doumee/api/web/BusinessApi.java

@@ -2,15 +2,13 @@

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.BaseParam;
import com.doumee.dao.business.model.MemberRides;
import com.doumee.dao.business.model.RentSite;
import com.doumee.dao.business.model.Transactions;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.request.RepairRequest;
import com.doumee.dao.business.web.response.MemberRidesDetailResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
@@ -130,7 +128,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<String> onlineBike() {
    public ApiResponse<MemberRides> onlineBike() {
        return  ApiResponse.success("查询成功",memberRidesService.getOnlineBike(getMemberId()));
    }

@@ -172,14 +170,14 @@


    @LoginRequired
    @PreventRepeat
    @ApiOperation(value = "订单结算", notes = "小程序端")
    @GetMapping("/goodsOrderSettlement")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "orderId", value = "订单主键", required = true)
    })
    public ApiResponse goodsOrderSettlement(@RequestParam String orderId) {
        goodsorderService.goodsOrderSettlement(orderId);
    public ApiResponse goodsOrderSettlement() {
        goodsorderService.goodsOrderSettlement(getMemberId());
        return  ApiResponse.success("操作成功");
    }