Browse Source

订单新增高新纯咨询信息

anderx 3 years ago
parent
commit
5105d05e3f

+ 15 - 7
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -625,12 +625,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setChangeAmount(t.getChangeAmount());
 			noc.setApplicant(t.getApplicant());
 			noc.setStatus(1);//订单置为正常
-			TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
-			if (tOrderNew.getManagerName()!=null){
-				noc.setProcessState(OrderChangeProcess.YXJL.getCode());
-			}else {
-				noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
-			}
 			noc.setDepName(t.getDepName());
 			OrderChangeLog ocl=new OrderChangeLog();
 			ocl.setAuditor(TokenManager.getAdminId());
@@ -638,17 +632,31 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			ocl.setRemarks(startRemarks==null?"":startRemarks);
 			ocl.setChangeId(noc.getId());
 			ocl.setStatus(0);
-			if(t.getType()!=0)chekeAmout(t);
 			orderChangeLogMapper.insertSelective(ocl);
+			if(t.getType()!=0)chekeAmout(t);
 			TOrderNew ton=new TOrderNew();
 			ton.setOrderNo(noc.getOrderNo());
 			ton.setDeleteSign(2);
 			tOrderNewMapper.updateByPrimaryKeySelective(ton);
+			TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
+			if (tOrderNew.getManagerName()!=null){
+				noc.setProcessState(OrderChangeProcess.YXJL.getCode());
+			}else {
+				OrderChangeLog cl=new OrderChangeLog();
+				cl.setAuditor(TokenManager.getAdminId());
+				cl.setOrderNo(t.getOrderNo());
+				cl.setRemarks("未设置营销经理自动通过");
+				cl.setChangeId(noc.getId());
+				cl.setStatus(2);
+				orderChangeLogMapper.insertSelective(ocl);
+				noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
+			}
 			sendNotice(0, t);
 		}else  if (changeType==2) {
 			noc.setCwCost(t.getCwCost());
 			noc.setRefundableAmount(t.getRefundableAmount());
 		}
+
 		if(changeType!=2)pushOrderCangeProcess(noc);
 		if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
 		return 1;