ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/query/TInvoiceQuery.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
ruoyi-system/src/main/resources/mapping/TInvoiceToBillMapper.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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)); } } 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; 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); } 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); } 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; } } 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; } } ruoyi-system/src/main/resources/mapping/TInvoiceToBillMapper.xml
File was deleted