## 会员端实名认证；户籍变更修改；

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<MemberRealInfoVO> resultList = iCuMemberService.selectByMemberRealInfo(memberRealInfoParam);
 
         if (CollectionUtil.isNotEmpty(resultList)) {
-            //数据库内容翻译
-            Map<Integer, String> transactionMap1 = iTransactionCommonService.exportEnumTransactionByDB(EnumsPrefixConstants.KEY_GRADE,
-                    EnumsPrefixConstants.KEY_AWARD);
-
-            R<List<BdAwards>> awardsListDate = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry());
             // 奖衔
+            R<List<BdAwards>> awardsListDate = iAwardsServiceApi.queryAwards(SecurityUtils.getPkCountry());
             List<BdAwards> awardsList = awardsListDate.getData();
-            R<List<GradeDTO>> gradeListDate = iGradeServiceApi.queryGradeList(SecurityUtils.getPkCountry());
+
             // 等级
+            R<List<GradeDTO>> gradeListDate = iGradeServiceApi.queryGradeList(SecurityUtils.getPkCountry());
             List<GradeDTO> gradeList = gradeListDate.getData();
             Map<Integer, String> 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()));

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<DomicileChangeVO> domicileChangeVOList = (List<DomicileChangeVO>) iCuSelfServiceLogService.selectSelfServiceByPkMember(domicileChangeVO)[1];
         return AjaxResult.success(domicileChangeVOList);
     }

bd-business/bd-business-member/src/main/java/com/hzs/member/self/mapper/CuSelfServiceLogMapper.java

