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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-26 15:30:14 +08:00
parent ce080bbf95
commit a4aace1e68
6 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jsowell-admin/src/main/java/com/jsowell/service/MemberService.java
View File

@@ -33,7 +33,6 @@ import com.jsowell.pile.dto.*;
import com.jsowell.pile.service.*;
import com.jsowell.pile.transaction.dto.MemberTransactionDTO;
import com.jsowell.pile.transaction.service.TransactionService;
import com.jsowell.pile.vo.base.StationInfoVO;
import com.jsowell.pile.vo.uniapp.*;
import com.jsowell.wxpay.service.WxAppletRemoteService;
import org.apache.commons.collections4.CollectionUtils;
@@ -121,7 +120,6 @@ public class MemberService {
public String memberRegisterAndLogin(MemberRegisterAndLoginDTO dto) {
// 校验短信验证码 两种情况不能通过校验，1-验证码错误；2-超时 验证码10分钟有效
checkVerificationCode(dto);
String merchantId = "";
return memberRegisterAndLogin(dto.getMobileNumber(), dto.getMerchantId(), dto.getOpenId());
}
@@ -139,7 +137,7 @@ public class MemberService {
// throw new BusinessException(ReturnCodeEnum.CODE_GET_MERCHANT_ID_BY_APP_ID_ERROR);
// }
// 查询手机号码是否注册过
MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumberAndMerchantId(phoneNumber, merchantId);
MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(phoneNumber);
if (Objects.isNull(memberBasicInfo)) {
// 不存在则新增数据
String memberId = generateNewMemberId();
@@ -148,7 +146,7 @@ public class MemberService {
memberBasicInfo.setMemberId(memberId);
memberBasicInfo.setNickName("会员" + memberId);
memberBasicInfo.setMobileNumber(phoneNumber);
memberBasicInfo.setMerchantId(Long.valueOf(merchantId));
// memberBasicInfo.setMerchantId(Long.valueOf(merchantId));
memberBasicInfo.setOpenId(openId);
// 首次新建会员，同时新建会员钱包
@@ -192,7 +190,7 @@ public class MemberService {
throw new BusinessException(ReturnCodeEnum.CODE_GET_MOBILE_NUMBER_BY_CODE_ERROR);
}
// 通过appid获取运营商id
String merchantId = pileMerchantInfoService.getMerchantIdByAppId(dto.getAppId());
// String merchantId = pileMerchantInfoService.getMerchantIdByAppId(dto.getAppId());
// if (Objects.isNull(merchantId)) {
// throw new BusinessException(ReturnCodeEnum.CODE_GET_MERCHANT_ID_BY_APP_ID_ERROR);
// }
@@ -204,7 +202,7 @@ public class MemberService {
log.error("getOpenIdByCode发生异常", e);
}
// 查询手机号码是否注册过
return memberRegisterAndLogin(mobileNumber, merchantId, openId);
return memberRegisterAndLogin(mobileNumber, null, openId);
}
/**

2
jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMerchantInfoMapper.java
View File

@@ -27,7 +27,7 @@ public interface PileMerchantInfoMapper {
* @param appId
* @return
*/
PileMerchantInfo selectPileMerchantInfoByAppId(String appId);
List<PileMerchantInfo> selectPileMerchantInfoByAppId(String appId);
/**
* 查询充电桩运营商信息列表

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

@@ -73,7 +73,7 @@ public interface IMemberBasicInfoService {
* @param merchantId 运营商id
* @return 会员信息
*/
MemberBasicInfo selectInfoByMobileNumberAndMerchantId(String phone, String merchantId);
MemberBasicInfo selectInfoByMobileNumber(String phone, String merchantId);
/**
* 根据手机号查询会员信息

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

@@ -64,6 +64,8 @@ public interface IPileMerchantInfoService {
String getMerchantIdByAppId(String appId);
List<String> getMerchantIdsByAppId(String appId);
MerchantInfoVO getMerchantInfo(String merchantId);
/**

5
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java
View File

@@ -137,13 +137,14 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
* @param merchantId 运营商id
* @return 会员信息
*/
public MemberBasicInfo selectInfoByMobileNumberAndMerchantId(String mobileNumber, String merchantId) {
@Override
public MemberBasicInfo selectInfoByMobileNumber(String mobileNumber, String merchantId) {
return memberBasicInfoMapper.selectInfoByMobileNumberAndMerchantId(mobileNumber, merchantId);
}
@Override
public MemberBasicInfo selectInfoByMobileNumber(String mobileNumber) {
return selectInfoByMobileNumberAndMerchantId(mobileNumber, null);
return selectInfoByMobileNumber(mobileNumber, null);
}
@Override

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

@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
/**
* 充电桩运营商信息Service业务层处理
@@ -248,9 +249,9 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
return null;
}
try {
PileMerchantInfo pileMerchantInfo = pileMerchantInfoMapper.selectPileMerchantInfoByAppId(appId);
if (pileMerchantInfo != null) {
return pileMerchantInfo.getId().toString();
List<PileMerchantInfo> pileMerchantInfos = pileMerchantInfoMapper.selectPileMerchantInfoByAppId(appId);
if (CollectionUtils.isNotEmpty(pileMerchantInfos)) {
return pileMerchantInfos.get(0).getId().toString();
}
} catch (Exception e) {
log.error("通过appid获取运营商id error", e);
@@ -258,6 +259,23 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService {
return null;
}
@Override
public List<String> getMerchantIdsByAppId(String appId) {
if (StringUtils.isBlank(appId)) {
return null;
}
List<String> resultList = Lists.newArrayList();
try {
List<PileMerchantInfo> pileMerchantInfos = pileMerchantInfoMapper.selectPileMerchantInfoByAppId(appId);
if (CollectionUtils.isNotEmpty(pileMerchantInfos)) {
resultList = pileMerchantInfos.stream().map(x -> String.valueOf(x.getId())).collect(Collectors.toList());
}
} catch (Exception e) {
log.error("通过appid获取运营商ids error", e);
}
return resultList;
}
@Override
public MerchantInfoVO getMerchantInfo(String merchantId) {
PileMerchantInfo pileMerchantInfo = selectPileMerchantInfoById(Long.parseLong(merchantId));