From a9dc61d23c4e38c37a6004662638dc8e2077267d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 18 二月 2025 14:00:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 42 insertions(+), 8 deletions(-)
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 7de5c90..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,6 +1,5 @@
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.constant.AmountConstant;
@@ -16,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;
@@ -25,15 +25,12 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+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>
@@ -71,12 +68,28 @@
@Autowired
TOrderBillService orderBillService;
+ @Autowired
+ TInvoiceToBillService tInvoiceToBillService;
+
public PageInfo<TBillDto> queryPage(TBillQuery query){
PageInfo<TBill> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
PageInfo<TBillDto> info = tBillMapper.page(pageInfo, query);
return info;
}
+ @Override
+ public List<String> getBillIds(TBillQuery query) {
+ List<TBillDto> billDtos = tBillMapper.getBillList(query);
+ return billDtos.stream().map(TBillDto::getId).collect(Collectors.toList());
+ }
+
+ @Override
+ public PageInfo<TBillDto> invoiceList(TBillQuery query) {
+ PageInfo<TBillDto> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TBillDto> list = tBillMapper.invoiceList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
private static final String[] ignorePro = {"payableFeesMoney","payableFeesPenalty","payFeesMoney","outstandingMoney"};
@@ -222,7 +235,7 @@
TFlowManagement save = new TFlowManagement();
save.setPayType(3);
save.setPayer(dto.getPayer());
- save.setPayTime(dto.getPayTime()==null?confirm.getPayTime():dto.getPayTime());
+ save.setPayTime(dto.getPayTime()==null?DateUtils.dateToLocalDateTime(confirm.getPayTime()):dto.getPayTime());
save.setBankSerialNumber(dto.getBankSerilNum());
save.setFlowType(2);
save.setPaymentBillId(bill.getId());
@@ -235,7 +248,7 @@
TBankFlow bankFlow = new TBankFlow();
bankFlow.setPayType(3);
bankFlow.setPayer(dto.getPayer());
- bankFlow.setPayTime(dto.getPayTime()==null?confirm.getPayTime():dto.getPayTime());
+ bankFlow.setPayTime(dto.getPayTime()==null?DateUtils.dateToLocalDateTime(confirm.getPayTime()):dto.getPayTime());
bankFlow.setBankSerialNumber(dto.getBankSerilNum());
bankFlow.setFlowMoney(dto.getAmount());
bankFlow.setFlowStatus(1);
@@ -310,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;
+ }
+
}
--
Gitblit v1.7.1