Browse Source

变更退票审核人员处理

anderx 3 years ago
parent
commit
dfdc599995

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

@@ -649,7 +649,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			if (str.length()>0)noc.setExamineName(str.substring(0,str.length()-1));
 
 		}else if (noc.getProcessState()== OrderChangeProcess.ZC.getCode()||noc.getProcessState()== OrderChangeProcess.DSZ.getCode()){
-			noc.setExamineName("");
+			if(noc.getStatus()==2){
+				TOrderNewBo ton = tOrderNewMapper.getSaleIdByOno(noc.getOrderNo());
+				OrganizationListOut dep = departmentMapper.selectAllById(ton.getOrderDep());
+				noc.setExamineName(dep.getFinanceName());
+			}else {
+				noc.setExamineName("");
+			}
 		}
 	}
 

+ 5 - 5
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -493,7 +493,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 			TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
 			pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t.getApproval());
-
+			if (t.getOrderDep()!=null){
+				OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
+				t.setExamineName(dep.getManagerName());
+			}
 		}
 		if (t2.getApproval().equals(ApprovalNewState.ZCBH.getCode()) ||
 				t2.getApproval().equals(ApprovalNewState.DSZBH.getCode()) ||
@@ -516,10 +519,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.setLiquidationStatus(LiquidationNewState.WAIT_PAY_FIRST_BALANCE.getCode());
 			}
 		}
-		if (t.getOrderDep()!=null){
-			OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
-			t.setExamineName(dep.getManagerName());
-		}
+
 
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}