From 1fe1ac0e09132e0147e48007986be235e4130aa1 Mon Sep 17 00:00:00 2001
From: zhangmei <645025773@qq.com>
Date: 星期五, 28 二月 2025 12:54:12 +0800
Subject: [PATCH] 分页查询更改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 131 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 123 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..d29baf1 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;
@@ -8,16 +7,23 @@
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.SmsUtil;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.TencentMailUtil;
import com.ruoyi.common.utils.uuid.UUID;
import com.ruoyi.system.dto.OfflinePayCheckDto;
+import com.ruoyi.system.dto.SmsByBillDto;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.dto.TbillSaveDto;
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.ruoyi.system.vo.TBillVO;
import com.taxi591.bankapi.dto.ChargeBillRequest;
+import com.tencentcloudapi.sms.v20190711.SmsClient;
+import com.tencentcloudapi.sms.v20190711.models.SendSmsRequest;
import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils;
@@ -25,15 +31,14 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import javax.validation.constraints.NotEmpty;
+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 +76,35 @@
@Autowired
TOrderBillService orderBillService;
+ @Autowired
+ TInvoiceToBillService tInvoiceToBillService;
+
+
+ @Resource
+ SmsUtil smsUtil;
+
+ @Resource
+ TencentMailUtil mailUtil;
+
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 +250,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 +263,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 +338,92 @@
}
+ /**
+ * 根据发票编号查询账单列表
+ * @param invoiceId
+ * @return
+ */
+ @Override
+ public PageInfo<TBillDto> getBillByInvoiceId(String invoiceId){
+ PageInfo<TBillDto> pageInfo = new PageInfo<>();
+ ArrayList<TBillDto> bills = new ArrayList<>();
+ TInvoiceToBillQuery query = new TInvoiceToBillQuery();
+ query.setInvoiceId(invoiceId);
+ List<TInvoiceToBill> tInvoiceToBills = tInvoiceToBillService.makeQuery(query);
+ for (TInvoiceToBill tInvoiceToBill : tInvoiceToBills) {
+ TBill bill = getById(tInvoiceToBill.getBillId());
+ if (bill != null && bill.getId() != null){
+ TBillDto detailByBillId = getDetailByBillId(bill.getId());
+ bills.add(detailByBillId);
+ }
+ }
+ pageInfo.setRecords(bills);
+ return pageInfo;
+ }
+
+
+
+ @Override
+ public Integer sendSmsByBillIds(SmsByBillDto dto) {
+ int failNum = 0;
+ for (String billId : dto.getBillIds()) {
+ TBillDto bill = getDetailByBillId(billId);
+ if (bill.getSmsLastTime()!=null
+ && (System.currentTimeMillis()-bill.getSmsLastTime().getTime()<smsUtil.getPro().getBillSmsDelayPeriod()*60*1000L)){
+ throw new ServiceException("有账单最近一次发送的时间是:"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,bill.getSmsLastTime()));
+ }
+ if (StringUtils.isEmpty(bill.getPhone())){
+ failNum++;
+ continue;
+ }
+ TBill save = new TBill();
+ save.setId(bill.getId());
+ try {
+ smsUtil.sendSms(bill.getPhone(), "", new String[]{""});
+ save.setSmsStatus(1);
+ }catch (ServiceException e){
+ failNum++;
+ save.setSmsStatus(2);
+ }
+ save.setSmsLastTime(new Date());
+ save.setSmsSendUserid(dto.getSendUserId());
+ lockAndUpdateInfo(save,1);
+ }
+ return failNum;
+ }
+
+ @Override
+ public Integer sendMailBatchByBillIds(SmsByBillDto dto) {
+ int failNum = 0;
+ for (String billId : dto.getBillIds()) {
+ TBillDto bill = getDetailByBillId(billId);
+ if (bill.getSmsLastTime()!=null
+ && (System.currentTimeMillis()-bill.getSmsLastTime().getTime()<mailUtil.getPro().getBillMailDelayPeriod()*60*1000L)){
+ throw new ServiceException("有账单最近一次发送的时间是:"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,bill.getSmsLastTime()));
+ }
+ if (StringUtils.isEmpty(bill.getEmail())){
+ failNum++;
+ continue;
+ }
+ TBill save = new TBill();
+ save.setId(bill.getId());
+ try {
+ mailUtil.send(bill.getEmail(),bill.getHouseName());
+ save.setMailStatus(1);
+ }catch (ServiceException e){
+ failNum++;
+ save.setMailStatus(2);
+ }
+ save.setMailLastTime(new Date());
+ save.setMailSendUserid(dto.getSendUserId());
+ lockAndUpdateInfo(save,1);
+ }
+ return failNum;
+ }
+
+ public TBillDto getDetailByBillId(@NotEmpty String billId) {
+ return getBaseMapper().selectDetailByBillId(billId);
+ }
+
}
--
Gitblit v1.7.1