autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

支付宝登录

Browse Source
This commit is contained in:
Guoqs
2024-06-11 17:01:44 +08:00
parent 0290db1914
commit 6d5b436393
8 changed files with 18 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-pile/src/main/java/com/jsowell/pile/service/PileMerchantInfoService.java
View File

@@ -75,7 +75,7 @@ public interface PileMerchantInfoService {
* @param appId 微信小程序appId
* @return 一级运营商merchantId
*/
String getFirstLevelMerchantIdByAppId(String appId);
String getFirstLevelMerchantIdByWxAppId(String appId);
MerchantInfoVO getMerchantInfoVO(String merchantId);

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -3480,7 +3480,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
if (StringUtils.isNotBlank(dto.getAppId())) {
// 校验启动桩使用的小程序，和充电桩所属一级运营商是否一致
String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(dto.getAppId());
String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(dto.getAppId());
String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId());
if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) {
throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致");

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java
View File

@@ -298,7 +298,7 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
* @return 一级运营商merchantId
*/
@Override
public String getFirstLevelMerchantIdByAppId(String appId) {
public String getFirstLevelMerchantIdByWxAppId(String appId) {
String merchantId = null;
PileMerchantInfo merchant = getFirstLevelMerchantByAppId(appId);
if (Objects.nonNull(merchant)) {