Merge remote-tracking branch 'origin/master'

rk

2025-08-22 b6c47d11bbc3ef252c83b320f496ac07d66d6139

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

@@ -9,10 +9,8 @@
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;
import com.doumee.service.business.OrdersService;
@@ -51,7 +49,7 @@
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<Object> release(@RequestBody Orders orders) {
    public ApiResponse<OrderReleaseVO> release(@RequestBody Orders orders) {
        orders.setMember(this.getMemberResponse());
        return  ApiResponse.success("操作成功",ordersService.create(orders));
    }
@@ -64,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 = "小程序端")
@@ -92,39 +103,27 @@

    @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")
    @ApiOperation(value = "取消前提示语 - 发单方", notes = "小程序端")
    @GetMapping("/cancelTips")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse receiveCancelOrder(@RequestParam Integer orderId) {
        ordersService.receiveCancelOrder(orderId,this.getMemberResponse());
    public ApiResponse cancelTips(@RequestParam Integer orderId) {
        ordersService.cancelTips(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 = "小程序端")
@@ -144,9 +143,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));
    }


@@ -167,6 +177,9 @@
    @LoginRequired
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<PageData<Orders>> findPage (@RequestBody PageWrap<Orders> pageWrap) {
        pageWrap.getModel().setMember(this.getMemberResponse());
        return ApiResponse.success(ordersService.findPageForMini(pageWrap));
@@ -179,9 +192,18 @@
            @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
    @ApiOperation("获取预计金额（分）")
    @PostMapping("/getTotal")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<Long> getTotal(@RequestBody Orders orders) {
        return ApiResponse.success(ordersService.getTotal(orders));
    }


}