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

jiangping

2025-02-28 69283b5a4559509187516355602e32e4bdac9d5d

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

@@ -181,6 +181,7 @@
    public ApiResponse<PageData<Discount>> discountPage (@RequestBody PageWrap<Discount> pageWrap) {
        Discount discount = new Discount();
        discount.setStatus(Constants.ZERO);
        discount.setMinShow(Constants.ZERO);
        pageWrap.setModel(discount);
        return ApiResponse.success(discountService.findPage(pageWrap));
    }
@@ -326,10 +327,9 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse openElecBike(@RequestBody OpenElecBikeRequest param) {
    public ApiResponse<MemberRidesDetailResponse> openElecBike(@RequestBody OpenElecBikeRequest param) {
        param.setMemberId(getMemberId());
        jtt808Service.openLock(param);
        return  ApiResponse.success( null);
        return  ApiResponse.success(jtt808Service.openLock(param));
    }

    @LoginRequired
@@ -344,5 +344,10 @@
        return  ApiResponse.success( null);
    }


    @ApiOperation(value = "强制还车", notes = "强制还车")
    @PostMapping("/forceBack")
    public ApiResponse forceBack(@RequestBody Goodsorder goodsorder) {
        jtt808Service.forceBack(goodsorder.getId());
        return  ApiResponse.success( null);
    }
}