Просмотр исходного кода

判断变更项目父子数量

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
55ca9f9a21
1 измененных файлов с 42 добавлено и 18 удалено
  1. 42 18
      src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

+ 42 - 18
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -122,9 +122,9 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	@Autowired
 	@Autowired
 	private NewOrderDunService	newOrderDunService;
 	private NewOrderDunService	newOrderDunService;
 	@Autowired
 	@Autowired
-	private TChangeTaskMapper	TChangeTaskMapper;
+	private TChangeTaskMapper	tChangeTaskMapper;
 	@Autowired
 	@Autowired
-	private TChangeDunMapper	TChangeDunMapper;
+	private TChangeDunMapper	tChangeDunMapper;
 	@Autowired
 	@Autowired
 	private TOrderBillNewMapper tOrderBillNewMapper;
 	private TOrderBillNewMapper tOrderBillNewMapper;
 	
 	
@@ -165,7 +165,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					cd.setEffectiveCount(d.getEffectiveCount());
 					cd.setEffectiveCount(d.getEffectiveCount());
 					listcd.add(cd);
 					listcd.add(cd);
 				}
 				}
-				TChangeDunMapper.insertSelectiveList(listcd);
+				tChangeDunMapper.insertSelectiveList(listcd);
 			}
 			}
 			List<TChangeTask> listck=new ArrayList<>();
 			List<TChangeTask> listck=new ArrayList<>();
 			List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo());
 			List<TOrderTaskBo> listTask=tOrderTaskMapper.selectOrderTaskAll(t.getOrderNo());
@@ -186,7 +186,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 					ck.setTid(tt.getId());
 					ck.setTid(tt.getId());
 					listck.add(ck);
 					listck.add(ck);
 				}
 				}
-				TChangeTaskMapper.insertSelectiveList(listck);
+				tChangeTaskMapper.insertSelectiveList(listck);
 			}
 			}
 			if (t.getType()==OrderChangeType.TDTK.getCode()) {
 			if (t.getType()==OrderChangeType.TDTK.getCode()) {
 				OrderChangeLog ocl=new OrderChangeLog();
 				OrderChangeLog ocl=new OrderChangeLog();
@@ -505,6 +505,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		NewOrderChange  noc=new NewOrderChange();
 		NewOrderChange  noc=new NewOrderChange();
 		t.setProcessState(1);
 		t.setProcessState(1);
 		noc.setId(t.getId());
 		noc.setId(t.getId());
+		chekeChangeTaskNumber(noc);
 		if (changeType==0) {
 		if (changeType==0) {
 			noc.setRemarks(t.getRemarks());
 			noc.setRemarks(t.getRemarks());
 			noc.setType(t.getType());
 			noc.setType(t.getType());
@@ -528,9 +529,32 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			noc.setCwCost(t.getCwCost());
 			noc.setCwCost(t.getCwCost());
 			noc.setRefundableAmount(t.getRefundableAmount());
 			noc.setRefundableAmount(t.getRefundableAmount());
 		}
 		}
+		
 		if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
 		if(changeType!=1)newOrderChangeMapper.updateByPrimaryKeySelective(noc);
 		return 1; 
 		return 1; 
 	}
 	}
