|
|
@@ -2011,13 +2011,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
TOrderNew tOrderNew=tOrderNewMapper.getOrderNewDetail(t.getOrderNo());
|
|
|
orderAmount=tOrderNew.getTotalAmount();
|
|
|
}
|
|
|
-
|
|
|
List<TOrderTaskBo> tOrderTaskBos = tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo(),3);
|
|
|
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());
|
|
|
+ if (tOrderTaskBo.getCommodityPrice()!=null){
|
|
|
+ taskAmount=taskAmount.add(tOrderTaskBo.getCommodityPrice());
|
|
|
+ }
|
|
|
}
|
|
|
BigDecimal dunAmount=new BigDecimal(0);
|
|
|
for (OutNewOrderDunBo tOrderDun : tOrderDuns) {
|