mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-26 05:55:03 +08:00
update 支付宝小程序
This commit is contained in:
@@ -70,9 +70,21 @@ public interface PileMerchantInfoService {
|
||||
*/
|
||||
public int deletePileMerchantInfoById(Long id);
|
||||
|
||||
PileMerchantInfo getFirstLevelMerchantByAppId(String appId);
|
||||
/**
|
||||
* 根据微信appId查询一级运营商信息
|
||||
* @param wxAppId 微信appId
|
||||
* @return
|
||||
*/
|
||||
PileMerchantInfo getFirstLevelMerchantByWxAppId(String wxAppId);
|
||||
|
||||
/**
|
||||
/**
|
||||
* 根据支付宝appId查询一级运营商信息
|
||||
* @param alipayAppId 微信appId
|
||||
* @return
|
||||
*/
|
||||
PileMerchantInfo getFirstLevelMerchantByAlipayAppId(String alipayAppId);
|
||||
|
||||
/**
|
||||
* 通过微信小程序appId查询一级运营商merchantId
|
||||
* @param wechatAppId 微信小程序appId
|
||||
* @return 一级运营商merchantId
|
||||
|
||||
@@ -293,15 +293,28 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
|
||||
|
||||
/**
|
||||
* 通过微信小程序appId查询一级运营商merchant对象
|
||||
* @param appId 微信小程序appId
|
||||
* @param wxAppId 微信小程序appId
|
||||
* @return 一级运营商merchant对象
|
||||
*/
|
||||
@Override
|
||||
public PileMerchantInfo getFirstLevelMerchantByAppId(String appId) {
|
||||
if (StringUtils.isBlank(appId)) {
|
||||
public PileMerchantInfo getFirstLevelMerchantByWxAppId(String wxAppId) {
|
||||
if (StringUtils.isBlank(wxAppId)) {
|
||||
return null;
|
||||
}
|
||||
return pileMerchantInfoMapper.getFirstLevelMerchantByAppId(appId);
|
||||
return pileMerchantInfoMapper.getFirstLevelMerchantByWxAppId(wxAppId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 通过支付宝小程序appId查询一级运营商merchant对象
|
||||
* @param alipayAppId 支付宝小程序appId
|
||||
* @return 一级运营商merchant对象
|
||||
*/
|
||||
@Override
|
||||
public PileMerchantInfo getFirstLevelMerchantByAlipayAppId(String alipayAppId) {
|
||||
if (StringUtils.isBlank(alipayAppId)) {
|
||||
return null;
|
||||
}
|
||||
return pileMerchantInfoMapper.getFirstLevelMerchantByAlipayAppId(alipayAppId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -312,7 +325,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
|
||||
@Override
|
||||
public String getFirstLevelMerchantIdByWxAppId(String wechatAppId) {
|
||||
String merchantId = null;
|
||||
PileMerchantInfo merchant = getFirstLevelMerchantByAppId(wechatAppId);
|
||||
PileMerchantInfo merchant = getFirstLevelMerchantByWxAppId(wechatAppId);
|
||||
if (Objects.nonNull(merchant)) {
|
||||
merchantId = String.valueOf(merchant.getId());
|
||||
}
|
||||
@@ -327,7 +340,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
|
||||
@Override
|
||||
public String getFirstLevelMerchantIdByAliAppId(String alipayAppId) {
|
||||
String merchantId = null;
|
||||
PileMerchantInfo merchant = getFirstLevelMerchantByAppId(alipayAppId);
|
||||
PileMerchantInfo merchant = getFirstLevelMerchantByAlipayAppId(alipayAppId);
|
||||
if (Objects.nonNull(merchant)) {
|
||||
merchantId = String.valueOf(merchant.getId());
|
||||
}
|
||||
@@ -467,7 +480,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
|
||||
*/
|
||||
@Override
|
||||
public List<String> getDeptIdsByAppId(String appId) {
|
||||
return pileMerchantInfoMapper.getDeptIdsByAppId(appId);
|
||||
return pileMerchantInfoMapper.getDeptIdsByWxAppId(appId);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -494,7 +507,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
|
||||
*/
|
||||
@Override
|
||||
public String getDelayModeByWechatAppId(String wechatAppId) {
|
||||
PileMerchantInfo merchant = getFirstLevelMerchantByAppId(wechatAppId);
|
||||
PileMerchantInfo merchant = getFirstLevelMerchantByWxAppId(wechatAppId);
|
||||
if (merchant == null) {
|
||||
throw new BusinessException(ReturnCodeEnum.CODE_GET_FIRST_LEVEL_MERCHANT_BY_APP_ID);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user