Merge remote-tracking branch 'origin/master-v4' into master-v4

陶杰

2024-12-30 086adfdf1d5340a3503da5b5ebcae9073775450e

 src/main/java/com/mzl/flower/web/payment/OrderController.java

@@ -23,6 +23,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.time.LocalDateTime;
import java.util.List;

@RestController
@@ -45,6 +46,12 @@
    @ApiOperation(value = "获取订单状态数量")
    public ResponseEntity<ReturnDataDTO<List<OrderStatusCountDTO>>> getOrderStatusCount(OrderQueryDTO dto){
        return returnData(R.SUCCESS.getCode(), orderService.getOrderStatusCount(dto));
    }

    @GetMapping("/abnormal/status/count")
    @ApiOperation(value = "获取异常订单状态数量")
    public ResponseEntity<ReturnDataDTO<List<OrderStatusCountDTO>>> getAbnormalOrderStatusCount(OrderQueryDTO dto){
        return returnData(R.SUCCESS.getCode(), orderService.getAbnormalOrderStatusCount(dto));
    }

    @GetMapping("/list")
@@ -88,7 +95,7 @@

    @GetMapping("/list/abnormal/process")
    @ApiOperation(value = "异常订单处理（不管有没有退款金额，建议都要处理）")
    public ResponseEntity<ReturnDataDTO> processLevelDown(String id) {
    public ResponseEntity<ReturnDataDTO> processLevelDown(String id) throws Exception {
        orderService.processAbnormalOrder(id);
        return returnData(R.SUCCESS.getCode(), null);
    }
@@ -193,4 +200,18 @@
    public void exportOrderDetail(HttpServletResponse response, OrderQueryDTO queryOrderDTO) {
        orderService.exportOrderDetail(response, queryOrderDTO);
    }

    @GetMapping("/time/now")
    @ApiOperation(value = "订单导出")
    public  ResponseEntity<Long> getNowTime() {
        return returnData(R.SUCCESS.getCode(),System.currentTimeMillis());
    }

    @GetMapping("/elk/date")
    @ApiOperation(value = "订单日期刷新")
    public  ResponseEntity<Long> getElkDate() {
        orderService.refreshDate();
        return returnData(R.SUCCESS.getCode(),System.currentTimeMillis());
    }

}