From 65f3fb018916e35a6271a4e348093a8d1a938120 Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 03 四月 2025 21:17:29 +0800
Subject: [PATCH] 修改bug
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java | 109 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 95 insertions(+), 14 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
index 89e5fec..a643025 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
@@ -3,14 +3,27 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.importExcel.TBankFlowImportExcel;
import com.ruoyi.system.mapper.TBankFlowMapper;
import com.ruoyi.system.model.TBankFlow;
+import com.ruoyi.system.model.TBill;
+import com.ruoyi.system.model.TFlowManagement;
import com.ruoyi.system.query.TBankFlowQuery;
+import com.ruoyi.system.query.TFlowManagementQuery;
import com.ruoyi.system.service.TBankFlowService;
+import com.ruoyi.system.service.TFlowManagementService;
import com.ruoyi.system.vo.TBankFlowStatisticsVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
import java.util.List;
/**
@@ -23,31 +36,25 @@
*/
@Service
public class TBankFlowServiceImpl extends ServiceImpl<TBankFlowMapper, TBankFlow> implements TBankFlowService {
+ @Autowired
+ TFlowManagementService flowManagementService;
@Override
public PageInfo<TBankFlow> pageList(TBankFlowQuery query) {
PageInfo<TBankFlow> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<TBankFlow> list = makeQuery(query);
- pageInfo.setRecords(list);
- pageInfo.setTotal(list.size());
- return pageInfo;
- }
-
- @Override
- public List<TBankFlow> makeQuery(TBankFlowQuery query) {
LambdaQueryWrapper<TBankFlow> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(StringUtils.isNotEmpty(query.getBankSerialNumber()),TBankFlow::getBankSerialNumber,query.getBankSerialNumber())
.like(StringUtils.isNotEmpty(query.getPayer()),TBankFlow::getPayer,query.getPayer())
.ge(StringUtils.isNotEmpty(query.getPayStartTime()),TBankFlow::getPayTime,query.getPayStartTime())
.lt(StringUtils.isNotEmpty(query.getPayEndTime()),TBankFlow::getPayTime,query.getPayEndTime())
.eq(null != query.getFlowStatus(),TBankFlow::getFlowStatus,query.getFlowStatus())
- .orderByDesc(TBankFlow::getCreateTime)
- ;
- return this.baseMapper.selectList(queryWrapper);
+ .eq(StringUtils.isNotEmpty(query.getBusinessDeptId())&& !"0".equals(query.getBusinessDeptId()),TBankFlow::getBusinessDeptId,query.getBusinessDeptId())
+ .orderByDesc(TBankFlow::getCreateTime);
+ return this.baseMapper.selectPage(pageInfo, queryWrapper);
}
@Override
public TBankFlowStatisticsVo getPaymentStats(TBankFlowQuery query) {
- return this.baseMapper.getPaymentStats(query);
+ return this.baseMapper.getPaymentStats(query,SecurityUtils.getBusinessDeptId());
}
/**
@@ -57,8 +64,82 @@
*/
@Override
public List<TBankFlow> searchByBankSerialNumber(String bankSerialNumber) {
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+
LambdaQueryWrapper<TBankFlow> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.like(StringUtils.isNotEmpty(bankSerialNumber),TBankFlow::getBankSerialNumber,bankSerialNumber);
- return this.baseMapper.selectList(queryWrapper);
+ queryWrapper.like(StringUtils.isNotEmpty(bankSerialNumber),TBankFlow::getBankSerialNumber,bankSerialNumber)
+ .eq(StringUtils.isNotEmpty(bankSerialNumber) && !"0".equals(bankSerialNumber),TBankFlow::getBusinessDeptId,businessDeptId)
+ .orderByDesc(TBankFlow::getPayTime);
+ PageInfo<TBankFlow> pageInfo = new PageInfo<>(1, 20);
+ pageInfo = this.baseMapper.selectPage(pageInfo, queryWrapper);
+ return pageInfo.getRecords();
+ }
+
+ @Override
+ public void saveImportBatch(List<TBankFlowImportExcel> list, List<TBankFlowImportExcel> failList) {
+ String businessDeptId = SecurityUtils.getBusinessDeptId();
+ for (TBankFlowImportExcel row : list) {
+ try {
+ TBankFlow preexist = findUniq(row.getBankSerialNumber());
+ if (preexist != null){
+ row.setResult("流水号已存在"+row.getBankSerialNumber());
+ failList.add(row);
+ continue;
+ }
+ TBankFlow flow = new TBankFlow();
+ BeanUtils.copyProperties(row,flow);
+ flow.setBusinessDeptId(businessDeptId);
+ try {
+ LocalDateTime parse = LocalDateTime.parse(row.getPayTime(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+ flow.setPayTime(parse);
+ }catch (DateTimeParseException e){
+ row.setResult("支付时间格式不正确"+row.getPayTime());
+ failList.add(row);
+ continue;
+ }
+ TFlowManagementQuery query = new TFlowManagementQuery();
+ query.setBankSerialNumber(row.getBankSerialNumber());
+ List<TFlowManagement> list1 = flowManagementService.findByBankSerialNumber(row.getBankSerialNumber());
+ for (TFlowManagement tFlowManagement : list1) {
+ // 如果相同流水号金额相同 ：抵扣金额为流水金额，剩余金额为0，状态为正常
+ if (row.getFlowMoney().compareTo(tFlowManagement.getFlowMoney()) == 0){
+ flow.setDeductionMoney(tFlowManagement.getFlowMoney());
+ flow.setRemainingMoney(BigDecimal.ZERO);
+ flow.setFlowStatus(1);
+ this.baseMapper.insert(flow);
+ break;
+ }else {
+ // 流水号相同，金额不同：已抵扣金额为系统流水金额，剩余金额 = 银行流水金额-系统流水金额，状态为异常
+ flow.setDeductionMoney(tFlowManagement.getFlowMoney());
+ flow.setRemainingMoney(row.getFlowMoney().divide(tFlowManagement.getFlowMoney(),2, RoundingMode.HALF_DOWN));
+ flow.setFlowStatus(2);
+ this.baseMapper.insert(flow);
+ break;
+ }
+ }
+ // 系统流水查找不到：抵扣金额为0，剩余金额为流水金额，状态为异常
+ flow.setDeductionMoney(BigDecimal.ZERO);
+ flow.setRemainingMoney(row.getFlowMoney());
+ flow.setFlowStatus(2);
+ this.baseMapper.insert(flow);
+ }catch (Exception e){
+ log.error("导入银行流水信息异常",e);
+ row.setResult("导入异常："+e.getMessage());
+ failList.add(row);
+ }
+ }
+ }
+
+ /**
+ * 根据流水号查找唯一流水
+ * @param bankSerialNumber
+ * @return
+ */
+
+ @Override
+ public TBankFlow findUniq(String bankSerialNumber) {
+ LambdaQueryWrapper<TBankFlow> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(StringUtils.isNotEmpty(bankSerialNumber),TBankFlow::getBankSerialNumber,bankSerialNumber);
+ return this.baseMapper.selectOne(queryWrapper);
}
}
--
Gitblit v1.7.1