angelo
/
java-store-retail-app
forked from angelo/java-retail-app
3
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
cabbage 2025-08-25 14:11:44 +08:00
parent b356ec487c 592feb3036
commit f651cd8155
6 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java
View File

@ -815,6 +815,7 @@ public interface ICuMemberService extends IService<CuMember> {
* @return
*/
String checkRegisterRelation(String phone, Long pkParent);
String checkRegisterRelation(String phone, Integer systemType);
/**
* 添加等级升级记录

3
bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java
View File

@ -3130,7 +3130,8 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
* @param systemType 系统类型
* @return
*/
private String checkRegisterRelation(String phone, Integer systemType) {
@Override
public String checkRegisterRelation(String phone, Integer systemType) {
if (this.count(Wrappers.<CuMember>lambdaQuery()
.eq(CuMember::getPhone, phone)
.eq(CuMember::getCategory, ECategory.NORMAL.getValue())

10
bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/controller/manage/CuHandleBusinessController.java
View File

@ -350,6 +350,16 @@ public class CuHandleBusinessController extends BaseController {
btvo.setTable5(EYesNo.YES.getIntValue());
btvo.setTable6(EYesNo.YES.getIntValue());
btvo.setTable7(EYesNo.YES.getIntValue());
Set<String> seenPhones = new HashSet<>();
for (BusinessMemberVO member : businessSingleVO.getBusinessMemberList()) {
String phone = member.getNewPhone();
if (!seenPhones.add(phone)) {
BusinessErrorVO bev = new BusinessErrorVO();
bev.setErrorMsg(TransactionUtils.getContent(ConfigMsgConstants.MEMBER_RETAIL_PHONE_REPEAT) + "["+phone+"]");
bev.setMemberCode(member.getMemberCode());
errorMemberList.add(bev);
}
}
}
}
businessSingleVO.setBtvo(btvo);

10
bd-business/bd-business-member/src/main/java/com/hzs/member/handlebusiness/service/impl/CuHandleBusinessServiceImpl.java
View File

@ -633,6 +633,16 @@ public class CuHandleBusinessServiceImpl extends ServiceImpl<CuHandleBusinessMap
Integer businessType = businessTypeValueVO.getBusinessType();
//变更姓名、变更联系方式
if (businessType.equals(EApprovalBusiness.CHANGE_NAME.getValue()) || businessType.equals(EApprovalBusiness.CHANGE_PHONE.getValue())) {
Set<String> seenPhones = new HashSet<>();
for (BusinessMemberVO member : handleBusinessVO.getBusinessMemberList()) {
if(businessType.equals(EApprovalBusiness.CHANGE_PHONE.getValue())
&& member.getBusinessType().equals(EApprovalBusiness.CHANGE_PHONE.getValue())){
String phone = member.getNewValue();
if (!seenPhones.add(phone)) {
return false;
}
}
}
businessMemberListUpdate = getBusinessMemberByBusinessType(businessMemberList, businessType);
result = cuMemberService.batchUpdateMemberNameAndMobileByPkmember(businessMemberListUpdate, businessType, loginUser.getUserId());
//重置银行卡

5
bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java
View File

@ -1,5 +1,6 @@
package com.hzs.member.self.controller.api;
import cn.hutool.core.util.StrUtil;
import com.hzs.common.core.annotation.RepeatSubmitSimple;
import com.hzs.common.core.constant.MagicNumberConstants;
import com.hzs.common.core.constant.msg.ConfigMsgConstants;
@ -121,6 +122,10 @@ public class ApiDomicileChangeController extends BaseController {
}
domicileChangeVO.setPkCountry(pkCountry);
domicileChangeVO.setPkMember(pkMember);
String verifyDuplicationStr = iCuMemberService.checkRegisterRelation(domicileChangeVO.getChangePhone(), SecurityUtils.getSystemType());
if(StrUtil.isNotEmpty(verifyDuplicationStr)){
return AjaxResult.error(verifyDuplicationStr);
}
// 校验短信验证码
String message = iApiAliSmsService.checkCode(domicileChangeVO.getChangePhone(), domicileChangeVO.getVerificationCode(), null, pkMember);
if (null != message) {

5
bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/ConfigMsgConstants.java
View File

@ -1211,5 +1211,8 @@ public class ConfigMsgConstants {
*/
public static final String MEMBER_RETAIL_REGION_REPEAT = "会员已添加收益区域";
/**
* 会员手机号重复 -- 会员手机号重复
*/
public static final String MEMBER_RETAIL_PHONE_REPEAT = "会员手机号重复";
}