anderx лет назад: 7
Родитель
Сommit
3f5b728fe0

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

@@ -97,6 +97,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			return -1;
 		}
 		TOrderNew onew = new TOrderNew();
+		TOrderNew torder=tOrderNewMapper.selectByPrimaryKey(orderNo);
 		onew.setOrderNo(orderNo);
 		onew.setDeleteSign(0);//正常
 		onew.setApproval(approval);//特批状态
@@ -113,7 +114,6 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			TOrderNew record = new TOrderNew();
 			record.setOrderNo(orderNo);
 			record.setFinanceId(financeId);
-			TOrderNew torder=tOrderNewMapper.selectByPrimaryKey(orderNo);
 			if(torder.getProcessStatus()<ProcessStatus.YPZXSGLY.getCode()) {
 				record.setProcessStatus(ProcessStatus.YPCWZY.getCode());				
 			}

+ 6 - 2
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -68,8 +68,9 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setTaskAllocator(TokenManager.getAdminId());
 		t.setTaskReceiver(taskReceiverId);
 		t.setTaskDistributionTime(new Date());
-		tOrderTaskMapper.updateByPrimaryKeySelective(t);
+		updateOrder(t);
 		insetLog(taskId, taskReceiverId);
+		tOrderTaskMapper.updateByPrimaryKeySelective(t);
 		if (specially==0&&t.getCommodityQuantity()>1) {
 			for (int i = 0; i < t.getCommodityQuantity(); i++) {
 				TOrderTask tOrderTask=new TOrderTask();
@@ -85,6 +86,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 				}
 			}
 		}
+		return 1;
+	}
+
+	private void updateOrder(TOrderTask t) {
 		List<TOrderTaskBo> taskBos=tOrderTaskMapper.selectOrderTask(t.getOrderNo());
 		TOrderNew tNew=new TOrderNew();
 		tNew.setOrderNo(t.getOrderNo());
@@ -101,7 +106,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			tNew.setProcessStatus(ProcessStatus.YBFPZXSGLY.getCode());
 		}
 		tOrderNewMapper.updateByPrimaryKeySelective(tNew);
-		return 1;
 	}
 
 	private void insetLog(Integer taskId, String taskReceiverId) {