111

k94314517

2025-07-19 99b600d34ee5e2d82eecc4df233c33ecd0e18841

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

@@ -9,10 +9,7 @@
import com.doumee.dao.business.model.IdentityInfo;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Orders;
import com.doumee.dao.dto.CommentDTO;
import com.doumee.dao.dto.ConfirmUpdOrderDTO;
import com.doumee.dao.dto.DoneOrderDTO;
import com.doumee.dao.dto.UpdOrderDataDTO;
import com.doumee.dao.dto.*;
import com.doumee.dao.vo.OrderReleaseVO;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberService;
@@ -65,9 +62,22 @@
    })
    public ApiResponse updateOrder(@RequestBody Orders orders) {
        orders.setMember(this.getMemberResponse());
        ordersService.updateById(orders);
        ordersService.update(orders);
        return  ApiResponse.success("操作成功");
    }


//    @LoginRequired
//    @ApiOperation(value = "修改订单日期 - 发单方", notes = "小程序端")
//    @PostMapping("/updOrderData")
//    @ApiImplicitParams({
//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
//    })
//    public ApiResponse updOrderData(@RequestBody UpdOrderDataDTO updOrderDataDTO) {
//        updOrderDataDTO.setMember(this.getMemberResponse());
//        ordersService.updOrderData(updOrderDataDTO);
//        return  ApiResponse.success("操作成功");
//    }

    @LoginRequired
    @ApiOperation(value = "手动接单 - 接单方", notes = "小程序端")
@@ -93,39 +103,17 @@

    @LoginRequired
    @ApiOperation(value = "取消订单 - 发单方", notes = "小程序端")
    @GetMapping("/releaseCancelOrder")
    @GetMapping("/cancelOrder")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse releaseCancelOrder(@RequestParam Integer orderId) {
        ordersService.releaseCancelOrder(orderId,this.getMemberResponse());
    public ApiResponse cancelOrder(@RequestParam Integer orderId) {
        ordersService.cancelOrder(orderId,this.getMemberResponse());
        return  ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation(value = "取消接单 - 接单方", notes = "小程序端")
    @GetMapping("/receiveCancelOrder")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse receiveCancelOrder(@RequestParam Integer orderId) {
        ordersService.receiveCancelOrder(orderId,this.getMemberResponse());
        return  ApiResponse.success("操作成功");
    }


    @LoginRequired
    @ApiOperation(value = "修改订单日期 - 发单方", notes = "小程序端")
    @PostMapping("/updOrderData")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse updOrderData(@RequestBody UpdOrderDataDTO updOrderDataDTO) {
        updOrderDataDTO.setMember(this.getMemberResponse());
        ordersService.updOrderData(updOrderDataDTO);
        return  ApiResponse.success("操作成功");
    }

    @LoginRequired
    @ApiOperation(value = "确认订单修改 - 接单方", notes = "小程序端")
@@ -145,9 +133,20 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<Object> doneOrder(@RequestBody DoneOrderDTO doneOrderDTO) {
    public ApiResponse<OrderReleaseVO> doneOrder(@RequestBody DoneOrderDTO doneOrderDTO) {
        doneOrderDTO.setMember(getMemberResponse());
        return  ApiResponse.success("操作成功",ordersService.doneOrder(doneOrderDTO));
    }

    @LoginRequired
    @ApiOperation(value = "订单重新支付 - 发单方", notes = "小程序端")
    @PostMapping("/reusePay")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<OrderReleaseVO> reusePay(@RequestBody ReusePayDTO reusePayDTO) {
        reusePayDTO.setMember(getMemberResponse());
        return  ApiResponse.success("操作成功",ordersService.reusePay(reusePayDTO));
    }


@@ -183,7 +182,7 @@
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<Orders> getDetail(@RequestParam Integer orderId) {
        return  ApiResponse.success("操作成功",ordersService.getDetail(orderId,this.getMemberResponse().getUseIdentity()));
        return  ApiResponse.success("操作成功",ordersService.getDetail(orderId,this.getMemberResponse()));
    }

    @LoginRequired