取消mid加00-

master
dalong306 3 years ago
parent a63def7e73
commit 3f53b494bf

@ -571,17 +571,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
config.put("pid", contract.getPid()); config.put("pid", contract.getPid());
config.put("mid", contract.getMid()); config.put("mid", contract.getMid());
config.put("mcc", contract.getMccCode()); config.put("mcc", contract.getMccCode());
logger.info("=====>mid:"+config.getString("channel")+":"+config.getString("mid"));
} else { } else {
config.put("enable", false); config.put("enable", false);
//aps渠道的默认值展示 //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")); config.put("mid", client.getString("client_moniker"));
} }
logger.info("=====>mid2:"+config.getString("channel")+":"+config.getString("mid"));
}
channelPermissions.put(channelApi.channel().toLowerCase(), config); channelPermissions.put(channelApi.channel().toLowerCase(), config);
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
@ -7191,12 +7185,6 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
mid = mchChannelContractDAO.getMid(); mid = mchChannelContractDAO.getMid();
} else { } else {
mid = client.getString("client_moniker"); 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); client.put("mid", mid);
AlipayApsMerchantRegister alipayApsMerchantRegister = Optional.ofNullable(merchantChannelApplicationManager.getRegister(AlipayApsMerchantRegister.class)).orElseThrow(() -> new ServerErrorException("No AlipayAps registry found")); AlipayApsMerchantRegister alipayApsMerchantRegister = Optional.ofNullable(merchantChannelApplicationManager.getRegister(AlipayApsMerchantRegister.class)).orElseThrow(() -> new ServerErrorException("No AlipayAps registry found"));

Loading…
Cancel
Save