| 
				
				
					
				
				
				 | 
			
			 | 
			@@ -2,6 +2,7 @@ package com.iformall.service.pay.service.pay.ali; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.alibaba.fastjson.JSON; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.alibaba.fastjson.JSONObject; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.alipay.api.AlipayApiException; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.alipay.api.AlipayClient; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.alipay.api.request.AlipayTradeQueryRequest; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			import com.alipay.api.response.AlipayTradeQueryResponse; | 
		
		
	
	
		
			
				| 
				
					
				
				
					
				
				
				 | 
			
			 | 
			@@ -48,22 +49,28 @@ public class BaseAliPayAdapterService { | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
					bizContent.put("out_trade_no", orderPay.getOrderNumber()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
					request.setBizContent(bizContent.toString()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
					AlipayTradeQueryResponse response = alipayClient.execute(request); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
					try{ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
						AlipayTradeQueryResponse response = alipayClient.execute(request); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
					if(response.isSuccess()){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
						if("10000".equals(response.getCode())){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							PayQueryAdapterResult result = new PayQueryAdapterResult(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							result.setCode(getPayStatusFrom(response.getTradeStatus())); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							result.setTransactionId(response.getTradeNo()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							return result; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
						} | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
						if("ACQ.TRADE_NOT_EXIST".equals(response.getSubCode())){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							PayQueryAdapterResult result = new PayQueryAdapterResult(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							result.setCode(EnumPayOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							result.setMsg(EnumPayOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getMessage()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							return result; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
						if(response.isSuccess()){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							if("10000".equals(response.getCode())){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
								PayQueryAdapterResult result = new PayQueryAdapterResult(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
								result.setCode(getPayStatusFrom(response.getTradeStatus())); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
								result.setTransactionId(response.getTradeNo()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
								return result; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							} | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							if("ACQ.TRADE_NOT_EXIST".equals(response.getSubCode())){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
								PayQueryAdapterResult result = new PayQueryAdapterResult(); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
								result.setCode(EnumPayOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
								result.setMsg(EnumPayOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getMessage()); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
								return result; | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
							} | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
						} | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
					}catch(AlipayApiException e){ | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
						log.error("ali pay query error",e); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
					} | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
					throw new MallinkException(ErrorCode.PAY_ORDER_QUERY_ERROR); | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
				} | 
		
		
	
		
			
			 | 
			 | 
			
			 | 
			
  | 
		
		
	
	
		
			
				| 
				
					
				
				
				
				 | 
			
			 | 
			
  |