Merge remote-tracking branch 'origin/master'

jiangping

2025-07-18 22603b2519b8dcb7f9a7c7d9ba636d9aba240a59

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

@@ -13,6 +13,7 @@
import com.doumee.dao.dto.ConfirmUpdOrderDTO;
import com.doumee.dao.dto.DoneOrderDTO;
import com.doumee.dao.dto.UpdOrderDataDTO;
import com.doumee.dao.vo.OrderReleaseVO;
import com.doumee.service.business.IdentityInfoService;
import com.doumee.service.business.MemberService;
import com.doumee.service.business.OrdersService;
@@ -31,7 +32,7 @@
 * @Author : Rk
 * @create 2025/7/10 9:29
 */
@Api(tags = "1、订单业务")
@Api(tags = "订单业务")
@Trace(exclude = true)
@RestController
@RequestMapping("/web/orders")
@@ -51,7 +52,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));
    }
@@ -167,6 +168,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));
@@ -182,6 +186,15 @@
        return  ApiResponse.success("操作成功",ordersService.getDetail(orderId,this.getMemberResponse().getUseIdentity()));
    }

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


}