|
|
@@ -796,7 +796,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
NewOrderChangeBo nob=newOrderChangeMapper.selectById(nb.getId());
|
|
|
// 变更类型 0退单退款 1项目及金额变更 2仅项目变更 3仅金额变更 4重报 5赠送
|
|
|
//退单退款不需改变内容
|
|
|
- if (nob.getType()==OrderChangeType.XMJJEBG.getCode()) {
|
|
|
+ if(nob.getType()==OrderChangeType.TDTK.getCode()) {
|
|
|
+ o.setTotalAmount(nob.getTotalAmount());
|
|
|
+ if (nob.getFirstAmount()!=null)o.setFirstAmount(nob.getFirstAmount());
|
|
|
+ pushTaskAndDun(nob.getId(),o);
|
|
|
+ }else if (nob.getType()==OrderChangeType.XMJJEBG.getCode()) {
|
|
|
o.setTotalAmount(nob.getTotalAmount());
|
|
|
if (nob.getFirstAmount()!=null)o.setFirstAmount(nob.getFirstAmount());
|
|
|
//处理项目及催款
|
|
|
@@ -813,10 +817,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
pushTaskAndDun(nob.getId(),o);
|
|
|
}else if (nob.getType()==OrderChangeType.ZS.getCode()) {
|
|
|
pushTaskAndDun(nob.getId(),o);
|
|
|
- }else if(nob.getType()==OrderChangeType.TDTK.getCode()) {
|
|
|
- o.setTotalAmount(nob.getTotalAmount());
|
|
|
- if (nob.getFirstAmount()!=null)o.setFirstAmount(nob.getFirstAmount());
|
|
|
- pushTaskAndDun(nob.getId(),o);
|
|
|
}
|
|
|
//
|
|
|
o.setProcessStatus(orderProjectService.getOrderProcessStatus(nb.getOrderNo()));
|