Merge remote-tracking branch 'origin/master'

doum

2025-09-05 a0e2b81650399adf23b29eb55708e8c5b0330999

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

@@ -1,10 +1,16 @@
package com.doumee.api.web;

import com.azure.core.annotation.Post;
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
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.*;
import com.doumee.dao.vo.OrderReleaseVO;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.OrdersService;
@@ -13,6 +19,7 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -22,7 +29,7 @@
 * @Author : Rk
 * @create 2025/7/10 9:29
 */
@Api(tags = "1、订单业务")
@Api(tags = "订单业务")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/orders")
@@ -37,15 +44,177 @@
    private OrdersService ordersService;

    @LoginRequired
    @ApiOperation(value = "编辑个人信息", notes = "小程序端")
    @GetMapping("/getMemberInfo")
    @ApiOperation(value = "发布订单 - 发单方", notes = "小程序端")
    @PostMapping("/release")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse<Member> getMemberInfo() {
        return  ApiResponse.success("查询成功",memberService.getMemberInfo(getMemberId()));
    public ApiResponse<OrderReleaseVO> release(@RequestBody Orders orders) {
        orders.setMember(this.getMemberResponse());
        return  ApiResponse.success("操作成功",ordersService.create(orders));
    }

    @LoginRequired
    @ApiOperation(value = "修改订单 - 发单方", notes = "小程序端")
    @PostMapping("/updateOrder")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse updateOrder(@RequestBody Orders orders) {
        orders.setMember(this.getMemberResponse());
        ordersService.update(orders);
        return  ApiResponse.success("操作成功");
    }
    @LoginRequired
    @ApiOperation(value = "接单方确认订单费用 - 接单方", notes = "小程序端")
    @PostMapping("/confirmFee")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse confirmFee(@RequestBody ConfirmFeeOrderDTO orders) {
        orders.setMember(this.getMemberResponse());
        ordersService.confirmFee(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 = "小程序端")
    @GetMapping("/accept")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    public ApiResponse accept(@RequestParam Integer orderId) {
        ordersService.accept(orderId,this.getMemberResponse());
        return  ApiResponse.success("操作成功");
    }

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

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

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



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

    @LoginRequired
    @ApiOperation(value = "完成订单 - 发单方", notes = "小程序端")
    @PostMapping("/doneOrder")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
    })
    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));
    }


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



    @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));
    }

    @LoginRequired
    @ApiOperation(value = "订单详情", notes = "小程序端")
    @GetMapping("/getDetail")
    @ApiImplicitParams({
            @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()));
    }

    @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));
    }


}