From 1bea61102b935d0d5acd3a5ce8f441452a86ff4b Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 28 五月 2024 14:41:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
index 5c628b0..6fdee2d 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/MemberInvoiceController.java
@@ -1,19 +1,17 @@
package com.ruoyi.order.controller;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.order.controller.dto.MemberInvoiceDTO;
-import com.ruoyi.order.controller.dto.MemberInvoiceRiseDTO;
+import com.ruoyi.order.dto.MemberInvoiceDTO;
+import com.ruoyi.order.domain.pojo.MemberInvoice;
import com.ruoyi.order.service.IMemberInvoiceService;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -31,10 +29,19 @@
@PostMapping("/saveMemberInvoice")
@ResponseBody
- @ApiOperation(value = "添加编辑用户发票抬头")
- public R<T> saveMemberInvoice(MemberInvoiceDTO memberInvoiceDTO) {
+ @ApiOperation(value = "用户添加发票")
+ public R<T> saveMemberInvoice(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
iMemberInvoiceService.saveMemberInvoice(memberInvoiceDTO);
return R.ok();
}
+ @PostMapping("/getMemberInvoiceList")
+ @ResponseBody
+ @ApiOperation(value = "获取用户开票历史")
+ public R<PageDTO<MemberInvoice>> getMemberInvoiceList(@RequestBody MemberInvoiceDTO memberInvoiceDTO) {
+ return R.ok(iMemberInvoiceService.getMemberInvoiceList(memberInvoiceDTO));
+ }
+
+
+
}
--
Gitblit v1.7.1