ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBankFlowController.java
@@ -97,6 +97,7 @@ response.setContentType("application/vnd.ms-excel;charset=utf-8"); response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); response.setHeader("Content-Length","1"); response.setHeader("Pragma", "no-cache"); if (failList.size() > 0) { EasyExcel.write(response.getOutputStream(), TBankFlowImportExcel.class).sheet("Sheet1").doWrite(failList); } else { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.dto.TBillDto; import com.ruoyi.system.model.TBill; import com.ruoyi.system.model.TInvoice; import com.ruoyi.system.query.TInvoiceQuery; @@ -48,7 +49,7 @@ @ApiOperation(value = "关联账单信息") @GetMapping(value = "/getBillByInvoiceId/{invoiceId}") public R<PageInfo<TBill>> getBillByInvoiceId(@PathVariable String invoiceId){ public R<PageInfo<TBillDto>> getBillByInvoiceId(@PathVariable String invoiceId){ return R.ok(tBillService.getBillByInvoiceId(invoiceId)); }
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -47,6 +48,7 @@ @TableField("remaining_money") private BigDecimal remainingMoney; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "支付时间") @TableField("pay_time") private LocalDateTime payTime; ruoyi-system/src/main/java/com/ruoyi/system/service/TBankFlowService.java
@@ -20,7 +20,6 @@ public interface TBankFlowService extends IService<TBankFlow> { PageInfo<TBankFlow> pageList(TBankFlowQuery query); List<TBankFlow> makeQuery(TBankFlowQuery query); TBankFlowStatisticsVo getPaymentStats( TBankFlowQuery query); List<TBankFlow> searchByBankSerialNumber(String bankSerialNumber);
@@ -77,7 +77,7 @@ * @param invoiceId * @return */ PageInfo<TBill> getBillByInvoiceId(String invoiceId); PageInfo<TBillDto> getBillByInvoiceId(String invoiceId); Integer sendSmsByBillIds(SmsByBillDto dto);
@@ -18,8 +18,6 @@ */ public interface TFlowManagementService extends IService<TFlowManagement> { PageInfo<TFlowManagement> pageList(TFlowManagementQuery query); List<TFlowManagement> makeQuery(TFlowManagementQuery query); TFlowManagementStatisticsVo getPaymentStats(TFlowManagementQuery req); List<TFlowManagement> findByBankSerialNumber(String bankSerialNumber); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBankFlowServiceImpl.java
@@ -1,8 +1,6 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.Query; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.utils.StringUtils; @@ -21,7 +19,6 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; @@ -42,23 +39,14 @@ @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); .orderByDesc(TBankFlow::getCreateTime); return this.baseMapper.selectPage(pageInfo, queryWrapper); } @Override @@ -100,7 +88,7 @@ } TFlowManagementQuery query = new TFlowManagementQuery(); query.setBankSerialNumber(row.getBankSerialNumber()); List<TFlowManagement> list1 = flowManagementService.makeQuery(query); List<TFlowManagement> list1 = flowManagementService.findByBankSerialNumber(row.getBankSerialNumber()); for (TFlowManagement tFlowManagement : list1) { // 如果相同流水号金额相同 ：抵扣金额为流水金额，剩余金额为0，状态为正常 if (row.getFlowMoney().compareTo(tFlowManagement.getFlowMoney()) == 0){ ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java
@@ -20,6 +20,7 @@ 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; @@ -343,16 +344,18 @@ * @return */ @Override public PageInfo<TBill> getBillByInvoiceId(String invoiceId){ invoiceId = "1889552849671061505"; PageInfo<TBill> pageInfo = new PageInfo<>(); ArrayList<TBill> bills = new ArrayList<>(); 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 byId = getById(tInvoiceToBill.getBillId()); bills.add(byId); TBill bill = getById(tInvoiceToBill.getBillId()); if (bill != null && bill.getId() != null){ TBillDto detailByBillId = getDetailByBillId(bill.getId()); bills.add(detailByBillId); } } pageInfo.setRecords(bills); return pageInfo; ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFlowManagementServiceImpl.java
@@ -27,13 +27,6 @@ @Override public PageInfo<TFlowManagement> pageList(TFlowManagementQuery query) { PageInfo<TFlowManagement> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TFlowManagement> list = makeQuery(query); pageInfo.setRecords(list); pageInfo.setTotal(list.size()); return pageInfo; } @Override public List<TFlowManagement> makeQuery(TFlowManagementQuery query){ LambdaQueryWrapper<TFlowManagement> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(StringUtils.isNotEmpty(query.getSysSerialNumber()),TFlowManagement::getSysSerialNumber,query.getSysSerialNumber()) .eq(StringUtils.isNotEmpty(query.getBankSerialNumber()),TFlowManagement::getBankSerialNumber,query.getBankSerialNumber()) @@ -43,7 +36,7 @@ .eq(null != query.getFlowStatus(),TFlowManagement::getFlowStatus,query.getFlowStatus()) .orderByDesc(TFlowManagement::getCreateTime) ; return this.baseMapper.selectList(queryWrapper); return this.baseMapper.selectPage(pageInfo,queryWrapper); } @Override @@ -51,4 +44,11 @@ return this.baseMapper.getPaymentStats(query); } @Override public List<TFlowManagement> findByBankSerialNumber(String bankSerialNumber){ LambdaQueryWrapper<TFlowManagement> queryWrapper = new LambdaQueryWrapper<>() ; queryWrapper.eq(StringUtils.isNotEmpty(bankSerialNumber),TFlowManagement::getBankSerialNumber,bankSerialNumber); return this.baseMapper.selectList(queryWrapper); } }
