|  |  |  | @ -821,7 +821,28 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC | 
			
		
	
		
			
				
					|  |  |  |  |         }); | 
			
		
	
		
			
				
					|  |  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     public void confirmFinishOrder(CollectOrderRequest collectOrderRequest, AuthAdmin authAdmin) { | 
			
		
	
		
			
				
					|  |  |  |  |         IoCollectOrder collectOrder = new IoCollectOrder(); | 
			
		
	
		
			
				
					|  |  |  |  |         BeanUtils.copyProperties(collectOrderRequest, collectOrder); | 
			
		
	
		
			
				
					|  |  |  |  |         collectOrder.setTagStatus(3); | 
			
		
	
		
			
				
					|  |  |  |  |         collectOrder.setUpdateTime(new Date()); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         //插入备用表
 | 
			
		
	
		
			
				
					|  |  |  |  |         IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup(); | 
			
		
	
		
			
				
					|  |  |  |  |         BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup); | 
			
		
	
		
			
				
					|  |  |  |  |         ioCollectOrderBackupService.save(ioCollectOrderBackup); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         //删除原来单据
 | 
			
		
	
		
			
				
					|  |  |  |  |         removeOrderByBillNo(collectOrder); | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |         ThreadUtil.execAsync(() -> { | 
			
		
	
		
			
				
					|  |  |  |  |             //插入到码表
 | 
			
		
	
		
			
				
					|  |  |  |  |             collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo()); | 
			
		
	
		
			
				
					|  |  |  |  |             //更新数据至第三方系统
 | 
			
		
	
		
			
				
					|  |  |  |  |             //单据更新
 | 
			
		
	
		
			
				
					|  |  |  |  |             ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo(), authAdmin); | 
			
		
	
		
			
				
					|  |  |  |  |         }); | 
			
		
	
		
			
				
					|  |  |  |  |     } | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |  |     private void removeOrderByBillNo(IoCollectOrder collectOrder) { | 
			
		
	
	
		
			
				
					|  |  |  | 
 |