From 5f5eacd88c95120d0a152dc75b889e05e0b09c42 Mon Sep 17 00:00:00 2001 From: cabbage <281119120@qq.com> Date: Wed, 6 Aug 2025 18:02:31 +0800 Subject: [PATCH] =?UTF-8?q?##=20=E4=BC=9A=E5=91=98=E7=AB=AF=E5=AE=9E?= =?UTF-8?q?=E5=90=8D=E8=AE=A4=E8=AF=81=EF=BC=9B=E6=88=B7=E7=B1=8D=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/manage/CuMemberController.java | 16 +-- .../api/ApiDomicileChangeController.java | 76 ++++++----- .../self/mapper/CuSelfServiceLogMapper.java | 10 -- .../service/ICuSelfServiceLogService.java | 9 -- .../impl/CuSelfServiceLogServiceImpl.java | 30 ++--- .../hzs/member/self/vo/DomicileChangeVO.java | 2 +- .../mapper/member/base/CuMemberMapper.xml | 126 +++++++++--------- .../member/self/CuSelfServiceLogMapper.xml | 12 -- .../member/self/CuSelfServiceLogExt.java | 12 +- 9 files changed, 126 insertions(+), 167 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java index 73cf8f40..c0d0d3e5 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/base/controller/manage/CuMemberController.java @@ -78,11 +78,11 @@ public class CuMemberController extends BaseController { @Autowired private ICuMemberTreeService iCuMemberTreeService; @Autowired + private IMemberLoginService iMemberLoginService; + @Autowired private ITransactionCommonService iTransactionCommonService; @Autowired private MemberTokenService memberTokenService; - @Autowired - private IMemberLoginService iMemberLoginService; @DubboReference IUserServiceApi iUserServiceApi; @@ -531,22 +531,16 @@ public class CuMemberController extends BaseController { List resultList = iCuMemberService.selectByMemberRealInfo(memberRealInfoParam); if (CollectionUtil.isNotEmpty(resultList)) { - //数据库内容翻译 - Map transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE, - EnumsPrefixConstants.KEY_AWARD); - - R> awardsListDate = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); // 奖衔 + R> awardsListDate = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry()); List awardsList = awardsListDate.getData(); - R> gradeListDate = iGradeServiceApi.queryGradeList(SecurityUtils.getPkCountry()); + // 等级 + R> gradeListDate = iGradeServiceApi.queryGradeList(SecurityUtils.getPkCountry()); List gradeList = gradeListDate.getData(); Map areaDate = iAreaServiceApi.getAreaMap(SecurityUtils.getPkCountry()).getData(); for (MemberRealInfoVO cuMemberExt : resultList) { - cuMemberExt.setRegisterGradeVal(transactionMap1.get(cuMemberExt.getPkRegisterGrade())); - cuMemberExt.setSettleGradeVal(transactionMap1.get(cuMemberExt.getPkSettleGrade())); - cuMemberExt.setAwardsVal(transactionMap1.get(cuMemberExt.getPkAwards())); if (cuMemberExt.getPkProvince() != null) { // 省 cuMemberExt.setProvinceName(areaDate.get(cuMemberExt.getPkProvince())); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java index 1bd21cc5..9c2b2441 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/controller/api/ApiDomicileChangeController.java @@ -46,20 +46,46 @@ public class ApiDomicileChangeController extends BaseController { */ @GetMapping("/application-info-list") public AjaxResult applicationInformation() { - Long pkMember = SecurityUtils.getUserId(); - CuMemberExt member = iCuMemberService.getMemberById(pkMember); - DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().memberCode(member.getMemberCode()) - .memberName(member.getMemberName()).phone(member.getPhone()) - .changeNum(MagicNumberConstants.CHANGE_NUM).build(); + CuMemberExt member = iCuMemberService.getMemberById(SecurityUtils.getUserId()); + DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder() + .memberCode(member.getMemberCode()) + .memberName(member.getMemberName()) + .phone(member.getPhone()) + .changeNum(MagicNumberConstants.CHANGE_NUM) + .build(); return AjaxResult.success(domicileChangeVO); } - - @GetMapping("/application-info-detail") - public AjaxResult applicationInformationDetail() { - return AjaxResult.success(iCuSelfServiceLogService.selectDomicileChangeByPkMember(SecurityUtils.getUserId(), EApprovalBusiness.DOMICILE_CHANGE.getValue(), SecurityUtils.getPkCountry())); + /** + * 显示户籍变更信息 + * + * @return AjaxResult + */ + @GetMapping("/show-change-domicile") + public AjaxResult showChangeDomicile() { + String idBack = null; + String idFront = null; + Long pkMember = SecurityUtils.getUserId(); + Integer pkCountry = SecurityUtils.getPkCountry(); + CuMemberExt member = iCuMemberService.getMemberById(pkMember); + //查询实名认证信息原证件图 + CuMemberAuthenticationVO authenticationVO = CuMemberAuthenticationVO.builder().pkCountry(pkCountry).pkMember(pkMember).build(); + CuMemberAuthenticationVO cuMemberAuthenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(authenticationVO); + if (null != cuMemberAuthenticationVO) { + idBack = cuMemberAuthenticationVO.getIdBack(); + idFront = cuMemberAuthenticationVO.getIdFront(); + } + DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder() + .memberCode(member.getMemberCode()) + .memberName(member.getMemberName()) + .phone(member.getPhone()) + .idBack(idBack) + .idFront(idFront) + .build(); + return AjaxResult.success(domicileChangeVO); } + /** * 申请户籍变更 * @@ -99,31 +125,6 @@ public class ApiDomicileChangeController extends BaseController { return toAjax(iCuSelfServiceLogService.saveChangeDomicile(domicileChangeVO)); } - /** - * 显示户籍变更信息 - * - * @return AjaxResult - */ - @GetMapping("/show-change-domicile") - public AjaxResult showChangeDomicile() { - String idBack = null; - String idFront = null; - Long pkMember = SecurityUtils.getUserId(); - Integer pkCountry = SecurityUtils.getPkCountry(); - CuMemberExt member = iCuMemberService.getMemberById(pkMember); - //查询实名认证信息原证件图 - CuMemberAuthenticationVO authenticationVO = CuMemberAuthenticationVO.builder().pkCountry(pkCountry).pkMember(pkMember).build(); - CuMemberAuthenticationVO cuMemberAuthenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(authenticationVO); - if (null != cuMemberAuthenticationVO) { - idBack = cuMemberAuthenticationVO.getIdBack(); - idFront = cuMemberAuthenticationVO.getIdFront(); - } - DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().memberCode(member.getMemberCode()) - .memberName(member.getMemberName()).phone(member.getPhone()) - .idBack(idBack).idFront(idFront).build(); - return AjaxResult.success(domicileChangeVO); - } - /** * 查询已申请信息 * @@ -131,8 +132,11 @@ public class ApiDomicileChangeController extends BaseController { */ @GetMapping("/applied-info-list") public AjaxResult appliedInformation() { - DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder().pkMember(SecurityUtils.getUserId()) - .pkCountry(SecurityUtils.getPkCountry()).editType(EApprovalBusiness.DOMICILE_CHANGE.getValue()).build(); + DomicileChangeVO domicileChangeVO = DomicileChangeVO.builder() + .pkMember(SecurityUtils.getUserId()) + .pkCountry(SecurityUtils.getPkCountry()) + .editType(EApprovalBusiness.DOMICILE_CHANGE.getValue()) + .build(); List domicileChangeVOList = (List) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1]; return AjaxResult.success(domicileChangeVOList); } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java index e8642fe8..570b4aab 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java @@ -46,16 +46,6 @@ public interface CuSelfServiceLogMapper extends BaseMapper { */ CuSelfServiceLogExt selectDomicileChangeDetail(@Param("pkId") Long pkId); - /** - * 根据用户ID和类型查询自动服务 - * - * @param editType 服务类型 - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @return CuSelfServiceLogExt - */ - CuSelfServiceLogExt selectDomicileChangeByPkMember(@Param("editType") Integer editType, @Param("pkMember") Long pkMember, @Param("pkCountry") Integer pkCountry); - /** * 根据订单ID查询订单明细列表（前台使用，尽量只查能用到的） * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java index af5e0a1f..da4a387f 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java @@ -63,15 +63,6 @@ public interface ICuSelfServiceLogService extends IService { */ DomicileChangeVO selectDomicileChangeDetail(Long pkId); - /** - * 根据用户ID和类型查询自动服务 - * - * @param editType 服务类型 - * @param pkMember 会员ID - * @param pkCountry 国家ID - * @return CuSelfServiceLogExt - */ - DomicileChangeVO selectDomicileChangeByPkMember(Long pkMember, Integer editType, Integer pkCountry); List queryListByOrderId(List orderIdList); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java index 3731baf0..9b78012b 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/impl/CuSelfServiceLogServiceImpl.java @@ -48,8 +48,6 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl querySelfModifyAddressList(SelfModifyAddressVO selfModifyAddressVO) { @@ -75,19 +73,28 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl pkMembers = Collections.singletonList(businessMemberVO.getPkMember()); iCuMemberService.updateMemberEditNumber(pkMembers, pkMember); //变更前值 - DomicileChangeVO oldValue = DomicileChangeVO.builder().memberName(domicileChangeVO.getMemberName()) - .phone(domicileChangeVO.getPhone()).idFront(domicileChangeVO.getIdFront()).idBack(domicileChangeVO.getIdBack()).build(); + DomicileChangeVO oldValue = DomicileChangeVO.builder() + .memberName(domicileChangeVO.getMemberName()) + .phone(domicileChangeVO.getPhone()) + .idFront(domicileChangeVO.getIdFront()) + .idBack(domicileChangeVO.getIdBack()) + .build(); //变更后的值 - DomicileChangeVO newValue = DomicileChangeVO.builder().changeMemberName(domicileChangeVO.getChangeMemberName()) - .changePhone(domicileChangeVO.getChangePhone()).changeIdFront(domicileChangeVO.getChangeIdFront()).changeIdBack(domicileChangeVO.getChangeIdBack()).build(); + DomicileChangeVO newValue = DomicileChangeVO.builder() + .changeMemberName(domicileChangeVO.getChangeMemberName()) + .changePhone(domicileChangeVO.getChangePhone()) + .changeIdFront(domicileChangeVO.getChangeIdFront()) + .changeIdBack(domicileChangeVO.getChangeIdBack()) + .build(); + String businessNo = CommonUtil.createSerialNumber(EOrderPrefix.SELF_SERVICE.getValue()); CuSelfServiceLog oldServiceLog = CuSelfServiceLog.builder() .pkMember(pkMember) @@ -171,7 +178,6 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl and cm.MEMBER_CODE like #{memberCode} ||'%' @@ -1673,7 +1668,6 @@ and ma.ID_CARD like '%' || #{birthDate} ||'%' - and cm.PHONE = #{phone} @@ -3156,27 +3150,29 @@ order by num desc diff --git a/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml b/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml index 2b72822e..bde18d6f 100644 --- a/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml +++ b/bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml @@ -287,18 +287,6 @@ and l.pk_id = #{pkId} - -