|
|
@@ -998,33 +998,31 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
/**
|
|
|
* 订单分配触发
|
|
|
- * @param orderNo
|
|
|
*/
|
|
|
@Override
|
|
|
- public void pushOrderDun(String orderNo) {
|
|
|
- TOrderNew b=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ public void pushOrderDun(TOrderNew b) {
|
|
|
if(b.getApproval()==0){
|
|
|
Date date = new Date();
|
|
|
- List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(orderNo,0);
|
|
|
+ List<OutNewOrderDunBo> list=newOrderDunMapper.selectListNewOrderDun(b.getOrderNo(),0);
|
|
|
for (OutNewOrderDunBo o : list) {
|
|
|
if (o.getDunType()==1) {
|
|
|
o.setStatus(1);
|
|
|
o.setStartTime(date);
|
|
|
newOrderDunMapper.updateByPrimaryKeySelective(o);
|
|
|
//催款统计算
|
|
|
- TOrderMid tm = pushOrderMidDun(orderNo, b.getSettlementAmount(), date);
|
|
|
+ TOrderMid tm = pushOrderMidDun(b.getOrderNo(), b.getSettlementAmount(), date);
|
|
|
TArrearsDun t=new TArrearsDun();
|
|
|
t.setOrderArrears(tm.getOrderArrears());
|
|
|
t.setOrderReceivables(tm.getOrderReceivables());
|
|
|
- if (tArrearsDunMapper.checkOrderNo(orderNo,null)<1) {
|
|
|
- t.setOrderNo(orderNo);
|
|
|
+ if (tArrearsDunMapper.checkOrderNo(b.getOrderNo(),null)<1) {
|
|
|
+ t.setOrderNo(b.getOrderNo());
|
|
|
tArrearsDunMapper.insertSelective(t);
|
|
|
- }else if(tArrearsDunMapper.checkOrderNo(orderNo,0)>0){
|
|
|
- Integer i=tArrearsDunMapper.selectByStatus(orderNo, 0);
|
|
|
+ }else if(tArrearsDunMapper.checkOrderNo(b.getOrderNo(),0)>0){
|
|
|
+ Integer i=tArrearsDunMapper.selectByStatus(b.getOrderNo(), 0);
|
|
|
t.setId(i);
|
|
|
tArrearsDunMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
- addNewDunNoticAndSendEmail(orderNo,o);
|
|
|
+ addNewDunNoticAndSendEmail(b.getOrderNo(),o);
|
|
|
}
|
|
|
}
|
|
|
}
|