## 会员信息导入报错处理；

bd-business/bd-business-member/src/main/java/com/hzs/member/base/mapper/CuMemberMapper.java

@@ -56,7 +56,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
     List<CuMemberExt> queryMemberInfoByCondition(CuMember cuMember);
 
     /*
-     * @description: 根据条件查询会员信息，查询单表
+     *  根据条件查询会员信息，查询单表
      * @param: null null
      **/
     List<CuMemberExt> queryMemberByCondition(CuMember cuMember);
@@ -65,7 +65,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      * 查找安置人伞上
      *
      * @param memberId 会员编号
-     * @Description:
      */
     List<CuMemberExt> selectPlaceSponsorOnUmbrella(@Param("memberId") Long memberId,
                                                    @Param("memberCode") String memberCode,
@@ -75,7 +74,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      * 查找安置人伞上会员信息
      *
      * @param memberId 编号、安置人
-     * @Description:
      */
     List<CuMemberExt> querySponsorOnUmbrella(@Param("memberId") Long memberId, @Param("memberCodeList") List<String> memberCodeList);
 
@@ -83,7 +81,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      * 查找安置人伞下
      *
      * @param memberId 会员编号
-     * @Description:
      */
     List<CuMemberExt> selectPlaceSponsorUnderUmbrella(@Param("memberId") Long memberId);
 
@@ -91,7 +88,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      * 查找安置人伞下
      *
      * @param memberId 会员编号
-     * @Description:
      */
     List<CuMemberExt> selectPlaceSponsorUnderUmbrellaByCode(@Param("memberId") Long memberId, @Param("placeParentCode") String placeParentCode);
 
@@ -99,7 +95,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      * 查找安置人伞下
      *
      * @param memberId 会员编号
-     * @Description:
      */
     List<CuMemberExt> selectPlaceSponsorUnderUmbrellaByCondition(@Param("memberId") Long memberId, @Param("cuMemberExtList") List<CuMemberExt> cuMemberExtList);
 
@@ -115,7 +110,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      * 查找血缘伞上，推荐人
      *
      * @param memberId 推荐人编号
-     * @Description:
      */
     List<CuMemberExt> selectBloodKinshipOnUmbrella(Long memberId);
 
@@ -123,7 +117,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      * 查找血缘伞下，推荐人
      *
      * @param memberId 推荐人编号
-     * @Description:
      */
     List<CuMemberExt> selectBloodKinshipUnderUmbrella(Long memberId);
 
@@ -141,10 +134,9 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      */
     List<CuMemberVO> queryCuMemberByCondition(CuMemberVO memberParam);
 
-    /*
+    /**
-     * @description: 查询会员信息，根据条件
+     * 查询会员信息，根据条件
-     * @param: null null
+     */
-     **/
     List<CuMemberVO> queryCuMemberByMemberList(@Param("cuMemberVOList") List<CuMemberVO> cuMemberVOList,
                                                @Param("memberParam") CuMemberVO memberParam);
 
@@ -152,8 +144,8 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
 
 
     /**
-     * @description: 会员真实信息
+     * 会员真实信息
-     **/
+     */
     List<CuMemberVO> realCuMemberByCondition(CuMemberVO memberParam);
 
     /**
@@ -188,24 +180,24 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
                                            @Param("pkCountry") Integer pkCountry);
 
     /**
-     * @description: 特殊业务-修改会员编号列表
+     * 特殊业务-修改会员编号列表
      **/
     List<UpdateCodeVO> puCodeList(UpdateCodeVO updateCodeVO);
 
     /**
-     * @description: 查询会员有效期休止期
+     * 查询会员有效期休止期
      **/
     List<UpdateExpireStopVO> getMemberExpireStopList(UpdateExpireStopVO updateExpireStopVO);
 
     List<ZeroElementRevokeVO> zeroList(ZeroElementRevokeVO zeroElementRevokeVO);
 
     /**
-     * @description: 查询全部修改过会员编号的记录
+     * 查询全部修改过会员编号的记录
      **/
     List<UpdateCodeVO> puCodeAllList(UpdateCodeVO updateCodeVO);
 
     /**
-     * @description: 查询会员变更前信息
+     * 查询会员变更前信息
      **/
     UpdateCodeVO specialBusinessQuery(UpdateCodeVO updateCodeVO);
 
@@ -263,44 +255,44 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
     int insertBatchCuMember(@Param("memberList") List<CuMember> memberList);
 
     /**
-     * @description:特殊业务-修改结算国
+     * 特殊业务-修改结算国
      **/
     List<UpdateSettleCountryVO> upseCountryList(UpdateSettleCountryVO upseCountryVO);
 
     /**
-     * @description: 特殊配置 修改结算国列表
+     * 特殊配置 修改结算国列表
      **/
     List<UpdateSettleCountryVO> upsettleCountryList(UpdateSettleCountryVO upseCountryVO);
 
     /**
-     * @description: 查询修改政策币列表
+     * 查询修改政策币列表
      **/
     List<UpPolicyCurrencyVO> upPolicyCurrencyList(UpPolicyCurrencyVO upVO);
 
 
     /**
-     * @description: 校验会员是否有充值审核
+     * 校验会员是否有充值审核
      **/
     Integer checkCecharge(@Param("pkMember") Long pkMember);
 
     /**
-     * @description: 校验会员是否有提现审核
+     * 校验会员是否有提现审核
      **/
     Integer checkWithdraw(@Param("pkMember") Long pkMember);
 
     /**
-     * @description: 校验会员所有账户是否有余额
+     * 校验会员所有账户是否有余额
      **/
     Integer checkAccount(@Param("pkMember") Long pkMember);
 
     /**
-     * @description: 查询会员是否存在未完成基础业务办理
+     * 查询会员是否存在未完成基础业务办理
      **/
     Integer checkmsLogCount(@Param("pkMember") Long pkMember,
                             @Param("editType") Integer editType);
 
     /**
-     * @description: 查询会员是否存在未完成注水业绩业务
+     * 查询会员是否存在未完成注水业绩业务
      **/
     Integer checkMemberAchieveCount(@Param("pkMember") Long pkMember);
 
@@ -350,7 +342,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      * @param memberName      会员名称
      * @param startCreateTime 开始时间
      * @param endCreateTime   结束时间
-     * @param endCreateTime   结束时间
      * @param memberInfo      会员信息
      * @return
      */
@@ -481,7 +472,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
     void updatePlaceParentAndPlaceDeptById(@Param("pkMember") Long pkMember, @Param("pkPlaceParent") Long pkPlaceParent, @Param("placeDept") Integer placeDept);
 
     /*
-     * @description: 查询会员左右区人数
+     *  查询会员左右区人数
      **/
     List<CuMember> queryMemberLeftRightCount(@Param("pkMember") Long pkMember);
 
@@ -526,7 +517,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
     List<CuMemberExt> selectPlaceErrorCode();
 
     /*
-     * @description: 查询伞下会员
+     *  查询伞下会员
      **/
     List<CuMember> queryCuMemberUnderUmbrella(@Param("pkMember") Long pkMember);
 
@@ -610,7 +601,7 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
     List<MemberConsumptionStatVo> getMemberConsumptionStat(MemberConsumptionStatParam memberConsumptionStatParam);
 
     /**
-     * @description: 查询表是否存在
+     * 查询表是否存在
      **/
     Integer selectExistTable(String tableName);
 

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

@@ -2131,7 +2131,6 @@
         cm.MAKER_GIFT_TIME makerGiftTime,
         cm.EXPIRE_STATUS expireStatus,
         cm.SYSTEM_TYPE systemType,
-        cmse.STORE_LEVEL storeType,
         bha.AWARDS_NAME histroyAwardsName
         FROM cu_member cm
         left join CU_MEMBER_ACCOUNT cma
@@ -2233,7 +2232,6 @@
         cm.EXPIRE_STATUS expireStatus,
         cm.IS_MAKER_GIFT isMakerGift,
         cm.MAKER_GIFT_TIME makerGiftTime,
-        cmse.STORE_LEVEL storeType,
         bha.AWARDS_NAME histroyAwardsName
         FROM cu_member cm
         inner join CU_MEMBER_ACCOUNT cma
@@ -2320,27 +2318,12 @@
             </foreach>
             )
         </if>