+	
+	/**
+	   *   判断变更项目是否拆分父子数量是否一直
+	 * @param noc
+	 */
+	private void chekeChangeTaskNumber(NewOrderChange noc) {
+		List<TChangeTaskOut> list=tChangeTaskMapper.selectByCid(noc.getId());
+		//x记录父值y记录子值
+		int x=0;
+		int y=0;
+		
+		for (TChangeTaskOut tcto : list) {
+			if (tcto.getSplitStatus()==1) {
+				x=tcto.getCommodityQuantity();
+			}else if (tcto.getSplitStatus()==2) {
+				y+=tcto.getCommodityQuantity();
+			}
+		}
+		if (x!=y) {
+			throw new BusinessException("变更子项目与父项目数量不符");
+		}
+	}
 	@Override
 	@Override
 	public int addOrderRefundInvoice(OrderRefundInvoice o) {
 	public int addOrderRefundInvoice(OrderRefundInvoice o) {
 		o.setCreateTime(new Date());
 		o.setCreateTime(new Date());
@@ -614,7 +638,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	}
 	}
 
 
 	private void pushTaskAndDun(Integer id,String orderNo) {
 	private void pushTaskAndDun(Integer id,String orderNo) {
-		List<TChangeTaskOut> listct=TChangeTaskMapper.selectByCid(id);
+		List<TChangeTaskOut> listct=tChangeTaskMapper.selectByCid(id);
 		for (TChangeTaskOut cd : listct) {
 		for (TChangeTaskOut cd : listct) {
 			TOrderTask ot=new TOrderTask();
 			TOrderTask ot=new TOrderTask();
 			if (cd.getType()==1) {
 			if (cd.getType()==1) {
@@ -629,7 +653,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			ot.setTaskStatus(0);
 			ot.setTaskStatus(0);
 			tOrderTaskMapper.insertSelective(ot);
 			tOrderTaskMapper.insertSelective(ot);
 			cd.setTid(ot.getId());
 			cd.setTid(ot.getId());
-			TChangeTaskMapper.updateByPrimaryKeySelective(cd);
+			tChangeTaskMapper.updateByPrimaryKeySelective(cd);
 			}else if (cd.getType()==2) {
 			}else if (cd.getType()==2) {
 				ot.setId(cd.getTid());
 				ot.setId(cd.getTid());
 				ot.setCommodityPrice(cd.getCommodityPrice());
 				ot.setCommodityPrice(cd.getCommodityPrice());
@@ -639,7 +663,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
 				tOrderTaskMapper.deleteByPrimaryKey(cd.getTid());
 			}
 			}
 		}
 		}
-		List<TChangeDunOut> listcd=TChangeDunMapper.selectByCid(id);
+		List<TChangeDunOut> listcd=tChangeDunMapper.selectByCid(id);
 		for (TChangeDunOut cd : listcd) {
 		for (TChangeDunOut cd : listcd) {
 			NewOrderDun nd=new NewOrderDun();
 			NewOrderDun nd=new NewOrderDun();
 			if (cd.getType()==1) {
 			if (cd.getType()==1) {
@@ -787,34 +811,34 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 			@Override
 			@Override
 			public int addChangeTask(TChangeTask t) {
 			public int addChangeTask(TChangeTask t) {
 				t.setType(1);
 				t.setType(1);
-				return TChangeTaskMapper.insertSelective(t);
+				return tChangeTaskMapper.insertSelective(t);
 			}
 			}
 
 
 			@Override
 			@Override
 			public int addChangeDun(TChangeDun d) {
 			public int addChangeDun(TChangeDun d) {
 				d.setAid(TokenManager.getAdminId());
 				d.setAid(TokenManager.getAdminId());
 				d.setType(1);
 				d.setType(1);
-				return TChangeDunMapper.insertSelective(d);
+				return tChangeDunMapper.insertSelective(d);
 			}
 			}
 
 
 			@Override
 			@Override
 			public int deleteChangeTask(Integer id) {
 			public int deleteChangeTask(Integer id) {
-				return TChangeTaskMapper.deleteByPrimaryKey(id);
+				return tChangeTaskMapper.deleteByPrimaryKey(id);
 			}
 			}
 
 
 			@Override
 			@Override
 			public int deleteChangeDun(Integer id) {
 			public int deleteChangeDun(Integer id) {
-				return TChangeDunMapper.deleteByPrimaryKey(id);
+				return tChangeDunMapper.deleteByPrimaryKey(id);
 			}
 			}
 
 
 			@Override
 			@Override
 			public List<TChangeTaskOut> selectChangeTask(Integer cid) {
 			public List<TChangeTaskOut> selectChangeTask(Integer cid) {
-				return TChangeTaskMapper.selectByCid(cid);
+				return tChangeTaskMapper.selectByCid(cid);
 			}
 			}
 
 
 			@Override
 			@Override
 			public List<TChangeDunOut> selectChangeDun(Integer cid) {
 			public List<TChangeDunOut> selectChangeDun(Integer cid) {
-				return TChangeDunMapper.selectByCid(cid);
+				return tChangeDunMapper.selectByCid(cid);
 			}
 			}
 
 
 			@Override
 			@Override
@@ -823,21 +847,21 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 				if(t.getTid()!=null) {
 				if(t.getTid()!=null) {
 					//type 0正常 1新增 2修改 3删除
 					//type 0正常 1新增 2修改 3删除
 					if (t.getType()==3) {
 					if (t.getType()==3) {
-						TChangeDunMapper.updateByTid(t.getTid(),3);
+						tChangeDunMapper.updateByTid(t.getTid(),3);
 					}else if(t.getType()==2){
 					}else if(t.getType()==2){
-						TChangeDunMapper.updateByTid(t.getTid(),2);
+						tChangeDunMapper.updateByTid(t.getTid(),2);
 					}
 					}
 				}else {
 				}else {
 					if (t.getType()==3) {
 					if (t.getType()==3) {
-						TChangeDunMapper.deleteByTid(t.getTid());
+						tChangeDunMapper.deleteByTid(t.getTid());
 					}
 					}
 				}
 				}
-				return TChangeTaskMapper.updateByPrimaryKeySelective(t);
+				return tChangeTaskMapper.updateByPrimaryKeySelective(t);
 			}
 			}
 
 
 			@Override
 			@Override
 			public int updateChangeDun(TChangeDun t) {
 			public int updateChangeDun(TChangeDun t) {
-				return TChangeDunMapper.updateByPrimaryKeySelective(t);
+				return tChangeDunMapper.updateByPrimaryKeySelective(t);
 			}
 			}
 
 
 			@Override
 			@Override