java/xizang.git

			@@ -3,6 +3,8 @@
			import com.alibaba.fastjson2.JSON;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.common.basic.PageInfo;
			import com.ruoyi.common.core.domain.AjaxResult;
			import com.ruoyi.common.core.domain.entity.SysRole;
			import com.ruoyi.common.constant.AmountConstant;
			import com.ruoyi.common.constant.CacheConstants;
			import com.ruoyi.common.core.redis.RedisCache;
			@@ -25,6 +27,9 @@
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			import java.time.LocalDateTime;
			import java.util.List;
			import java.util.stream.Collectors;
			import java.math.BigDecimal;
			import java.text.ParseException;
			import java.util.Collections;
			@@ -77,6 +82,19 @@
			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 +240,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 +253,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);