From 3f53b494bf076217e4dfaac5a1fe742a52c6b100 Mon Sep 17 00:00:00 2001 From: dalong306 <304592994@qq.com> Date: Thu, 23 Dec 2021 17:19:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88mid=E5=8A=A000-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../merchants/core/impls/ClientManagerImpl.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java index 7b21fc425..b810e8d57 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java @@ -571,16 +571,10 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid config.put("pid", contract.getPid()); config.put("mid", contract.getMid()); config.put("mcc", contract.getMccCode()); - logger.info("=====>mid:"+config.getString("channel")+":"+config.getString("mid")); } else { config.put("enable", false); //aps渠道的默认值展示 - if(channelApi.channel()==PayChannel.ALIPAY_APS_CASHIER.getChannelCode()){ - config.put("mid", PlatformEnvironment.getEnv().getApsOnlinePrefix()+client.getString("client_moniker")); - }else if(channelApi.channel()==PayChannel.ALIPAY_APS_IN_STORE.getChannelCode()){ - config.put("mid", client.getString("client_moniker")); - } - logger.info("=====>mid2:"+config.getString("channel")+":"+config.getString("mid")); + config.put("mid", client.getString("client_moniker")); } channelPermissions.put(channelApi.channel().toLowerCase(), config); } catch (Exception e) { @@ -7191,12 +7185,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid mid = mchChannelContractDAO.getMid(); } else { mid = client.getString("client_moniker"); - PayChannel channel = isRetail ? PayChannel.ALIPAY_APS_IN_STORE : PayChannel.ALIPAY_APS_CASHIER; - if (channel == PayChannel.ALIPAY_APS_CASHIER) { - String apsOnlinePrefix = PlatformEnvironment.getEnv().getApsOnlinePrefix() != null ? - PlatformEnvironment.getEnv().getApsOnlinePrefix() : "00-"; - mid = apsOnlinePrefix + mid; - } } client.put("mid", mid); AlipayApsMerchantRegister alipayApsMerchantRegister = Optional.ofNullable(merchantChannelApplicationManager.getRegister(AlipayApsMerchantRegister.class)).orElseThrow(() -> new ServerErrorException("No AlipayAps registry found"));