-        <if test="storeType != null ">
-            and cmse.STORE_LEVEL=#{storeType}
-        </if>
-
         <if test="expireStatus != null ">
             and cm.EXPIRE_STATUS=#{expireStatus}
         </if>
-        <if test="lecturerLevel != null">
-            and cm.LECTURER_LEVEL=#{lecturerLevel}
-        </if>
-        <if test="isMakerGift != null">
-            and cm.IS_MAKER_GIFT=#{isMakerGift}
-        </if>
-
         <if test="changeNumber != null">
             and cm.CHANGE_NUMBER=#{changeNumber}
         </if>
-        <if test="superStudio != null">
-            and cm.super_studio=#{superStudio}
-        </if>
-
         <if test="agentGrade != null">
             and cmat.agent_grade=#{agentGrade}
         </if>
@@ -2356,7 +2339,6 @@
         <if test="transferStatus != null">
             and cma.TRANSFER_STATUS=#{transferStatus}
         </if>
-
         <if test="vertexId != null">
             and ver.PK_ID=#{vertexId}
         </if>
@@ -2366,9 +2348,6 @@
         <if test="registerAuthority != null">
             and cm.REGISTER_AUTHORITY=#{registerAuthority}
         </if>
-        <if test="isDealer != null">
-            and cm.IS_DEALER=#{isDealer}
-        </if>
         <if test="accountStatus != null">
             and cm.ACCOUNT_STATUS=#{accountStatus}
         </if>
@@ -2384,7 +2363,6 @@
         <if test="orderSource != null">
             and cm.order_source=#{orderSource}
         </if>
-
         <if test="centerMemberCode != null and centerMemberCode != ''">
             and center.member_code like #{centerMemberCode}||'%'
         </if>
@@ -2397,14 +2375,12 @@
         <if test="parMemberName != null and parMemberName != ''">
             and par.member_name like #{parMemberName}||'%'
         </if>
-
         <if test="placeMemberCode != null and placeMemberCode != ''">
             and place.member_code like #{placeMemberCode}||'%'
         </if>
         <if test="placeMemberName != null and placeMemberName != ''">
             and place.member_name like #{placeMemberName}||'%'
         </if>
-
         <if test="memberName != null and memberName != ''">
             and cm.member_name like #{memberName}||'%'
         </if>
@@ -2425,11 +2401,6 @@
         <if test="directPushNumber != null">
             and cm.DIRECT_PUSH_NUMBER=#{directPushNumber}
         </if>
-
-        <if test="systemLevel != null">
-            and cm.SYSTEM_LEVEL=#{systemLevel}
-        </if>
-
         <if test="placeDept != null ">
             and cm.place_dept=#{placeDept}
         </if>