|
|
@@ -32,14 +32,20 @@ public class BaseTtPayAdapterService { |
|
|
throws Exception { |
|
|
throws Exception { |
|
|
TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount); |
|
|
TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount); |
|
|
TtPayOrderQueryV2Result ttPayOrderQueryV2Result = ttPayService.queryOrderV2(null, oldRecord.getPayOrderNo()); |
|
|
TtPayOrderQueryV2Result ttPayOrderQueryV2Result = ttPayService.queryOrderV2(null, oldRecord.getPayOrderNo()); |
|
|
int code = getPayStatusFromOrderQueryResult(ttPayOrderQueryV2Result); |
|
|
|
|
|
PayQueryAdapterResult result = new PayQueryAdapterResult(code, EnumPayStatus.getEnum(code).getMessage(), |
|
|
|
|
|
ttPayOrderQueryV2Result.getPayChannel(), ttPayOrderQueryV2Result,ttPayOrderQueryV2Result.getPaymentOrderId(),ttPayOrderQueryV2Result.getPayTime()); |
|
|
|
|
|
|
|
|
if(ttPayOrderQueryV2Result != null){ |
|
|
|
|
|
int code = getPayStatusFromOrderQueryResult(ttPayOrderQueryV2Result); |
|
|
|
|
|
PayQueryAdapterResult result = new PayQueryAdapterResult(code, EnumPayStatus.getEnum(code).getMessage(), |
|
|
|
|
|
ttPayOrderQueryV2Result.getPayChannel(), ttPayOrderQueryV2Result,ttPayOrderQueryV2Result.getPaymentOrderId(),ttPayOrderQueryV2Result.getPayTime()); |
|
|
|
|
|
return result; |
|
|
|
|
|
}else{ |
|
|
|
|
|
return new PayQueryAdapterResult(EnumPayStatus.PAY_STATUS_ORDER_NOT_EXISTS.getCode(),EnumPayStatus.PAY_STATUS_ORDER_NOT_EXISTS.getMessage(), |
|
|
|
|
|
null,null,null,null); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// OrderQueryResult orderQueryResult = DouYinPayHelper.orderQuery(appInfo.getAppId(), payAccount.getApiKey(), oldRecord.getPayOrderNo(), null); |
|
|
// OrderQueryResult orderQueryResult = DouYinPayHelper.orderQuery(appInfo.getAppId(), payAccount.getApiKey(), oldRecord.getPayOrderNo(), null); |
|
|
// int code = DouYinPayHelper.getPayStatusFromOrderQueryResult(orderQueryResult,oldRecord.getPayOrderNo()); |
|
|
// int code = DouYinPayHelper.getPayStatusFromOrderQueryResult(orderQueryResult,oldRecord.getPayOrderNo()); |
|
|
// PayQueryAdapterResult result = new PayQueryAdapterResult(code, EnumPayStatus.getEnum(code).getMessage(),orderQueryResult.getWay(), orderQueryResult,oldRecord.getTransactionId(),orderQueryResult.getPayTime()); |
|
|
// PayQueryAdapterResult result = new PayQueryAdapterResult(code, EnumPayStatus.getEnum(code).getMessage(),orderQueryResult.getWay(), orderQueryResult,oldRecord.getTransactionId(),orderQueryResult.getPayTime()); |
|
|
return result; |
|
|
|
|
|
|
|
|
// return result; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private int getPayStatusFromOrderQueryResult(TtPayOrderQueryV2Result result){ |
|
|
private int getPayStatusFromOrderQueryResult(TtPayOrderQueryV2Result result){ |
|
|
|