完善提交订单逻辑

xin

2025-07-08 83396a38be3c69c81f8acc4681c18f5dd0e698be

 oying-system/src/main/java/com/oying/modules/sh/rest/OrderController.java

@@ -1,6 +1,7 @@
package com.oying.modules.sh.rest;

import com.oying.annotation.Log;
import com.oying.exception.BadRequestException;
import com.oying.modules.sh.domain.request.GeneratorOrder;
import com.oying.modules.sh.domain.request.SubmitOrder;
import com.oying.modules.sh.service.OrderService;
@@ -19,6 +20,7 @@
import io.swagger.annotations.*;

import java.io.IOException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -50,8 +52,19 @@
        return new ResponseEntity<>(R.success(orderService.queryAll(criteria, page)), HttpStatus.OK);
    }

    @GetMapping("app")
    @ApiOperation("APP：查询订单信息")
    @PreAuthorize("@el.check('order:list')")
    public ResponseEntity<Object> appQueryOrder(OrderQueryCriteria criteria) {
        if (criteria.getStoreId() == null) {
            throw new BadRequestException("请选择门店");
        }
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        return new ResponseEntity<>(R.success(orderService.queryAll(criteria, page)), HttpStatus.OK);
    }

    @GetMapping("mini")
    @ApiOperation("小程序：查询订单信息")
    @ApiOperation("小程序：查询订单信息列")
    public ResponseEntity<Object> miniQueryOrder(OrderQueryCriteria criteria) {
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        criteria.setUserId(SecurityUtils.getCurrentUserId());
@@ -68,16 +81,29 @@
    @PostMapping("submit")
    @Log("小程序：提交订单")
    @ApiOperation("小程序：提交订单")
    public ResponseEntity<Object> submitOrder(@Validated @RequestBody SubmitOrder submit) {
        return new ResponseEntity<>(R.success(orderService.submitOrder(submit)), HttpStatus.CREATED);
    public ResponseEntity<Object> submitOrder(@Validated @RequestBody SubmitOrder submit, HttpServletRequest request) {
        return new ResponseEntity<>(R.success(orderService.submitOrder(submit, request)), HttpStatus.CREATED);
    }

    @DeleteMapping
    @Log("删除订单信息")
    @ApiOperation("删除订单信息")
    @PreAuthorize("@el.check('order:del')")
    public ResponseEntity<Object> deleteOrder(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        orderService.deleteAll(ids);
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }

    @Log("关闭订单")
    @ApiOperation("关闭订单")
    @PostMapping(value = "/closeOrder")
    public ResponseEntity<Object> closeOrder(@RequestParam String orderNum) {
        orderService.closeOrder(orderNum);
        return new ResponseEntity<>(R.success(), HttpStatus.OK);
    }

    @ApiOperation("订单号查询订单")
    @GetMapping(value = "/getByOrderNum")
    public ResponseEntity<Object> getByOrderNum(@RequestParam String orderNum) {
        return new ResponseEntity<>(R.success(orderService.getByOrderNum(orderNum)), HttpStatus.OK);
    }
}