From 4589aaa0dbe30473b880530a2e10b74175cfdecf Mon Sep 17 00:00:00 2001 From: PQZ Date: Thu, 10 Apr 2025 17:01:47 +0800 Subject: [PATCH] 1 --- .../controller/MemberApplyController.java | 12 ++-- .../controller/MemberUserController.java | 1 - .../com/ruoyi/member/domain/MemberApply.java | 1 + .../com/ruoyi/member/domain/MemberUser.java | 1 + .../member/service/IMemberApplyService.java | 8 +++ .../member/service/IMemberUserService.java | 1 + .../service/impl/MemberApplyServiceImpl.java | 61 ++++++++++++++++--- .../service/impl/MemberUserServiceImpl.java | 4 ++ 8 files changed, 75 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java index e1aa462..3072322 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberApplyController.java @@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.member.domain.MemberApply; +import com.ruoyi.member.domain.MemberUser; import com.ruoyi.member.service.IMemberApplyService; import com.ruoyi.member.vo.MemberApplyVO; import org.springframework.beans.factory.annotation.Autowired; @@ -49,21 +50,22 @@ public class MemberApplyController extends BaseController { } /** - * 手机端发起通告主认证申请 + * 提交通告主认证 * - * @param memberApply {@link MemberApply} + * @param memberApply {@link MemberUser} * @return com.ruoyi.common.core.domain.AjaxResult * @author PQZ - * @date 10:29 2025/3/29 + * @date 14:49 2025/4/10 **/ - @Log(title = "手机端发起通告主认证申请", businessType = BusinessType.EXPORT) + @Log(title = "提交通告主认证申请", businessType = BusinessType.INSERT) @PostMapping("/toApply") public AjaxResult toApply(@RequestBody MemberApply memberApply) { - memberApplyService.save(memberApply); + memberApplyService.toApply(memberApply); return success(); } + /** * 导出通告主认证申请列表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java index 89dfff4..b1e1004 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/controller/MemberUserController.java @@ -117,7 +117,6 @@ public class MemberUserController extends BaseController { util.exportExcel(response, list, "会员数据"); } - /** * 新增会员 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberApply.java b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberApply.java index 38a497f..44f5719 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberApply.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberApply.java @@ -70,5 +70,6 @@ public class MemberApply extends DlBaseEntity /** 审核备注 */ @Excel(name = "审核备注") private String approvalRemark; + private String applyJson; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberUser.java b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberUser.java index 479c0af..21213ed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberUser.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/domain/MemberUser.java @@ -73,6 +73,7 @@ public class MemberUser extends DlBaseEntity @Excel(name = "博主-剩余积分") private Long bpoints; + public MemberUser (String userType, SysUser user,Integer addNotice){ this.userType = userType; this.userId = user.getUserId(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java index 3d654e7..02c26da 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberApplyService.java @@ -33,4 +33,12 @@ public interface IMemberApplyService extends IService { * @date 11:50 2025/3/18 **/ void checkMemberApply(MemberApplyVO memberApply); + + /** + * 通告主申请 + * @author PQZ + * @date 15:25 2025/4/10 + * @param memberApply TODO + **/ + void toApply(MemberApply memberApply); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java index 6d464ad..7c641ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/IMemberUserService.java @@ -75,4 +75,5 @@ public interface IMemberUserService extends IService { * @param memberUser {@link MemberUserVO} **/ void uniSaveMember(MemberUserVO memberUser); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java index bfb85ff..f1c23a9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberApplyServiceImpl.java @@ -3,15 +3,20 @@ package com.ruoyi.member.service.impl; import java.util.Date; import java.util.List; +import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.base.service.IBaseCityService; import com.ruoyi.common.core.domain.DlBaseEntity; +import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.member.domain.MemberUser; import com.ruoyi.member.service.IMemberUserService; import com.ruoyi.member.vo.MemberApplyVO; +import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -24,17 +29,18 @@ import javax.annotation.Resource; /** * 通告主认证申请Service业务层处理 - * + * * @author pqz * @date 2025-03-17 */ @Service -public class MemberApplyServiceImpl extends ServiceImpl implements IMemberApplyService -{ +public class MemberApplyServiceImpl extends ServiceImpl implements IMemberApplyService { @Autowired private MemberApplyMapper memberApplyMapper; @Resource private IMemberUserService memberUserService; + @Resource + private IBaseCityService cityService; /** @@ -48,7 +54,7 @@ public class MemberApplyServiceImpl extends ServiceImpl queryListPage(MemberApplyVO memberApply, Page page) { - return memberApplyMapper.queryListPage(memberApply,page); + return memberApplyMapper.queryListPage(memberApply, page); } /** @@ -70,10 +76,49 @@ public class MemberApplyServiceImpl extends ServiceImpl lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); - lambdaUpdateWrapper.eq(MemberUser::getUserId,memberApply.getUserId()) - .eq(DlBaseEntity::getDelFlag,0) - .eq(MemberUser::getUserType,"01") - .set(MemberUser::getIdentityType,memberApply.getIdentityType()); + lambdaUpdateWrapper.eq(MemberUser::getUserId, memberApply.getUserId()) + .eq(DlBaseEntity::getDelFlag, 0) + .eq(MemberUser::getUserType, "01") + .set(MemberUser::getIdentityType, memberApply.getIdentityType()); memberUserService.update(lambdaUpdateWrapper); } + + /** + * 通告主申请 + * + * @param memberApply {@link MemberApply} + * @author PQZ + * @date 15:25 2025/4/10 + **/ + @Override + @SneakyThrows + public void toApply(MemberApply memberApply) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + checkApply(loginUser.getUserId()); + JSONObject jsonObject = JSONObject.parseObject(memberApply.getApplyJson()); + //地址名称转换 + Long corpCityCode = jsonObject.getLong("corpCityCode"); + //地址名称转换 + Long personCityCode = jsonObject.getLong("personCityCode"); + jsonObject.put("corpCityName",cityService.getCityName(corpCityCode)); + jsonObject.put("personCityName",cityService.getCityName(personCityCode)); + String jsonString = jsonObject.toJSONString(); + + memberApply.setUserId(loginUser.getUserId()); + memberApply.setNickname(loginUser.getUser().getNickName()); + memberApply.setApplyJson(jsonString); + save(memberApply); + } + + private void checkApply(Long userId) throws Exception { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(MemberApply::getUserId,userId).eq(DlBaseEntity::getDelFlag,0) + .eq(MemberApply::getApprovalStatus,'0'); + List list = list(lambdaQueryWrapper); + if (!list.isEmpty()) { + throw new Exception("您有未审批通过的认证单，请耐心等待"); + } + } + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java index cbe65c8..a0a635b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberUserServiceImpl.java @@ -1,17 +1,21 @@ package com.ruoyi.member.service.impl; import com.alibaba.fastjson2.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.base.service.IBaseCityService; import com.ruoyi.busi.service.IBusiEvaluateService; import com.ruoyi.busi.service.IBusiNoticeService; import com.ruoyi.common.config.DlRightsConfig; import com.ruoyi.common.config.WxAppConfig; +import com.ruoyi.common.core.domain.DlBaseEntity; import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.constant.DictConstants; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.member.domain.MemberUser;