From c7b13dcf6bc32c6a172a716926f675b9d3ca67d2 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 8 Jan 2026 17:01:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/czg/task/EntryManagerTask.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java index e8662c092..080316734 100644 --- a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java +++ b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java @@ -60,8 +60,8 @@ public class EntryManagerTask { for (ShopDirectMerchant shopDirectMerchant : list) { String wechatMerchantId = ""; String alipayMerchantId = ""; - if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getWechatStatus())) { - QueryStatusResp wechatStatus = EntryManager.queryWechatEntryStatus(shopDirectMerchant.getMerchantCode()); + if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getWechatStatus()) && StrUtil.isNotBlank(shopDirectMerchant.getWechatApplyId())) { + QueryStatusResp wechatStatus = EntryManager.queryWechatEntryStatus(shopDirectMerchant.getWechatApplyId()); shopDirectMerchant.setWechatStatus(wechatStatus.getStatus()); shopDirectMerchant.setWechatErrorMsg(wechatStatus.getFailReason()); shopDirectMerchant.setWechatSignUrl(wechatStatus.getSignUrl()); @@ -69,8 +69,8 @@ public class EntryManagerTask { wechatMerchantId = wechatStatus.getThirdMerchantId(); } } - if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getAlipayStatus())) { - QueryStatusResp alipayStatus = EntryManager.queryAlipayEntryStatus(shopDirectMerchant.getMerchantCode()); + if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getAlipayStatus()) && StrUtil.isNotBlank(shopDirectMerchant.getAlipayOrderId())) { + QueryStatusResp alipayStatus = EntryManager.queryAlipayEntryStatus(shopDirectMerchant.getAlipayOrderId()); shopDirectMerchant.setAlipayStatus(alipayStatus.getStatus()); shopDirectMerchant.setAlipayErrorMsg(alipayStatus.getFailReason()); shopDirectMerchant.setAlipaySignUrl(alipayStatus.getSignUrl());