Browse Source

新增订单项目、催款为空的可能判断

anderx 3 years ago
parent
commit
3b7fc6210d

+ 4 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -1331,11 +1331,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		List<OutNewOrderDunBo> tOrderDuns = newOrderDunMapper.selectListNewOrderDun(t.getOrderNo(),null);
 		BigDecimal taskAmount=new BigDecimal(0);
 		for (TOrderTaskBo tOrderTaskBo : tOrderTaskBos) {
+			if (tOrderTaskBo.getCommodityPrice()!=null)
 			taskAmount=taskAmount.add(tOrderTaskBo.getCommodityPrice());
 		}
 		BigDecimal dunAmount=new BigDecimal(0);
 		for (OutNewOrderDunBo tOrderDun : tOrderDuns) {
-			dunAmount=dunAmount.add(tOrderDun.getMoney());
+			if(tOrderDun.getMoney()!=null){
+				dunAmount=dunAmount.add(tOrderDun.getMoney());
+			}
 		}
 		if (orderAmount.compareTo(taskAmount)==0&&orderAmount.compareTo(dunAmount)==0){
 			return false;