|
|
@@ -1304,12 +1304,12 @@ public class WxFinanceServiceImpl implements WxFinanceService { |
|
|
//更新账单收款信息 |
|
|
//更新账单收款信息 |
|
|
String money = ""; |
|
|
String money = ""; |
|
|
BigDecimal oweDecimal = new BigDecimal(bill.getRemainReturnPrice()); |
|
|
BigDecimal oweDecimal = new BigDecimal(bill.getRemainReturnPrice()); |
|
|
//只有没有有欠款才会支付 |
|
|
|
|
|
if (new BigDecimal(bill.getOwe()).compareTo(b0) > 0 ) { |
|
|
|
|
|
throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"账单有欠缴,不能付款."); |
|
|
|
|
|
//noNeedCreate = true; |
|
|
|
|
|
//return noNeedCreate; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// //只有没有有欠款才会支付.如果是押金或者预充值类的, |
|
|
|
|
|
// if (new BigDecimal(bill.getOwe()).compareTo(b0) > 0 ) { |
|
|
|
|
|
// throw new MallinkException(ErrorCode.SYS_SERVER_ERROR.getCode(),"账单有欠缴,不能付款."); |
|
|
|
|
|
// //noNeedCreate = true; |
|
|
|
|
|
// //return noNeedCreate; |
|
|
|
|
|
// } |
|
|
//如果金额能覆盖应付 |
|
|
//如果金额能覆盖应付 |
|
|
if (calcuteDto.getTotalRemainPay().compareTo(oweDecimal) > 0 ) { |
|
|
if (calcuteDto.getTotalRemainPay().compareTo(oweDecimal) > 0 ) { |
|
|
money = oweDecimal.toPlainString(); |
|
|
money = oweDecimal.toPlainString(); |
|
|
|