From 02c65a3db81026b8b3b322d921ddf46e47f981fa Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期五, 14 二月 2025 14:11:30 +0800
Subject: [PATCH] 开票信息
---
/dev/null | 17 --------
ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java | 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 36 +++++++++++++-----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 27 +++++++++----
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 7 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | 13 ------
ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java | 2 +
7 files changed, 54 insertions(+), 49 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
index 0e57fff..10cd917 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -1,22 +1,20 @@
package com.ruoyi.web.controller.api;
-import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TInvoice;
import com.ruoyi.system.query.TInvoiceQuery;
+import com.ruoyi.system.service.TBillService;
import com.ruoyi.system.service.TInvoiceService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import java.util.List;
/**
* <p>
@@ -31,6 +29,8 @@
public class TInvoiceController {
@Autowired
private TInvoiceService invoiceService;
+ @Autowired
+ TBillService tBillService;
@PreAuthorize("@ss.hasPermi('system:invoice:list')")
@ApiOperation(value = "获取开票列表")
@PostMapping("/list")
@@ -46,11 +46,22 @@
return R.ok(invoiceService.removeById(id));
}
- // @ApiOperation(value = "关联账单信息")
- // @GetMapping(value = "/getBillByInvoiceId")
- // public AjaxResult<List<TBill>> getBillByInvoiceId(String invoiceId){
- // return AjaxResult.success(invoiceService.getBillByInvoiceId(invoiceId));
- // }
+ @ApiOperation(value = "关联账单信息")
+ @GetMapping(value = "/getBillByInvoiceId")
+ public R<PageInfo<TBill>> getBillByInvoiceId(String invoiceId){
+ return R.ok(tBillService.getBillByInvoiceId(invoiceId));
+ }
+
+ @ApiOperation(value = "上传开票凭证")
+ @PostMapping("/uploadVoucher")
+ public R<Boolean> uploadVoucher(@RequestBody TInvoiceQuery query) {
+ TInvoice tInvoice = new TInvoice();
+ tInvoice.setId(query.getId());
+ tInvoice.setInvoiceVoucher(query.getInvoiceVoucher());
+ tInvoice.setInvoiceTime(query.getInvoiceTime());
+ tInvoice.setStatus(2);
+ return R.ok(invoiceService.updateById(tInvoice));
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java
index 108302c..e40dd4e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java
@@ -12,6 +12,8 @@
@Data
@ApiModel(value="开票查询列表Query")
public class TInvoiceQuery extends BasePage {
+ @ApiModelProperty(value = "id")
+ private String id;
@ApiModelProperty(value = "申请编号")
private String invoiceNumber;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
index 1833282..7721283 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
@@ -69,4 +69,11 @@
* @return
*/
PageInfo<TBillDto> invoiceList(TBillQuery query);
+
+ /**
+ * 根据发票编号查询账单列表
+ * @param invoiceId
+ * @return
+ */
+ PageInfo<TBill> getBillByInvoiceId(String invoiceId);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java
index 684244d..c637d9d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java
@@ -19,5 +19,4 @@
public interface TInvoiceService extends IService<TInvoice> {
PageInfo<TInvoice> pageList(TInvoiceQuery query);
List<TInvoice> makeQuery(TInvoiceQuery query);
- List<TBill> getBillByInvoiceId(String invoiceId);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
index 6d301c3..2c1bc20 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -1,10 +1,7 @@
package com.ruoyi.system.service.impl;
-import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.constant.AmountConstant;
import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.core.redis.RedisCache;
@@ -18,6 +15,7 @@
import com.ruoyi.system.mapper.TBillMapper;
import com.ruoyi.system.model.*;
import com.ruoyi.system.query.TBillQuery;
+import com.ruoyi.system.query.TInvoiceToBillQuery;
import com.ruoyi.system.service.*;
import com.taxi591.bankapi.dto.ChargeBillRequest;
import lombok.extern.slf4j.Slf4j;
@@ -27,18 +25,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.time.LocalDateTime;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
import java.math.BigDecimal;
import java.text.ParseException;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
import java.util.List;
import java.util.function.Consumer;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
/**
* <p>
@@ -75,6 +67,9 @@
@Autowired
TOrderBillService orderBillService;
+
+ @Autowired
+ TInvoiceToBillService tInvoiceToBillService;
public PageInfo<TBillDto> queryPage(TBillQuery query){
PageInfo<TBill> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
@@ -328,5 +323,26 @@
}
+ /**
+ * 根据发票编号查询账单列表
+ * @param invoiceId
+ * @return
+ */
+ @Override
+ public PageInfo<TBill> getBillByInvoiceId(String invoiceId){
+ invoiceId = "1889552849671061505";
+ PageInfo<TBill> pageInfo = new PageInfo<>();
+ ArrayList<TBill> bills = new ArrayList<>();
+ TInvoiceToBillQuery query = new TInvoiceToBillQuery();
+ query.setInvoiceId(invoiceId);
+ List<TInvoiceToBill> tInvoiceToBills = tInvoiceToBillService.makeQuery(query);
+ for (TInvoiceToBill tInvoiceToBill : tInvoiceToBills) {
+ TBill byId = getById(tInvoiceToBill.getBillId());
+ bills.add(byId);
+ }
+ pageInfo.setRecords(bills);
+ return pageInfo;
+ }
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
index c602c6b..81c4fdf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
@@ -55,17 +55,4 @@
.orderByDesc(TInvoice::getCreateTime);
return this.baseMapper.selectList(queryWrapper);
}
-
- @Override
- public List<TBill> getBillByInvoiceId( String invoiceId){
- ArrayList<TBill> bills = new ArrayList<>();
- TInvoiceToBillQuery query = new TInvoiceToBillQuery();
- query.setInvoiceId(invoiceId);
- List<TInvoiceToBill> tInvoiceToBills = tInvoiceToBillService.makeQuery(query);
- for (TInvoiceToBill tInvoiceToBill : tInvoiceToBills) {
- TBill byId = tBillService.getById(tInvoiceToBill.getBillId());
- bills.add(byId);
- }
- return bills;
- }
}
diff --git a/ruoyi-system/src/main/resources/mapping/TInvoiceToBillMapper.xml b/ruoyi-system/src/main/resources/mapping/TInvoiceToBillMapper.xml
deleted file mode 100644
index fe804dc..0000000
--- a/ruoyi-system/src/main/resources/mapping/TInvoiceToBillMapper.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.TInvoiceToBillMapper">
-
- <!-- 通用查询映射结果 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TInvoiceToBill">
- <id column="id" property="id" />
- <result column="invoice_id" property="invoiceId" />
- <result column="bill_id" property="billId" />
- </resultMap>
-
- <!-- 通用查询结果列 -->
- <sql id="Base_Column_List">
- id, invoice_id, bill_id
- </sql>
-
-</mapper>
--
Gitblit v1.7.1