|
|
@ -1602,8 +1602,8 @@ public class OrderInvoiceInfoServiceImpl implements OrderInvoiceInfoService { |
|
|
|
if(sykchbhsje.compareTo(BigDecimal.ZERO) > ConfigureConstant.INT_0 && sykchse.compareTo(BigDecimal.ZERO) > ConfigureConstant.INT_0){ |
|
|
|
if(sykchbhsje.compareTo(BigDecimal.ZERO) > ConfigureConstant.INT_0 && sykchse.compareTo(BigDecimal.ZERO) > ConfigureConstant.INT_0){ |
|
|
|
BigDecimal hzddHjbhsje = new BigDecimal(orderInfo.getHjbhsje()).abs(); |
|
|
|
BigDecimal hzddHjbhsje = new BigDecimal(orderInfo.getHjbhsje()).abs(); |
|
|
|
BigDecimal hzddHjse = new BigDecimal(orderInfo.getHjse()).abs(); |
|
|
|
BigDecimal hzddHjse = new BigDecimal(orderInfo.getHjse()).abs(); |
|
|
|
if (hzddHjbhsje.subtract(sykchbhsje).compareTo(BigDecimal.ZERO) >= ConfigureConstant.INT_0 |
|
|
|
if (hzddHjbhsje.subtract(sykchbhsje).compareTo(BigDecimal.ZERO) <= ConfigureConstant.INT_0 |
|
|
|
&& hzddHjse.subtract(sykchse).compareTo(BigDecimal.ZERO) >= ConfigureConstant.INT_0){ |
|
|
|
&& hzddHjse.subtract(sykchse).compareTo(BigDecimal.ZERO) <= ConfigureConstant.INT_0){ |
|
|
|
return R.ok().put(OrderManagementConstant.DATA,orderInvoiceData); |
|
|
|
return R.ok().put(OrderManagementConstant.DATA,orderInvoiceData); |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return R.error("蓝字剩余可冲红不含税金额小于负数订单不含税金额或税额");//改为常量
|
|
|
|
return R.error("蓝字剩余可冲红不含税金额小于负数订单不含税金额或税额");//改为常量
|
|
|
|