diff --git a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java index c7a8779bc..949bd245e 100644 --- a/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/douyin/pay/impl/BaseTtPayServiceImpl.java @@ -155,6 +155,9 @@ public abstract class BaseTtPayServiceImpl implements TtPayService { if(baseTtPayResult.isSuccess()){ return baseTtPayResult.getData(); }else{ + if(baseTtPayResult.getErrNo().intValue() == 20000){//{"resp_extra":{"logid":"2022063015511301013817208218ADE787"},"err_tips":"订单不存在","err_no":20000} + return null; + } throw new TtPayException(baseTtPayResult.getErrTips()); } } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java index 3846524f2..edd03a70f 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/BaseTtPayAdapterService.java @@ -32,14 +32,20 @@ public class BaseTtPayAdapterService { throws Exception { TtPayService ttPayService = maUtil.getTtPayService(appInfo, payAccount); 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); // int code = DouYinPayHelper.getPayStatusFromOrderQueryResult(orderQueryResult,oldRecord.getPayOrderNo()); // 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){