|
|
@@ -684,18 +684,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
Date date = new Date();
|
|
|
List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,null,0);
|
|
|
for (OutNewOrderDunBo o : list) {
|
|
|
- if (o.getDunType()==1) {
|
|
|
+ if (o.getDunType()==1) {
|
|
|
o.setStatus(1);
|
|
|
o.setStartTime(date);
|
|
|
newOrderDunMapper.updateByPrimaryKeySelective(o);
|
|
|
- TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
|
|
|
- tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));
|
|
|
- BigDecimal sum=tm.getOrderReceivables().subtract(b.getSettlementAmount());
|
|
|
- //如果金额大于欠款修改欠款为0
|
|
|
- if (sum.compareTo(new BigDecimal(0))<0)sum=new BigDecimal(0);
|
|
|
- tm.setOrderArrears(sum);
|
|
|
- if (tm.getDunStartTime()==null)tm.setDunStartTime(date);
|
|
|
- tOrderMidMapper.updateByPrimaryKeySelective(tm);
|
|
|
+ //催款统计算
|
|
|
+ TOrderMid tm = pushOrderMidDun(orderNo, b.getSettlementAmount(), date, o);
|
|
|
TArrearsDun t=new TArrearsDun();
|
|
|
t.setOrderArrears(tm.getOrderArrears());
|
|
|
t.setOrderReceivables(tm.getOrderReceivables());
|
|
|
@@ -713,8 +707,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
+ public TOrderMid pushOrderMidDun(String orderNo, BigDecimal settlementAmount, Date date, OutNewOrderDunBo o) {
|
|
|
+ TOrderMid tm=tOrderMidMapper.selectByOrderNo(orderNo);
|
|
|
+ tm.setOrderReceivables(tm.getOrderReceivables().add(o.getMoney()));
|
|
|
+ BigDecimal sum=tm.getOrderReceivables().subtract(settlementAmount);
|
|
|
+ //如果金额大于欠款修改欠款为0
|
|
|
+ if (sum.compareTo(new BigDecimal(0))<0)sum=new BigDecimal(0);
|
|
|
+ tm.setOrderArrears(sum);
|
|
|
+ if (tm.getDunStartTime()==null)tm.setDunStartTime(date);
|
|
|
+ tOrderMidMapper.updateByPrimaryKeySelective(tm);
|
|
|
+ return tm;
|
|
|
+ }
|
|
|
|
|
|
|
|
|
public void addNewDunNoticAndSendEmail(String orderNo, OutNewOrderDunBo o) {
|