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

k94314517

2025-02-28 25908f5bd4a2dae4625b49d325525849feb676a4

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

@@ -73,6 +73,12 @@
    @Autowired
    private DiscountService discountService;

    @Autowired
    private SitesService  sitesService;

    @Autowired
    private BikesService bikesService;

    @PreventRepeat
    @LoginRequired
    @ApiOperation(value = "押金支付", notes = "小程序端")
@@ -93,7 +99,7 @@
            @ApiImplicitParam(paramType = "query", dataType = "String", name = "discountId", value = "套餐主键", required = true)
    })
    public ApiResponse<Object> createDiscountOrderPay(@RequestParam String discountId) {
        return  ApiResponse.success("操作成功",goodsorderService.createDiscountOrderPay(discountId,getMemberId()));
        return  ApiResponse.success("操作成功",goodsorderService.createDiscountOrderPay(getMemberId(),discountId));
    }


@@ -123,6 +129,38 @@
    }

    @LoginRequired
    @ApiOperation(value = "电动车站点列表", notes = "小程序端")
    @GetMapping("/eleSiteList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<List<Sites>> eleSiteList() {
        return  ApiResponse.success("查询成功",sitesService.getSiteList(Constants.ONE));
    }


    @LoginRequired
    @ApiOperation(value = "查询所有电动车信息", notes = "小程序端")
    @GetMapping("/eleBikeList")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<List<Bikes>> eleBikeList() {
        return  ApiResponse.success("查询成功",bikesService.getEleBikes());
    }


    @LoginRequired
    @ApiOperation(value = "获取电动车运营区域", notes = "小程序端")
    @GetMapping("/getEleBusinessArea")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<String> getEleBusinessArea() {
        return  ApiResponse.success("查询成功",systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.PARK_LAT_LNG_LIST).getCode());
    }

    @LoginRequired
    @ApiOperation("消费明细")
    @PostMapping("/transactionsPage")
    @ApiImplicitParams({
@@ -143,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));
    }
@@ -260,6 +299,9 @@
    @LoginRequired
    @ApiOperation(value = "电车站点还车", notes = "电车站点还车")
    @PostMapping("/backElecBike")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse backElecBike(@RequestBody BackElecBikeRequest param) {
        param.setMemberId(getMemberId());
        jtt808Service.backElecBike(param);
@@ -269,6 +311,9 @@
    @LoginRequired
    @ApiOperation(value = "电车临时停车", notes = "电车临时停车")
    @PostMapping("/pauseElecBike")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse pauseElecBike(@RequestBody BackElecBikeRequest param) {
        param.setMemberId(getMemberId());
        jtt808Service.pauseElecBike(param);
@@ -279,20 +324,30 @@
    @LoginRequired
    @ApiOperation(value = "电车开锁", notes = "电车开锁")
    @PostMapping("/openElecBike")
    public ApiResponse openElecBike(@RequestBody OpenElecBikeRequest param) {
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<MemberRidesDetailResponse> openElecBike(@RequestBody OpenElecBikeRequest param) {
        param.setMemberId(getMemberId());
        jtt808Service.openLock(param);
        return  ApiResponse.success( null);
        return  ApiResponse.success(jtt808Service.openLock(param));
    }

    @LoginRequired
    @ApiOperation(value = "临停开锁", notes = "临停开锁")
    @PostMapping("/pauseOpenElecBike")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse pauseOpenElecBike(@RequestBody BackElecBikeRequest param) {
        param.setMemberId(getMemberId());
        jtt808Service.pauseOpenElecBike(param);
        return  ApiResponse.success( null);
    }


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