rk
2 天以前 79aebca90280ae4d4b25ed6ba6267128cdb61d3a
server/web/src/main/java/com/doumee/api/web/OrdersApi.java
@@ -3,13 +3,16 @@
import com.doumee.core.annotation.LoginRequired;
import com.doumee.core.annotation.LoginShopRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.dto.CancelOrderDTO;
import com.doumee.dao.dto.CommentOrderDTO;
import com.doumee.dao.dto.ConfirmArriveDTO;
import com.doumee.dao.dto.CreateOrderDTO;
import com.doumee.dao.dto.DriverVerifyDTO;
import com.doumee.dao.dto.ShopVerifyDTO;
import com.doumee.dao.dto.StoreOutDTO;
import com.doumee.dao.dto.MyOrderDTO;
import com.doumee.dao.vo.MyOrderDetailVO;
import com.doumee.dao.vo.MyOrderVO;
@@ -77,6 +80,16 @@
        return ApiResponse.success("查询成功", ordersService.findMyOrderPage(pageWrap, getMemberId()));
    }
    @LoginShopRequired
    @ApiOperation(value = "门店订单分页", notes = "门店端,查询存件/取件门店为当前门店的订单")
    @PostMapping("/shopPage")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "门店token值", required = true)
    })
    public ApiResponse<PageData<MyOrderVO>> shopPage(@RequestBody @Validated PageWrap<MyOrderDTO> pageWrap) {
        return ApiResponse.success("查询成功", ordersService.findShopOrderPage(pageWrap, getShopId()));
    }
    @LoginRequired
    @ApiOperation(value = "会员订单详情", notes = "小程序端,查询当前会员的订单详情")
    @GetMapping("/detail/{orderId}")
@@ -110,25 +123,37 @@
        return ApiResponse.success("查询成功", ordersService.calculateOverdueFee(orderId));
    }
    @LoginRequired
    @ApiOperation(value = "逾期费用支付", notes = "逾期订单唤起微信支付")
    @PostMapping("/payOverdueFee/{orderId}")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "orderId", value = "订单主键", required = true),
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse<PayResponse> payOverdueFee(@PathVariable Integer orderId) {
        return ApiResponse.success("操作成功", ordersService.payOverdueFee(orderId, getMemberId()));
    }
    @LoginRequired
    @ApiOperation(value = "会员删除订单", notes = "仅已完成/已取消/已退款订单可删除,逻辑删除")
    @PostMapping("/delete/{orderId}")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "orderId", value = "订单主键", required = true),
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse deleteOrder(@PathVariable Integer orderId) {
        ordersService.deleteMyOrder(orderId, getMemberId());
        return ApiResponse.success("删除成功");
    }
    @LoginShopRequired
    @ApiOperation(value = "门店核销收件", notes = "门店通过核销码确认收件/取件")
    @ApiOperation(value = "门店核销", notes = "门店通过订单主键确认寄存/取件")
    @PostMapping("/shopVerify")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "门店token值", required = true)
    })
    public ApiResponse shopVerify(@RequestBody @Validated ShopVerifyDTO dto) {
        ordersService.shopVerifyOrder(dto.getVerifyCode(), getShopId(), dto.getImages(), dto.getRemark());
        return ApiResponse.success("核销成功");
    }
    @LoginShopRequired
    @ApiOperation(value = "核销司机码", notes = "异地寄存且有取件门店的订单,通过司机核销码确认到店")
    @PostMapping("/driverVerify")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse driverVerify(@RequestBody @Validated DriverVerifyDTO dto) {
        ordersService.driverVerifyOrder(dto.getVerifyCode(), dto.getImages(), dto.getRemark(), getShopId());
        ordersService.verifyOrderByShopId(dto.getOrderId(), getShopId(), dto.getImages(), dto.getRemark());
        return ApiResponse.success("核销成功");
    }
@@ -142,7 +167,53 @@
    })
    public ApiResponse<MyOrderDetailVO> shopDetail(@RequestParam(required = false) Integer orderId,
                                                    @RequestParam(required = false) String verifyCode) {
        return ApiResponse.success("查询成功", ordersService.findShopOrderDetail(orderId, verifyCode));
        MyOrderDetailVO myOrderDetailVO = ordersService.findShopOrderDetail(orderId, verifyCode);
        myOrderDetailVO.setMemberVerifyCode(null);
        return ApiResponse.success("查询成功", myOrderDetailVO);
    }
    @LoginShopRequired
    @ApiOperation(value = "门店确认出库", notes = "取件门店确认出库,订单完成")
    @PostMapping("/storeOut")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "门店token值", required = true)
    })
    public ApiResponse storeOut(@RequestBody @Validated StoreOutDTO dto) {
        ordersService.confirmStoreOut(dto.getOrderId(), getShopId(), dto.getImages(), dto.getRemark());
        return ApiResponse.success("出库成功");
    }
    @LoginShopRequired
    @ApiOperation(value = "确认顾客到店", notes = "门店确认顾客已到店取件,检查逾期/退款")
    @PostMapping("/confirmArrived")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "门店token值", required = true)
    })
    public ApiResponse confirmArrived(@RequestBody @Validated ConfirmArriveDTO dto) {
        ordersService.confirmCustomerArrived(dto.getOrderId(), getShopId());
        return ApiResponse.success("操作成功");
    }
    @LoginRequired
    @ApiOperation(value = "订单评价", notes = "已完成且未评价的订单可进行评价")
    @PostMapping("/comment")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse comment(@RequestBody @Validated CommentOrderDTO dto) {
        ordersService.commentOrder(dto, getMemberId());
        return ApiResponse.success("评价成功");
    }
    @LoginRequired
    @ApiOperation(value = "会员确认收货", notes = "异地寄存且无取件门店的订单,送达后确认收货标记订单完成")
    @PostMapping("/confirmReceipt/{orderId}")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true)
    })
    public ApiResponse confirmReceipt(@PathVariable Integer orderId) {
        ordersService.memberConfirmReceipt(orderId, getMemberId());
        return ApiResponse.success("确认收货成功");
    }