From 082b9ab8643bc5e81f2e70b8e9400fdaba62e686 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 03 九月 2025 17:19:18 +0800
Subject: [PATCH] 修改小程序首页查询重复bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderInvoiceController.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 112 insertions(+), 6 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 8e2cd80..cfb6986 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,18 +1,43 @@
package com.ruoyi.order.controller;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.ruoyi.account.api.dto.UploadPdfDTO;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.WebUtils;
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.common.core.web.page.PageInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.order.api.model.TOrderInvoice;
+import com.ruoyi.order.api.query.TOrderInvoiceQuery;
+import com.ruoyi.order.api.vo.TOrderInvoiceVO;
+import com.ruoyi.order.dto.*;
+import com.ruoyi.order.export.OrderInvoiceExport;
import com.ruoyi.order.service.TOrderInvoiceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
import javax.annotation.Resource;
-import java.util.List;
+import javax.mail.*;
+import javax.mail.internet.*;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.util.*;
/**
* <p>
@@ -30,7 +55,11 @@
@Resource
private TOrderInvoiceService orderInvoiceService;
-
+ @Resource
+ private TokenService tokenService;
+ @Resource
+ private AppUserClient appUserClient;
+
@ResponseBody
@@ -41,6 +70,78 @@
}
+ @RequiresPermissions(value = {"/invoiceManagement"}, logical = Logical.OR)
+ @PostMapping("/pageList")
+ @ApiOperation(value = "查询开票分页列表", tags = {"管理后台-发票管理"})
+ public AjaxResult<PageInfo<TOrderInvoiceVO>> pageList(@RequestBody TOrderInvoiceQuery query){
+ return AjaxResult.success(orderInvoiceService.pageList(query));
+ }
+
+
+
+ @RequiresPermissions(value = {"/invoiceManagement/accept_hear_case"}, logical = Logical.OR)
+ @PostMapping("/uploadPdf")
+ @ApiOperation(value = "上传发票", tags = {"管理后台-发票管理"})
+ public AjaxResult<String> uploadPdf(@RequestBody UploadPdfDTO dto){
+ TOrderInvoice orderInvoice = orderInvoiceService.getById(dto.getId());
+ orderInvoice.setInvoiceUrl(dto.getInvoiceUrl());
+ orderInvoice.setStatus(3);
+ orderInvoiceService.updateById(orderInvoice);
+ dto.setMailBox(orderInvoice.getMailbox());
+ appUserClient.uploadPdf(dto);
+ return AjaxResult.success();
+ }
+
+
+ @RequiresPermissions(value = {"/invoiceManagement"}, logical = Logical.OR)
+ @PostMapping("/statusCount")
+ @ApiOperation(value = "查询开票状态数量", tags = {"管理后台-发票管理"})
+ public AjaxResult<Map<String,Integer>> statusCount(@RequestBody TOrderInvoiceQuery query){
+ return AjaxResult.success(orderInvoiceService.statusCount(query));
+ }
+
+ /**
+ * 发票管理导出
+ */
+ @RequiresPermissions(value = {"/invoiceManagement/export"}, logical = Logical.OR)
+ @ApiOperation(value = "发票管理导出", tags = {"管理后台-发票管理"})
+ @Log(title = "发票管理导出", businessType = BusinessType.EXPORT)
+ @PutMapping("/export")
+ public void export(@RequestBody TOrderInvoiceQuery query)
+ {
+ List<TOrderInvoiceVO> list = orderInvoiceService.export(query);
+ List<OrderInvoiceExport> orderInvoiceExports = new ArrayList<>();
+ for (TOrderInvoiceVO orderInvoiceVO : list) {
+ OrderInvoiceExport orderInvoiceExport = new OrderInvoiceExport();
+ BeanUtils.copyProperties(orderInvoiceVO,orderInvoiceExport);
+ if (orderInvoiceVO.getBillingTime()!=null){
+ orderInvoiceExport.setBillingTime(DateUtils.localDateTimeToString(orderInvoiceVO.getBillingTime()));
+ }
+ orderInvoiceExports.add(orderInvoiceExport);
+ }
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), OrderInvoiceExport.class, orderInvoiceExports);
+ HttpServletResponse response = WebUtils.response();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ ServletOutputStream outputStream = null;
+ try {
+ String fileName = URLEncoder.encode("发票导出.xls", "utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ outputStream = response.getOutputStream();
+ workbook.write(outputStream);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
@ResponseBody
@GetMapping("/getMyOrderInvoiceList")
@@ -56,6 +157,11 @@
@GetMapping("/getMyOrderInvoiceInfo/{id}")
@ApiOperation(value = "获取开票记录详情", tags = {"小程序-充电发票"})
public AjaxResult<MyOrderInvoiceInfo> getMyOrderInvoiceInfo(@PathVariable String id){
+ TOrderInvoice orderInvoice = orderInvoiceService.getById(id);
+ Long userId = tokenService.getLoginUserApplet().getUserId();
+ if(!orderInvoice.getAppUserId().equals(userId)){
+ return AjaxResult.error("权限不足");
+ }
MyOrderInvoiceInfo myOrderInvoiceInfo = orderInvoiceService.getMyOrderInvoiceInfo(id);
return AjaxResult.success(myOrderInvoiceInfo);
}
--
Gitblit v1.7.1