Explorar o código

会员项目审核重复审核BUG修复

anderx %!s(int64=2) %!d(string=hai) anos
pai
achega
a3890e2fb7

+ 1 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -353,7 +353,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 
 
 	/**
-	 * 订单审核
+	 * 订单审核.营销管理员审核
 	 */
 	@RequestMapping(value="/auditOrderNew", method = RequestMethod.POST)
 	public Result auditOrderNew(String orderNo,Integer orderStatus,String reason){

+ 10 - 1
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1302,6 +1302,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@Override
 	public int pushExamineMemberProject(InputMenber in) {
 		TOrderTask task=tOrderTaskMapper.selectByPrimaryKey(in.getId());
+		String aid=TokenManager.getAdminId();
 		Integer status=1;
 		//是否财务审核加复审
 		boolean flag=false;
@@ -1317,9 +1318,17 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			if (in.getType()==0){
 				if(task.getProcessStatus()!=1)throw  new BusinessException("审核状态错误");
 				List<TOrderExamine> list = tOrderExamineMapper.selectByTid(task.getId());
+				list.stream().forEach(e ->{
+					if (e.getAid().equals(aid)){
+						TOrderExamine te=new TOrderExamine();
+						te.setId(e.getId());
+						te.setStatus(1);
+						tOrderExamineMapper.updateByPrimaryKeySelective(te);
+					}
+						});
 				OrganizationListOut dep = tOrderNewMapper.selectOrderFinance(task.getOrderNo());
 				int examineType =task.getExamineType();
-				String aid=TokenManager.getAdminId();
+
 				if (aid.equals(dep.getFinanceId())){
 					if (examineType==3){
 						examineType=2;