Browse Source

订单审核负责人开发

anderx 3 years ago
parent
commit
54c403f490

+ 2 - 0
src/main/java/com/goafanti/common/dao/AdminMapper.java

@@ -151,4 +151,6 @@ public interface AdminMapper {
 
 
     int selectByAmbIdCount(String id);
+
+    List<Admin> selectAdminByRoleType(String roleType);
 }

+ 12 - 0
src/main/java/com/goafanti/common/mapper/AdminMapper.xml

@@ -1102,4 +1102,16 @@
   <select id="selectByAmbIdCount" resultType="java.lang.Integer">
     SELECT count(*) from admin where amb_id= #{ambId}
   </select>
+  <select id="selectAdminByRoleType" resultType="com.goafanti.common.model.Admin">
+    SELECT a.id,a.name ,a.mobile ,a.email
+    FROM admin a left join user_role b on a.id=b.uid
+                 left join `role` c on b.rid =c.id
+    where 1=1
+      <if test="roleType =='99998'">
+      and c.role_type  in ('99998','99988')
+      </if>
+    <if test="roleType =='99999'">
+      and c.role_type  in ('99999','99989')
+    </if>
+  </select>
 </mapper>

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -213,4 +213,6 @@ public interface OrderNewService {
 	int updateSalesType(TOrderNew in);
 
 	void addTaskMid(Integer id, String commodityId, String orderNo);
+
+	void pushExamineName(TOrderNew t);
 }

+ 2 - 7
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -12,6 +12,7 @@ import java.util.UUID;
 
 import com.goafanti.admin.service.DepartmentService;
 import com.goafanti.common.dao.*;
+import com.goafanti.common.model.*;
 import com.goafanti.order.bo.TOrderTaskBo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -25,13 +26,6 @@ import com.goafanti.common.constant.AFTConstants;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.enums.OrderLogProcess;
 import com.goafanti.common.error.BusinessException;
-import com.goafanti.common.model.Admin;
-import com.goafanti.common.model.TOrderBack;
-import com.goafanti.common.model.TOrderBillNew;
-import com.goafanti.common.model.TOrderBonus;
-import com.goafanti.common.model.TOrderLog;
-import com.goafanti.common.model.TOrderNew;
-import com.goafanti.common.model.TOrderRefund;
 import com.goafanti.common.utils.AsyncUtils;
 import com.goafanti.common.utils.LoggerUtils;
 import com.goafanti.common.utils.StringUtils;
@@ -516,6 +510,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				aids.add(admin.getId());
 			}
 		}
+		orderNewService.pushExamineName(t);
 		TOrderLog tl=new TOrderLog();
 		tl.setAid(TokenManager.getAdminId());
 		tl.setOrderNo(t.getOrderNo());

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

@@ -516,6 +516,11 @@ 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);
 	}
 
@@ -894,6 +899,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		TOrderNew t= new TOrderNew();
 		TOrderNew t2= checkDeleteSign(orderNo);
 		t.setOrderNo(orderNo);
+		t.setOrderDep(t2.getOrderDep());
 		List<String> aids = new ArrayList<>();
 		Integer type=null;
 		TOrderLog tl=new TOrderLog();
@@ -905,6 +911,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 					t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
 					//如果是转的暂时不删除外包信息
 					aids.add(departmentMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
+
+
 				} else if(outsource==1) {
 					for (Admin admin : adminMapper.getAdminRoleNameList("外包审核员")) {
 						aids.add(admin.getId());
@@ -943,6 +951,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				type=NoticeStatus.ORDER_NO.getCode();
 		}
 		t.setOrderStatus(orderStatus);
+		//设置审核人员名称
+		pushExamineName(t2);
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
 		if (aids.isEmpty()) {
 			throw new BusinessException(new Error( "邮件发送失败,对方设置邮箱错误","邮件发送失败,对方设置邮箱错误"));
@@ -951,7 +961,49 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
 		return 1;
 	}
+	@Override
+	public void pushExamineName(TOrderNew t){
+		StringBuffer str =new StringBuffer();
+		if (t.getProcessStatus()==ProcessStatus.YPYXY.getCode()){
+			Admin admin = adminMapper.selectByPrimaryKey(t.getSalesmanId());
+			t.setExamineName(admin.getName());
+		}else if (t.getProcessStatus()==ProcessStatus.YPCWZY.getCode()){
+			if (t.getOrderDep()!=null){
+				OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
+				t.setExamineName(dep.getFinanceName());
+			}
+		}else if (t.getProcessStatus()==ProcessStatus.YPYXGLY.getCode()){
+			if (t.getOrderDep()!=null){
+				OrganizationListOut dep = departmentMapper.selectAllById(t.getOrderDep());
+				t.setExamineName(dep.getManagerName());
+			}
+		}else if (t.getProcessStatus()==ProcessStatus.YPTPSH.getCode()){
+			if(t.getApproval()==ApprovalNewState.ZCDSH.getCode()){
+				List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.CED);
+				admins.forEach(e ->{
+					str.append(e.getName()).append(",");
+				});
+			}else if(t.getApproval()==ApprovalNewState.DSZDSH.getCode()) {
+				List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.APPROVAL_DECISION);
+				admins.forEach(e ->{
+					str.append(e.getName()).append(",");
+				});
+			}
+
+		}else if (t.getProcessStatus()==ProcessStatus.YPZXSGLY.getCode()){
+			List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN);
+			admins.forEach(e ->{
+				str.append(e.getName()).append(",");
+			});
+		}else if (t.getProcessStatus()==ProcessStatus.YPZXSGLY.getCode()){
+			List<Admin> admins = adminMapper.getAdminRoleTypeList(AFTConstants.TECH_ADMIN);
+			admins.forEach(e ->{
+				str.append(e.getName()).append(",");
+			});
+		}
+		if (StringUtils.isNotBlank(str))t.setExamineName(str.substring(0,str.length()-1));
 
+	}
 	/**
 	 *  订单分配触发
 	 * @param orderNo