java/xizang.git

			@@ -1,5 +1,6 @@
			package com.ruoyi.system.service.impl;

			import cn.hutool.core.date.DateUtil;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.ruoyi.common.basic.PageInfo;
			import com.ruoyi.common.config.SmsProperties;
			@@ -7,10 +8,7 @@
			import com.ruoyi.common.constant.CacheConstants;
			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.*;
			import com.ruoyi.common.utils.uuid.UUID;
			import com.ruoyi.system.dto.*;
			import com.ruoyi.system.mapper.TBillMapper;
			@@ -252,7 +250,7 @@
			throw new ServiceException("实付金额不能高于于流水可抵扣剩余金额");
			}
			//如果实付金额大于欠费金额
			if (dto.getAmount().compareTo(bill.getOutstandingMoney())>=0){
			if (dto.getAmount().compareTo(bill.getOutstandingMoney())>0){
			throw new ServiceException("实付金额不能高于该账单欠费金额");
			}

			@@ -276,6 +274,7 @@
			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());
			@@ -332,6 +331,7 @@
			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());
			@@ -464,7 +464,7 @@
			throw new ServiceException("实付金额不能高于于流水可抵扣剩余金额");
			}
			//如果实付金额大于欠费金额
			if (dto.getAmount().compareTo(bill.getOutstandingMoney())>=0){
			if (dto.getAmount().compareTo(bill.getOutstandingMoney())>0){
			throw new ServiceException("实付金额不能高于该账单欠费金额");
			}
			}