|
@ -471,12 +471,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService |
|
|
record.setSubscriptionMoney(String.valueOf(sum)); |
|
|
record.setSubscriptionMoney(String.valueOf(sum)); |
|
|
BigDecimal reveivableMoney = new BigDecimal(record.getReveivableMoney()); |
|
|
BigDecimal reveivableMoney = new BigDecimal(record.getReveivableMoney()); |
|
|
BigDecimal noSubscriptionMoney = reveivableMoney.subtract(sum); |
|
|
BigDecimal noSubscriptionMoney = reveivableMoney.subtract(sum); |
|
|
if(noSubscriptionMoney.compareTo(BigDecimal.ZERO)<0){ |
|
|
record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney)); |
|
|
record.setNoSubscriptionMoney(String.valueOf(new BigDecimal("0"))); |
|
|
|
|
|
}else{ |
|
|
|
|
|
record.setNoSubscriptionMoney(String.valueOf(noSubscriptionMoney)); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
String busVinSid = record.getBusVinSid(); |
|
|
String busVinSid = record.getBusVinSid(); |
|
|
BusSalesOrderVehicle data = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(busVinSid).getData(); |
|
|
BusSalesOrderVehicle data = busSalesOrderVehicleFeign.fetchBySalesOrderVehiclerSid(busVinSid).getData(); |
|
|
if (null != data) { |
|
|
if (null != data) { |
|
|