From 25bf814dd06441be292aee11da5f5de3544d4580 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 25 May 2021 13:25:00 +0800 Subject: [PATCH] fix cashout --- .../cashout/wx/WxCashOutAdapterService.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java index 36d0444ea..23d92f324 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/cashout/wx/WxCashOutAdapterService.java @@ -310,7 +310,7 @@ public class WxCashOutAdapterService implements CashOutAdapterService{ cashOut.setWxPayNo(detailId); String wxPayTime = returnMap.get("transfer_time"); cashOut.setWxPayTime(wxPayTime); - return new CashOutAdapterResult(true,EnumCashOutStatus.SUCCESS.getCode(),"微信零钱支付申请成功",returnMap); + return new CashOutAdapterResult(true,EnumCashOutStatus.SUCCESS.getCode(),"微信零钱支付查询成功",returnMap); }else if("FAILED".equals(realStatus)) { String msg = returnMap.get("reason"); return new CashOutAdapterResult(false,EnumCashOutStatus.FAIL.getCode(),msg,returnMap); @@ -320,13 +320,17 @@ public class WxCashOutAdapterService implements CashOutAdapterService{ } } else { log.error("微信零钱支付查询失败: " + response); - String errMsg = ""; - JSONObject errObj = errorQueryReqMap.getJSONObject(result_no); - if (errObj != null) { - errMsg = errObj.toJSONString(); - } else { - errMsg = returnMap.get("err_code_des"); + String errMsg = returnMap.get("err_code_des"); + String errCode = returnMap.get("err_code"); + if ("NOT_FOUND".equals(errCode)) { + return new CashOutAdapterResult(false,EnumCashOutStatus.FAIL.getCode(),errMsg,returnMap); } +// JSONObject errObj = errorQueryReqMap.getJSONObject(result_no); +// if (errObj != null) { +// errMsg = errObj.toJSONString(); +// } else { +// errMsg = returnMap.get("err_code_des"); +// } throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "微信零钱支付查询失败:"+errMsg); } }