|
|
@@ -814,11 +814,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}else if (nob.getType()==OrderChangeType.ZS.getCode()) {
|
|
|
pushTaskAndDun(nob.getId(),o);
|
|
|
}else if(nob.getType()==OrderChangeType.TDTK.getCode()) {
|
|
|
- //先将业务锁关闭 退单退款不做任何处理
|
|
|
-// List<String> list=tOrderTaskMapper.getLockId(nb.getOrderNo(),o.getSalesmanId(),o.getBuyerId());
|
|
|
-// if(!list.isEmpty())userLockReleaseMapper.updateReleaseList(list);
|
|
|
-// int i=userLockReleaseMapper.selectByUidGetCount(o.getSalesmanId(),o.getBuyerId());
|
|
|
-// if (i<1) userLockReleaseMapper.updateReleaseUser(o.getOrderNo());
|
|
|
+ o.setTotalAmount(nob.getTotalAmount());
|
|
|
+ if (nob.getFirstAmount()!=null)o.setFirstAmount(nob.getFirstAmount());
|
|
|
+ pushTaskAndDun(nob.getId(),o);
|
|
|
}
|
|
|
//
|
|
|
o.setProcessStatus(orderProjectService.getOrderProcessStatus(nb.getOrderNo()));
|