|
@@ -167,6 +167,14 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
|
|
|
}
|
|
|
payMerchantListVO.setPayDeviceIdList(payDeviceIdList);
|
|
|
payMerchantListVO.setPayDeviceNameList(payDeviceNameList);
|
|
|
+ //密钥
|
|
|
+ Map<String, String> payConfigMap = JsonUtil.toMap(payMerchant.getPayConfig(), Map.class, String.class);
|
|
|
+ if (Objects.equals(payMerchant.getPayWayId().intValue(), PayWayEnum.ALI_PAY.getPayWayId())) {
|
|
|
+ payMerchantListVO.setSecretKey(payConfigMap.get("alipayPublicKey"));
|
|
|
+ }
|
|
|
+ if (Objects.equals(payMerchant.getPayWayId().intValue(), PayWayEnum.WX_PAY.getPayWayId())) {
|
|
|
+ payMerchantListVO.setSecretKey(payConfigMap.get("apiKey"));
|
|
|
+ }
|
|
|
return payMerchantListVO;
|
|
|
}
|
|
|
|