| 
					
				 | 
			
			
				@@ -1076,7 +1076,6 @@ public class PayOrderLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(!StringUtil.isEmpty(goodsType), WorkerOrder::getGoodsType, goodsType) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .like(!StringUtil.isEmpty(settlementType), WorkerOrder::getSettlementType, settlementType) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(!StringUtil.isEmpty(orderId), WorkerOrder::getOrderId, orderId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq( WorkerOrder::getPayStatus, "WAIT") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),WorkerOrder::getIdentity,currentCompanyWechat.getUser().getIdCard()) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1089,7 +1088,6 @@ public class PayOrderLogic { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .like(!StringUtil.isEmpty(settlementType), WorkerOrder::getSettlementType, settlementType) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(!StringUtil.isEmpty(orderId), WorkerOrder::getOrderId, orderId) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(WorkerOrder::getRefundStatus, IsYesNoEnum.NO.getKey()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq( WorkerOrder::getPayStatus, PayStatusEnum.PAID.getKey()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),WorkerOrder::getWorkerNumber,currentCompanyWechat.getUser().getWorkerNumber()) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .eq(StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()),WorkerOrder::getIdentity,currentCompanyWechat.getUser().getIdCard()) 
			 |