From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java | 540 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 523 insertions(+), 17 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 e30ccf0..0376220 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,16 +1,40 @@
package com.ruoyi.system.service.impl;
-import com.ruoyi.common.basic.PageInfo;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.system.mapper.TBillMapper;
-import com.ruoyi.system.model.TBill;
-import com.ruoyi.system.query.TBillQuery;
-import com.ruoyi.system.service.TBillService;
+import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import io.jsonwebtoken.lang.Assert;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.config.SmsProperties;
+import com.ruoyi.common.constant.AmountConstant;
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.*;
+import com.ruoyi.common.utils.uuid.UUID;
+import com.ruoyi.system.dto.*;
+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;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import javax.validation.constraints.NotEmpty;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
/**
* <p>
@@ -21,6 +45,7 @@
* @since 2025-01-17
*/
@Service
+@Slf4j
public class TBillServiceImpl extends ServiceImpl<TBillMapper, TBill> implements TBillService {
@Autowired
@@ -29,22 +54,503 @@
@Autowired
TBillMapper tBillMapper;
- public PageInfo<TBill> queryPage(TBillQuery query){
+ @Autowired
+ TBillDetailService tBillDetailService;
+
+ @Autowired
+ TFlowManagementService tFlowManagementService;
+
+ @Autowired
+ TBankFlowService tBankFlowService;
+
+ @Autowired
+ TBillConfirmService tBillConfirmService;
+
+ @Autowired
+ TPayOrderService tPayOrderService;
+
+ @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"};
+
+ /**
+ *
+ * 更新类型 1.仅更新信息及状态 2.更新信息、金额及状态
+ * 为1时，仅更新非金额之外的信息及状态
+ * 为2时，传入的金额，是需要增加或减少的金额，非计算后的金额
+ * 当账单状态为已缴费后，不做任何更新
+ * @param tBill
+ * @param type
+ * @return
+ */
+ public TBill lockAndUpdateInfo(@NotNull TBill tBill, @NotNull Integer type){
+ if (StringUtils.isEmpty(tBill.getId())){
+ throw new ServiceException("账单主键ID不能为空");
+ }
+ String requestId = UUID.fastUUID().toString();
+ String lockkey = CacheConstants.BILL_UPDATE_LOCK_KEY + tBill.getId();
+ boolean isok = redisCache.trylockLoop(lockkey, requestId, 60);
+ if (isok){
+ try {
+ TBill save = new TBill();
+ TBill presist = getById(tBill.getId());
+ //如果账单是已缴费状态，本方法不再进行更新账单
+ if (presist.getPayFeesStatus().equals("3")){
+ throw new ServiceException("该账单已缴费完成");
+ }
+ switch (type){
+ // 仅更新除金额字段外的属性
+ case 1:
+ {
+ BeanUtils.copyProperties(tBill,save,ignorePro);
+ }
+ break;
+ // 计算并更新金额、存入违约金、已缴费金额会自动计算欠费，如计算出无欠费则会更新状态为已缴费
+ case 2:
+ {
+ BeanUtils.copyProperties(tBill,save);
+
+ // 处理应缴费 ，注意一般情况下不会修改该金额
+ if (tBill.getPayableFeesMoney()!=null){
+ presist.setPayableFeesMoney(presist.getPayableFeesMoney()!=null?presist.getPayableFeesMoney():BigDecimal.ZERO);
+ BigDecimal result = presist.getPayableFeesMoney().add(tBill.getPayableFeesMoney());
+ save.setPayableFeesMoney(result);
+ //计算欠费 = 应缴费(新)+违约金-已缴费
+ BigDecimal outstand = save.getPayableFeesMoney()
+ .add(presist.getPayableFeesPenalty())
+ .subtract(presist.getPayFeesMoney());
+ save.setOutstandingMoney(outstand);
+ }
+ //处理应缴违约金 ，不能和缴费金额一起传
+ if (tBill.getPayableFeesPenalty()!=null){
+ presist.setPayableFeesPenalty(presist.getPayableFeesPenalty()!=null?presist.getPayableFeesPenalty():BigDecimal.ZERO);
+ BigDecimal result = presist.getPayableFeesPenalty().add(tBill.getPayableFeesPenalty());
+ save.setPayableFeesPenalty(result);
+ //计算欠费 = 应缴费+违约金（新）-已缴费
+ BigDecimal outstand = presist.getPayableFeesMoney()
+ .add(save.getPayableFeesPenalty())
+ .subtract(presist.getPayFeesMoney());
+ save.setOutstandingMoney(outstand);
+ }
+ //处理缴费金额
+ if (tBill.getPayFeesMoney()!=null){
+ presist.setPayFeesMoney(presist.getPayFeesMoney()!=null?presist.getPayFeesMoney():BigDecimal.ZERO);
+ BigDecimal result = presist.getPayFeesMoney().add(tBill.getPayFeesMoney());
+ save.setPayFeesMoney(result);
+ //缴费后的欠费 =(应缴费+违约金)-已缴费金额
+ BigDecimal outstand = presist.getPayableFeesMoney()
+ .add(presist.getPayableFeesPenalty())
+ .subtract(save.getPayFeesMoney());
+ save.setOutstandingMoney(outstand);
+ //抵扣金额就是缴费金额
+ save.setDeductionMoney(tBill.getPayableFeesMoney());
+ save.setPreOutstand(presist.getOutstandingMoney());
+ if (outstand.compareTo(BigDecimal.ZERO)<=0){
+ save.setPayFeesStatus("3");
+ }
+ }
+ }
+ break;
+
+ }
+ updateById(save);
+ return save;
+ }finally {
+ redisCache.unlock(lockkey,requestId);
+ }
+ }
return null;
}
-
-
- /**
- * 传的金额
- * @param tBill
- * @return
- */
- public Boolean checkAndUpdateBill(TBill tBill){
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean lockAndUpdateByAmountBatch(List<TBill> bills, BigDecimal amount, Consumer<TBill> consumer) {
+ List<TBill> result = bills.stream().sorted(Comparator.comparing(TBill::getCreateTime))
+ .collect(Collectors.toList());
+ BigDecimal remain = amount;
+ for (TBill bill : result) {
+ //如果剩余金额小于账单欠费金额，则
+ if (remain.compareTo(bill.getOutstandingMoney())<=0){
+ TBill param = new TBill();
+ param.setId(bill.getId());
+ param.setPayFeesMoney(remain);
+ TBill tBill = lockAndUpdateInfo(param, 2);
+ if (consumer!=null){
+ consumer.accept(tBill);
+ }
+ break;
+ }
+ remain = remain.subtract(bill.getOutstandingMoney());
+ TBill param = new TBill();
+ param.setId(bill.getId());
+ param.setPayFeesMoney(bill.getOutstandingMoney());
+ TBill tBill = lockAndUpdateInfo(param, 2);
+ if (consumer!=null){
+ consumer.accept(tBill);
+ }
+ }
return true;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void saveBill(TbillSaveDto bill) {
+ save(bill);
+ if (bill.getBillType().equals("3")){
+ if (bill.getDetails()==null || bill.getDetails().size()==0){
+ throw new ServiceException("生活费用列表不能为空");
+ }
+ for (TBillDetail detail : bill.getDetails()) {
+ detail.setBillId(bill.getId());
+ tBillDetailService.save(detail);
+ }
+ }
+ }
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean checkOfflinePay(OfflinePayCheckDto dto) {
+ TBillDto bill = getDetailByBillId(dto.getBillId());
+ if (dto.getPayType()==1){ //银行
+ if (StringUtils.isEmpty(dto.getFlowId())){
+ throw new ServiceException("银行流水ID不能为空");
+ }
+ TBankFlow bankflow = tBankFlowService.getById(dto.getFlowId());
+ if (bankflow.getRemainingMoney().compareTo(BigDecimal.ZERO)<=0){
+ throw new ServiceException("该流水已无可抵扣剩余金额");
+ }
+ if (bankflow.getRemainingMoney().compareTo(dto.getAmount())<0){
+ throw new ServiceException("实付金额不能高于于流水可抵扣剩余金额");
+ }
+ //如果实付金额大于欠费金额
+ if (dto.getAmount().compareTo(bill.getOutstandingMoney())>0){
+ throw new ServiceException("实付金额不能高于该账单欠费金额");
+ }
+ TBill billSave = new TBill();
+ billSave.setId(bill.getId());
+ billSave.setPayFeesMoney(dto.getAmount());
+ billSave.setBankSerialNumber(bankflow.getBankSerialNumber());
+ billSave.setPayFeesTime(bankflow.getPayTime());
+ billSave.setVoucher(dto.getVoucher());
+ billSave.setPayFeesType(2);
+ TBill back = lockAndUpdateInfo(billSave, 2);
+ TBankFlow saveBankFlow = new TBankFlow();
+ saveBankFlow.setId(bankflow.getId());
+ saveBankFlow.setDeductionMoney(bankflow.getDeductionMoney().add(dto.getAmount()));
+ BigDecimal subtract = bankflow.getRemainingMoney().subtract(dto.getAmount());
+ saveBankFlow.setRemainingMoney(subtract);
+ if (BigDecimal.ZERO.compareTo(subtract) == 0){
+ saveBankFlow.setFlowStatus(1);
+ }
+ tBankFlowService.updateById(saveBankFlow);
+ //更新银行流水的已抵扣金额和剩余可抵扣金额
+
+ //存流水
+ TFlowManagement save = new TFlowManagement();
+ save.setPayType(3);
+ save.setPayer(dto.getPayer());
+ save.setPayTime(bankflow.getPayTime());
+ save.setSysSerialNumber(OrderNos.getDid(30));
+ save.setBankSerialNumber(bankflow.getBankSerialNumber());
+ save.setFlowType(2);
+ save.setPaymentBillId(back.getId());
+ save.setDeductionMoney(back.getDeductionMoney());
+ save.setFlowMoney(dto.getAmount());
+ save.setRemainingMoney(back.getOutstandingMoney());
+ save.setPreOutstand(back.getPreOutstand());
+ tFlowManagementService.save(save);
+ return true;
+ }
+ //现金支付
+ TBill billSave = new TBill();
+ billSave.setId(bill.getId());
+ billSave.setPayFeesMoney(dto.getAmount());
+ billSave.setPayFeesTime(dto.getPayTime()!=null?dto.getPayTime():DateUtils.dateToLocalDateTime(new Date()));
+ billSave.setVoucher(dto.getVoucher());
+ billSave.setPayFeesType(2);
+ TBill back = lockAndUpdateInfo(billSave, 2);
+
+ TFlowManagement save = new TFlowManagement();
+ save.setPayType(3);
+ save.setPayer(dto.getPayer());
+ save.setPayTime(billSave.getPayFeesTime());
+ save.setSysSerialNumber(OrderNos.getDid(30));
+ save.setFlowType(1);
+ save.setPaymentBillId(back.getId());
+ save.setDeductionMoney(back.getDeductionMoney());
+ save.setFlowMoney(dto.getAmount());
+ save.setRemainingMoney(back.getOutstandingMoney());
+ save.setPreOutstand(back.getPreOutstand());
+ tFlowManagementService.save(save);
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void completePay(ChargeBillRequest billRequest) {
+ String orderNo = billRequest.getMessage().getInfo().getInput1();
+ String uuid = UUID.fastUUID().toString();
+ boolean lock = redisCache.trylockLoop(CacheConstants.COMPLETE_PAY_LOCK_KEY + orderNo, uuid, 60);
+ if (lock){
+ TPayOrder order = tPayOrderService.getById(orderNo);
+ if (order==null){
+ throw new ServiceException("订单不存在");
+ }
+ if (StringUtils.isNotEmpty(order.getPayNo())){
+ log.info("订单号已处理：{}",orderNo);
+ return;
+ }
+ /**
+ * 更新订单状态
+ */
+ TPayOrder save = new TPayOrder();
+ save.setId(order.getId());
+ save.setStatus(1);
+ save.setPayNo(billRequest.getMessage().getInfo().getTraceNo());
+ save.setPayType(billRequest.getMessage().getHead().getChannel());
+ try {
+ save.setPayTime(DateUtils.parseDate(billRequest.getMessage().getHead().getTimeStamp(),"yyyyMMddHHmmssSSS"));
+ } catch (ParseException e) {
+ throw new ServiceException("日期格式化错误");
+ }
+ save.setCallbackTime(new Date());
+ BigDecimal payAmount = new BigDecimal(billRequest.getMessage().getInfo().getPayBillAmt());
+ save.setActPayAmount(payAmount
+ .multiply(AmountConstant.b100).longValue());
+ save.setStatus(1);
+ save.setPayInfo(billRequest.getMessage().toString());
+ tPayOrderService.updateById(save);
+ /**
+ * 更新账单状态
+ */
+ List<TOrderBill> orderBills = orderBillService.getByOrderNo(order.getId());
+ List<TBill> bills = orderBills.stream().map(ob -> getById(ob.getBillId())).collect(Collectors.toList());
+ lockAndUpdateByAmountBatch(bills,payAmount,(bill)->{
+ TFlowManagement saveFlow = new TFlowManagement();
+ saveFlow.setPayType(1);
+ saveFlow.setPayer(order.getUserId());
+ saveFlow.setPayTime(DateUtils.dateToLocalDateTime(save.getPayTime()));
+ saveFlow.setSysSerialNumber(OrderNos.getDid(30));
+ saveFlow.setBankSerialNumber(save.getPayNo());
+ saveFlow.setFlowType(2);
+ saveFlow.setPaymentBillId(bill.getId());
+ saveFlow.setDeductionMoney(bill.getDeductionMoney());
+ saveFlow.setFlowMoney(payAmount);
+ saveFlow.setRemainingMoney(bill.getOutstandingMoney());
+ saveFlow.setPreOutstand(bill.getPreOutstand());
+ tFlowManagementService.save(saveFlow);
+ });
+ TBankFlow bankFlow = new TBankFlow();
+ bankFlow.setPayType(1);
+ bankFlow.setPayer(order.getUserId());
+ bankFlow.setPayTime(DateUtils.dateToLocalDateTime(save.getPayTime()));
+ bankFlow.setBankSerialNumber(save.getPayNo());
+ bankFlow.setFlowMoney(payAmount);
+ bankFlow.setFlowStatus(1);
+ tBankFlowService.save(bankFlow);
+
+ }
+
+ }
+
+ /**
+ * 根据发票编号查询账单列表
+ * @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 && bill.getSmsStatus()==1
+ && (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 {
+ String name = bill.getPartyTwoName().length()>5?bill.getPartyTwoName().substring(0,5):bill.getPartyTwoName();
+ smsUtil.sendSms(bill.getPhone(), "2365726", new String[]{name});
+ 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.getMailLastTime()!=null && bill.getMailStatus()==1
+ && (System.currentTimeMillis()-bill.getMailLastTime().getTime()<mailUtil.getPro().getBillMailDelayPeriod()*60*1000L)){
+ throw new ServiceException("有账单最近一次发送的时间是:"+DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,bill.getMailLastTime()));
+ }
+ 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);
+ }
+
+ /**
+ * 收款、类型可能是现金、银行
+ * @param dto
+ * @return
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public Boolean cashPay(CachPayDto dto) {
+ TBill back = null;
+ TBankFlow bankflow = null;
+ if (dto.getPayType()==1){
+ if (StringUtils.isEmpty(dto.getFlowId())){
+ throw new ServiceException("银行流水不能为空");
+ }
+ bankflow = tBankFlowService.getById(dto.getFlowId());
+ TBillDto bill = getDetailByBillId(dto.getBillId());
+ if (bankflow.getRemainingMoney().compareTo(BigDecimal.ZERO)<=0){
+ throw new ServiceException("该流水已无可抵扣剩余金额");
+ }
+ if (bankflow.getRemainingMoney().compareTo(dto.getAmount())<0){
+ throw new ServiceException("实付金额不能高于于流水可抵扣剩余金额");
+ }
+ //如果实付金额大于欠费金额
+ if (dto.getAmount().compareTo(bill.getOutstandingMoney())>0){
+ throw new ServiceException("实付金额不能高于该账单欠费金额");
+ }
+ }
+ TBillDto bill = getDetailByBillId(dto.getBillId());
+ TBill billSave = new TBill();
+ billSave.setId(bill.getId());
+ billSave.setPayFeesMoney(dto.getAmount());
+ billSave.setBankSerialNumber(bankflow!=null?bankflow.getBankSerialNumber():null);
+ billSave.setPayFeesTime(bankflow!=null?bankflow.getPayTime():DateUtils.dateToLocalDateTime(new Date()));
+ billSave.setVoucher(dto.getVoucher());
+ billSave.setPayFeesType(2);
+ back = lockAndUpdateInfo(billSave, 2);
+ if (dto.getPayType()==1){
+ //更新银行流水的已抵扣金额和剩余可抵扣金额
+ TBankFlow saveBankFlow = new TBankFlow();
+ saveBankFlow.setId(bankflow.getId());
+ saveBankFlow.setDeductionMoney(bankflow.getDeductionMoney().add(dto.getAmount()));
+ BigDecimal subtract = bankflow.getRemainingMoney().subtract(dto.getAmount());
+ saveBankFlow.setRemainingMoney(subtract);
+ if (BigDecimal.ZERO.compareTo(subtract) == 0){
+ saveBankFlow.setFlowStatus(1);
+ }
+ tBankFlowService.updateById(saveBankFlow);
+ }
+ //存流水
+ TFlowManagement save = new TFlowManagement();
+ save.setPayType(3);
+ save.setPayer(dto.getPayer());
+ save.setPayTime(bankflow!=null?bankflow.getPayTime():DateUtils.dateToLocalDateTime(new Date()));
+ save.setSysSerialNumber(OrderNos.getDid());
+ save.setBankSerialNumber(bankflow!=null?bankflow.getBankSerialNumber():null);
+ save.setFlowType(dto.getPayType()==1?2:1);
+ save.setPaymentBillId(back.getId());
+ save.setDeductionMoney(back.getDeductionMoney());
+ save.setFlowMoney(dto.getAmount());
+ save.setRemainingMoney(back.getOutstandingMoney());
+ save.setPreOutstand(back.getPreOutstand());
+ tFlowManagementService.save(save);
+ return true;
+ }
+
+ @Override
+ public BillStatisticsDto statistics() {
+ BillStatisticsDto dto = new BillStatisticsDto();
+ dto.setRent(getBaseMapper().statisticsAllRent());
+ dto.setNopay(getBaseMapper().statisticsNoPay());
+ dto.setPayed(getBaseMapper().statisticsPayed());
+ dto.setOverdue(getBaseMapper().statisticsOverdue());
+ return dto;
+ }
+
+ @Override
+ public Integer batchBillCount(String userId, List<String> billIds) {
+ return this.baseMapper.batchBillCount(userId,billIds);
+ }
}
--
Gitblit v1.7.1