xc-mall.git - Gitblit

			@@ -14,6 +14,7 @@
			import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
			import cc.mrbird.febs.mall.service.ICommonService;
			import cc.mrbird.febs.mall.vo.*;
			import cn.hutool.core.bean.BeanUtil;
			import cn.hutool.core.collection.CollUtil;
			import cn.hutool.core.util.IdUtil;
			import cn.hutool.core.util.ObjectUtil;
			@@ -28,6 +29,7 @@
			import lombok.RequiredArgsConstructor;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.http.HttpStatus;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			@@ -55,6 +57,8 @@
			private final IApiMallMemberWalletService walletService;
			private final MallMemberPaymentMapper mallMemberPaymentMapper;
			private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
			private final MallShopApplyMapper mallShopApplyMapper;
			private final MallRegisterAppealMapper mallRegisterAppealMapper;


			@Value("${spring.profiles.active}")
			@@ -66,6 +70,14 @@
			MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
			if (mallMember != null) {
			throw new FebsException("该账号已被占用");
			}

			List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
			if (CollUtil.isNotEmpty(mallMembers)) {
			MallRegisterAppeal registerAppeal = mallRegisterAppealMapper.selectByPhoneAndName(registerDto.getName(), registerDto.getAccount());
			if (registerAppeal == null \|\| registerAppeal.getStatus() != 1) {
			return new FebsResponse().code(HttpStatus.ACCEPTED).message("用户名已存在");
			}
			}

			String account = registerDto.getAccount();
			@@ -95,7 +107,7 @@
			mallMember.setReferrerId(registerDto.getInviteId());

			}
			mallMember.setName(registerDto.getAccount());
			mallMember.setName(registerDto.getName());
			mallMember.setAccountStatus(MallMember.ACCOUNT_STATUS_ENABLE);
			mallMember.setAccountType(MallMember.ACCOUNT_TYPE_NORMAL);
			mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
			@@ -475,4 +487,45 @@
			commissionVo.setWaitCommission(BigDecimal.ZERO);
			return commissionVo;
			}

			@Override
			public void shopApply(ShopApplyDto shopApplyDto) {
			MallMember member = LoginUserUtil.getLoginUser();

			MallShopApply hasApply = mallShopApplyMapper.selectNewestApplyByMemberId(member.getId());
			if (hasApply != null) {
			if (!hasApply.getStatus().equals(MallShopApply.APPLY_DISAGREE)) {
			throw new FebsException("审核中或审核已通过");
			}
			}

			MallShopApply mallShopApply = new MallShopApply();
			BeanUtil.copyProperties(shopApplyDto, mallShopApply);

			mallShopApply.setStatus(MallShopApply.APPLY_ING);
			mallShopApply.setMemberId(member.getId());
			mallShopApplyMapper.insert(mallShopApply);
			}

			@Override
			public MallShopApply findNewestApply() {
			MallMember member = LoginUserUtil.getLoginUser();

			return mallShopApplyMapper.selectNewestApplyByMemberId(member.getId());
			}

			@Override
			public void addRegisterAppeal(RegisterAppealDto registerAppeal) {
			MallRegisterAppeal isExist = mallRegisterAppealMapper.selectByPhoneAndName(registerAppeal.getName(), registerAppeal.getPhone());
			if (isExist != null) {
			throw new FebsException("申诉已存在");
			}

			isExist = new MallRegisterAppeal();
			isExist.setName(registerAppeal.getName());
			isExist.setPhone(registerAppeal.getPhone());
			isExist.setStatus(2);

			mallRegisterAppealMapper.insert(isExist);
			}
			}