anderx пре 3 година
родитељ
комит
5c2be6f9dc

+ 2 - 9
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -945,26 +945,19 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		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());
-			//处理项目及催款
-			pushTaskAndDun(nob.getId(),o);
-		}else if (nob.getType()==OrderChangeType.JXMBG.getCode()) {
-			pushTaskAndDun(nob.getId(),o);
 		}else if (nob.getType()==OrderChangeType.JJEBG.getCode()) {
 			o.setTotalAmount(nob.getTotalAmount());
 			if (nob.getFirstAmount()!=null)o.setFirstAmount(nob.getFirstAmount());
-			pushTaskAndDun(nob.getId(),o);
 		}else if (nob.getType()==OrderChangeType.CB.getCode()){
 			o.setTotalAmount(nob.getTotalAmount());
 			if (nob.getFirstAmount()!=null)o.setFirstAmount(nob.getFirstAmount());
-			pushTaskAndDun(nob.getId(),o);
 		}else if (nob.getType()==OrderChangeType.ZS.getCode()) {
-			pushTaskAndDun(nob.getId(),o);
 		}
-		//
+		//处理变更项目与催款新增在订单中
+		pushTaskAndDun(nob.getId(),o);
 		o.setProcessStatus(orderProjectService.getOrderProcessStatus(nb.getOrderNo()));
 		o.setDeleteSign(0);
 		//处理客户中间表退单标识