@@ -46,16 +46,6 @@ public interface CuSelfServiceLogMapper extends BaseMapper<CuSelfServiceLog> {
      */
     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查询订单明细列表（前台使用，尽量只查能用到的）
      *

bd-business/bd-business-member/src/main/java/com/hzs/member/self/service/ICuSelfServiceLogService.java

@@ -63,15 +63,6 @@ public interface ICuSelfServiceLogService extends IService<CuSelfServiceLog> {
      */
     DomicileChangeVO selectDomicileChangeDetail(Long pkId);
 
-    /**
-     * 根据用户ID和类型查询自动服务
-     *
-     * @param editType  服务类型
-     * @param pkMember  会员ID
-     * @param pkCountry 国家ID
-     * @return CuSelfServiceLogExt
-     */
-    DomicileChangeVO selectDomicileChangeByPkMember(Long pkMember, Integer editType, Integer pkCountry);
 
     List<MyOrderItemsVO> queryListByOrderId(List<Long> orderIdList);
 

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<CuSelfServiceLogMap
     private ICuMemberBusinessLicenseService iCuMemberBusinessLicenseService;
     @Autowired
     private ICuMemberService iCuMemberService;
-    @Autowired
-    private ICuMemberBankService iCuMemberBankService;
 
     @Override
     public List<SelfModifyAddressVO> querySelfModifyAddressList(SelfModifyAddressVO selfModifyAddressVO) {
@@ -75,19 +73,28 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl<CuSelfServiceLogMap
         iCuMemberService.updateMemberNameAndPhone(pkMember, domicileChangeVO.getChangeMemberName(), domicileChangeVO.getChangePhone(), pkMember);
         //注销实名认证、营业执照
         changeBusinessByChangeName(pkMember, pkMember);
-        //重置银行卡
         BusinessMemberVO businessMemberVO = BusinessMemberVO.builder().pkMember(pkMember).build();
-        iCuMemberBankService.batchUpdateBankBypkMembers(Collections.singletonList(businessMemberVO), pkMember);
+        //重置银行卡
+//        iCuMemberBankService.batchUpdateBankBypkMembers(Collections.singletonList(businessMemberVO), pkMember);
         //修改会员的变更次数
         List<Long> 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<CuSelfServiceLogMap
         return true;
     }
 
-
     @Override
     public Object[] selectSelfServiceByPkMember(DomicileChangeVO domicileChangeVO) {
         DomicileChangeVO domicileChange;
@@ -203,12 +209,6 @@ public class CuSelfServiceLogServiceImpl extends ServiceImpl<CuSelfServiceLogMap
         return chargeDomicileChangeVO(cuSelfServiceLogExt);
     }
 
-    @Override
-    public DomicileChangeVO selectDomicileChangeByPkMember(Long pkMember, Integer editType, Integer pkCountry) {
-        CuSelfServiceLogExt cuSelfServiceLogExt = baseMapper.selectDomicileChangeByPkMember(editType, pkMember, pkCountry);
-        return chargeDomicileChangeVO(cuSelfServiceLogExt);
-    }
-
     /**
      * 转化户籍VO
      *

bd-business/bd-business-member/src/main/java/com/hzs/member/self/vo/DomicileChangeVO.java

@@ -20,6 +20,7 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 public class DomicileChangeVO extends BaseApprovalEntity implements Serializable {
+
     private static final long serialVersionUID = -1902903236338507971L;
 
     private Long pkId;
@@ -138,7 +139,6 @@ public class DomicileChangeVO extends BaseApprovalEntity implements Serializable
     /**
      * 业务单号
      */
-
     private String businessNo;
 
     private Long pkModified;

bd-business/bd-business-member/src/main/resources/mapper/member/base/CuMemberMapper.xml

@@ -1628,10 +1628,10 @@
         cm.MEMBER_CODE as memberCode,
         cm.MEMBER_NAME memberName,
         cm.PHONE phone,
-        bg.PK_TRANSACTION as pkRegisterGrade,
-        bgg.PK_TRANSACTION as pkSettleGrade,
-        ba.PK_TRANSACTION as pkAwards,
-        bamax.PK_TRANSACTION as pkMaxAwards,
+        cm.PK_REGISTER_GRADE as pkRegisterGrade,
+        cm.PK_SETTLE_GRADE as pkSettleGrade,
+        cm.PK_AWARDS as pkAwards,
+        cm.PK_MAX_AWARDS as pkMaxAwards,
         ma.SEX as sex,
         cm.birth_date birthDate,
         ma.ID_TYPE idType,
@@ -1655,15 +1655,10 @@
         from CU_MEMBER cm
         left join CU_MEMBER_AUTHENTICATION ma on ma.PK_MEMBER = cm.PK_ID and ma.del_flag = 0
         left join BD_BANK bb on bb.PK_ID = ma.pk_bank
-        left join BD_GRADE bg on bg.pk_id=cm.PK_REGISTER_GRADE
-        left join BD_GRADE bgg on bgg.pk_id=cm.PK_SETTLE_GRADE
-        left join BD_AWARDS ba on ba.pk_id=cm.PK_AWARDS
-        left join BD_AWARDS baMax on baMax.pk_id=cm.PK_MAX_AWARDS
         left join bd_vertex ver on cm.pk_vertex = ver.pk_id
         LEFT JOIN cu_member_team ct ON ct.pk_id = cm.pk_team_code
-
-
-        where cm.del_flag = 0 and PK_SETTLE_COUNTRY=#{pkCountry}
+        where cm.del_flag = 0
+        and PK_SETTLE_COUNTRY = #{pkCountry}
         <if test="memberCode != null and memberCode != ''">
             and cm.MEMBER_CODE like #{memberCode} ||'%'
         </if>
@@ -1673,7 +1668,6 @@
         <if test="birthDate != null and birthDate != ''">
             and ma.ID_CARD like '%' || #{birthDate} ||'%'
         </if>
-
         <if test="phone != null and phone != ''">
             and cm.PHONE = #{phone}
         </if>
@@ -3156,27 +3150,29 @@
         order by num desc
     </select>
     <select id="getTableData" resultType="com.hzs.common.domain.member.ext.CuMemberSettleExt">
-        select * from ${tableName} where pk_member = #{userId}
+        select *
+        from ${tableName}
+        where pk_member = #{userId}
     </select>
     <select id="getSelectRegionDetail" resultType="com.hzs.member.base.vo.CheckRegionDetailVO">
         SELECT
-            cmrr.PROVINCE provinceId,
-            cmrr.CITY cityId,
-            cmrr.COUNTY countyId,
-            p.name provinceName,
-            c.name cityName,
-            pc.name countyName
+        cmrr.PROVINCE provinceId,
+        cmrr.CITY cityId,
+        cmrr.COUNTY countyId,
+        p.name provinceName,
+        c.name cityName,
+        pc.name countyName
         FROM
-            CU_MEMBER_RETAIL_REGION cmrr
-                INNER JOIN cu_member cm ON cmrr.pk_member = cm.pk_id
-                LEFT JOIN BD_VERTEX bv ON cm.PK_VERTEX = bv.PK_ID
-                LEFT JOIN BD_REGION_VERTEX brv ON bv.REGION_VERTEX_PK_ID = brv.PK_ID
-                LEFT JOIN BD_AREA P ON P.PK_ID = cmrr.PROVINCE AND P.DEL_FLAG = 0
-                LEFT JOIN BD_AREA C ON C.PK_ID = cmrr.CITY AND C.DEL_FLAG = 0
-                LEFT JOIN BD_AREA PC ON PC.PK_ID = cmrr.COUNTY AND PC.DEL_FLAG = 0
+        CU_MEMBER_RETAIL_REGION cmrr
+        INNER JOIN cu_member cm ON cmrr.pk_member = cm.pk_id
+        LEFT JOIN BD_VERTEX bv ON cm.PK_VERTEX = bv.PK_ID
+        LEFT JOIN BD_REGION_VERTEX brv ON bv.REGION_VERTEX_PK_ID = brv.PK_ID
+        LEFT JOIN BD_AREA P ON P.PK_ID = cmrr.PROVINCE AND P.DEL_FLAG = 0
+        LEFT JOIN BD_AREA C ON C.PK_ID = cmrr.CITY AND C.DEL_FLAG = 0
+        LEFT JOIN BD_AREA PC ON PC.PK_ID = cmrr.COUNTY AND PC.DEL_FLAG = 0
         where cmrr.del_flag = 0
-          AND cmrr.PK_MEMBER IN ( #{userId} )
-          and cmrr.EFFECTIVE = 0
+        AND cmrr.PK_MEMBER IN ( #{userId} )
+        and cmrr.EFFECTIVE = 0
         <if test="type != null and type == 1">
             and cmrr.PROVINCE != 0
             and cmrr.CITY = 0
@@ -3198,43 +3194,43 @@
         select ba.PK_ID, ba.PARENT, ba.NAME
         from bd_area ba
         where ba.del_flag = 0
-          and ba.pk_country = 1
-          and ba.ENABLE_STATE = 0
-          and ba.pk_id not in (
-            SELECT
-                <if test="type != null and type == 1">
-                    PROVINCE
-                </if>
-                <if test="type != null and type == 2">
-                    CITY
-                </if>
-                <if test="type != null and type == 3">
-                    COUNTY
-                </if>
-            FROM
-                CU_MEMBER_RETAIL_REGION cmrr
-                    INNER JOIN cu_member cm ON cmrr.pk_member = cm.pk_id
-                    LEFT JOIN BD_VERTEX bv ON cm.PK_VERTEX = bv.PK_ID
-                    LEFT JOIN BD_REGION_VERTEX brv ON bv.REGION_VERTEX_PK_ID = brv.PK_ID
-            where 1=1
-              AND cmrr.PK_MEMBER NOT IN (#{userId} )
-                AND cmrr.EFFECTIVE = 0
-                AND cmrr.DEL_FLAG = 0
-            <if test="type != null and type == 1">
-                and cmrr.PROVINCE != 0
-                and cmrr.CITY = 0
-                and cmrr.COUNTY = 0
-            </if>
-            <if test="type != null and type == 2">
-                and cmrr.PROVINCE != 0
-                and cmrr.CITY != 0
-                and cmrr.COUNTY = 0
-            </if>
-            <if test="type != null and type == 3">
-                and cmrr.PROVINCE != 0
-                and cmrr.CITY != 0
-                and cmrr.COUNTY != 0
-            </if>
+        and ba.pk_country = 1
+        and ba.ENABLE_STATE = 0
+        and ba.pk_id not in (
+        SELECT
+        <if test="type != null and type == 1">
+            PROVINCE
+        </if>
+        <if test="type != null and type == 2">
+            CITY
+        </if>
+        <if test="type != null and type == 3">
+            COUNTY
+        </if>
+        FROM
+        CU_MEMBER_RETAIL_REGION cmrr
+        INNER JOIN cu_member cm ON cmrr.pk_member = cm.pk_id
+        LEFT JOIN BD_VERTEX bv ON cm.PK_VERTEX = bv.PK_ID
+        LEFT JOIN BD_REGION_VERTEX brv ON bv.REGION_VERTEX_PK_ID = brv.PK_ID
+        where 1=1
+        AND cmrr.PK_MEMBER NOT IN (#{userId} )
+        AND cmrr.EFFECTIVE = 0
+        AND cmrr.DEL_FLAG = 0
+        <if test="type != null and type == 1">
+            and cmrr.PROVINCE != 0
+            and cmrr.CITY = 0
+            and cmrr.COUNTY = 0
+        </if>
+        <if test="type != null and type == 2">
+            and cmrr.PROVINCE != 0
+            and cmrr.CITY != 0
+            and cmrr.COUNTY = 0
+        </if>
+        <if test="type != null and type == 3">
+            and cmrr.PROVINCE != 0
+            and cmrr.CITY != 0
+            and cmrr.COUNTY != 0
+        </if>
         )
         order by ba.pk_id asc
     </select>

bd-business/bd-business-member/src/main/resources/mapper/member/self/CuSelfServiceLogMapper.xml

@@ -287,18 +287,6 @@
           and l.pk_id = #{pkId}
     </select>
 
-    <select id="selectDomicileChangeByPkMember" resultType="com.hzs.common.domain.member.self.CuSelfServiceLogExt">
-        select l.*, m.member_code memberCode
-        from cu_self_service_log l
-                 left join cu_member m
-                           on l.pk_member = m.pk_id
-                               and m.del_flag = 0
-        where l.del_flag = 0
-          and l.pk_member = #{pkMember}
-          and l.pk_country = #{pkCountry}
-          and l.edit_type = #{editType}
-    </select>
-
     <select id="selectByMaxApproveNumber" parameterType="com.hzs.common.domain.member.self.CuSelfServiceLog"
             resultType="integer">
         select nvl(max(APPROVE_NUMBER), 0)

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/self/CuSelfServiceLogExt.java

@@ -2,19 +2,15 @@ package com.hzs.common.domain.member.self;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-/**
- * @Description:
- * @Author: ljc
- * @Time: 2023/4/19 14:42
- * @Classname: CuSelfServiceLogExt
- * @Package_name: com.hzs.common.domain.member.self
- */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-public class CuSelfServiceLogExt  extends CuSelfServiceLog{
+public class CuSelfServiceLogExt extends CuSelfServiceLog {
+
     /**
      * 会员编号
      */