From fe98a636e22b93662607e80ea4314215b0dd36a6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 22 八月 2024 09:23:12 +0800
Subject: [PATCH] 代码合并
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 43 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
index 664a0dc..8e2cd80 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java
@@ -1,9 +1,18 @@
package com.ruoyi.order.controller;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.order.dto.AddOrderInvoice;
+import com.ruoyi.order.dto.GetOrderInvoiceList;
+import com.ruoyi.order.dto.MyOrderInvoiceInfo;
+import com.ruoyi.order.dto.OrderInvoiceList;
+import com.ruoyi.order.service.TOrderInvoiceService;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -18,5 +27,37 @@
@RequestMapping("/t-order-invoice")
public class TOrderInvoiceController {
+ @Resource
+ private TOrderInvoiceService orderInvoiceService;
+
+
+
+
+ @ResponseBody
+ @PostMapping("/addOrderInvoice")
+ @ApiOperation(value = "添加开票申请", tags = {"小程序-充电发票"})
+ public AjaxResult addOrderInvoice(@RequestBody AddOrderInvoice addOrderInvoice){
+ return orderInvoiceService.addOrderInvoice(addOrderInvoice);
+ }
+
+
+
+ @ResponseBody
+ @GetMapping("/getMyOrderInvoiceList")
+ @ApiOperation(value = "获取开票记录列表", tags = {"小程序-充电发票"})
+ public AjaxResult<List<OrderInvoiceList>> getMyOrderInvoiceList(GetOrderInvoiceList query){
+ List<OrderInvoiceList> myOrderInvoiceList = orderInvoiceService.getMyOrderInvoiceList(query);
+ return AjaxResult.success(myOrderInvoiceList);
+ }
+
+
+
+ @ResponseBody
+ @GetMapping("/getMyOrderInvoiceInfo/{id}")
+ @ApiOperation(value = "获取开票记录详情", tags = {"小程序-充电发票"})
+ public AjaxResult<MyOrderInvoiceInfo> getMyOrderInvoiceInfo(@PathVariable String id){
+ MyOrderInvoiceInfo myOrderInvoiceInfo = orderInvoiceService.getMyOrderInvoiceInfo(id);
+ return AjaxResult.success(myOrderInvoiceInfo);
+ }
}
--
Gitblit v1.7.1