## 去掉经销商认证相关接口；

bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBusinessLicenseController.java

@@ -4,23 +4,16 @@ import cn.hutool.core.bean.BeanUtil;
 import com.hzs.common.core.annotation.RepeatSubmitSimple;
 import com.hzs.common.core.constant.msg.FinanceMsgConstants;
 import com.hzs.common.core.enums.EApproveStatus;
-import com.hzs.common.core.enums.EVerificationModule;
-import com.hzs.common.core.enums.EYesNo;
 import com.hzs.common.core.utils.StringUtils;
 import com.hzs.common.core.web.controller.BaseController;
 import com.hzs.common.core.web.domain.AjaxResult;
 import com.hzs.common.domain.member.account.CuMemberBusinessLicense;
-import com.hzs.common.domain.member.base.CuMember;
-import com.hzs.common.domain.system.config.BdTradeConfig;
-import com.hzs.common.domain.system.config.BdTradeWhiteConfig;
 import com.hzs.common.security.utils.SecurityUtils;
 import com.hzs.common.util.TransactionUtils;
 import com.hzs.member.account.service.ICuMemberAuthenticationService;
-import com.hzs.member.account.service.ICuMemberBaseService;
 import com.hzs.member.account.service.ICuMemberBusinessLicenseService;
 import com.hzs.member.account.vo.CuMemberAuthenticationVO;
 import com.hzs.member.account.vo.CuMemberBusinessLicenseVO;
-import com.hzs.member.base.service.ICuMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,14 +27,9 @@ import java.util.Date;
 public class ApiCuMemberBusinessLicenseController extends BaseController {
 
     @Autowired
-    private ICuMemberBusinessLicenseService cuMemberBusinessLicenseService;
+    private ICuMemberBusinessLicenseService iCuMemberBusinessLicenseService;
     @Autowired
-    private ICuMemberService iCuMemberService;
+    private ICuMemberAuthenticationService iCuMemberAuthenticationService;
-    @Autowired
-    private ICuMemberBaseService iCuMemberBaseService;
-    @Autowired
-    private ICuMemberAuthenticationService authenticationService;
-
 
     /**
      * 保存营业执照
@@ -57,7 +45,7 @@ public class ApiCuMemberBusinessLicenseController extends BaseController {
             Long pkMember = SecurityUtils.getUserId();
             Integer pkCountry = SecurityUtils.getPkCountry();
             //查询是否已实名认证
-            CuMemberAuthenticationVO authenticationVO = authenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build());
+            CuMemberAuthenticationVO authenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(pkMember).pkCountry(pkCountry).build());
             //验证实名认证的真实姓名与法人的姓名是否一致
             if (null != authenticationVO) {
                 String accountName = authenticationVO.getAccountName();
@@ -72,14 +60,12 @@ public class ApiCuMemberBusinessLicenseController extends BaseController {
             CuMemberBusinessLicense memberBusinessLicense = BeanUtil.copyProperties(businessLicense, CuMemberBusinessLicense.class);
             memberBusinessLicense.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue());
             memberBusinessLicense.setPkCreator(pkMember);
-            return toAjax(cuMemberBusinessLicenseService.save(memberBusinessLicense));
+            return toAjax(iCuMemberBusinessLicenseService.save(memberBusinessLicense));
         } else {
             return VerifyParameters(businessLicense);
         }
-
     }
 
-
     /**
      * 保存营业执照
      *
@@ -92,7 +78,7 @@ public class ApiCuMemberBusinessLicenseController extends BaseController {
         //参数校验
         if (VerifyParameters(businessLicense).equals(AjaxResult.success())) {
             //查询是否已实名认证
-            CuMemberAuthenticationVO authenticationVO = authenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(SecurityUtils.getUserId()).pkCountry(SecurityUtils.getPkCountry()).build());
+            CuMemberAuthenticationVO authenticationVO = iCuMemberAuthenticationService.selectCuMemberAuthenticationByPkMember(CuMemberAuthenticationVO.builder().pkMember(SecurityUtils.getUserId()).pkCountry(SecurityUtils.getPkCountry()).build());
             //验证实名认证的真实姓名与法人的姓名是否一致
             if (null != authenticationVO) {
                 String accountName = authenticationVO.getAccountName();
@@ -106,14 +92,12 @@ public class ApiCuMemberBusinessLicenseController extends BaseController {
             memberBusinessLicense.setModifiedTime(new Date());
             memberBusinessLicense.setPkModified(SecurityUtils.getUserId());
             memberBusinessLicense.setApproveStatus(EApproveStatus.ALREADY_SUBMIT.getValue());
-            return toAjax(cuMemberBusinessLicenseService.updateById(memberBusinessLicense));
+            return toAjax(iCuMemberBusinessLicenseService.updateById(memberBusinessLicense));
         } else {
             return VerifyParameters(businessLicense);
         }
-
     }
 
-
     /**
      * 查看详情
      *
@@ -121,37 +105,9 @@ public class ApiCuMemberBusinessLicenseController extends BaseController {
      */
     @GetMapping("/detail")
     public AjaxResult showDetail() {
-        return AjaxResult.success(cuMemberBusinessLicenseService.selectBusinessLicenseById(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()));
+        return AjaxResult.success(iCuMemberBusinessLicenseService.selectBusinessLicenseById(SecurityUtils.getUserId(), SecurityUtils.getPkCountry()));
     }
 
-
-    /**
-     * 是否上传营业执照
-     *
-     * @param businessModule 1:提现 2:转账 (来源枚举EBusinessModule)
-     * @return AjaxResult
-     */
-    @GetMapping("/is-exist")
-    public AjaxResult isExistBusinessLicence(Integer businessModule) {
-        String flag = EYesNo.YES.getValue();
-        Long pkMember = SecurityUtils.getUserId();
-        Integer pkCountry = SecurityUtils.getPkCountry();
-        //查询配置白名单
-        BdTradeWhiteConfig bdTradeWhiteConfig = iCuMemberBaseService.selectConfigWhite(pkMember, pkCountry, businessModule);
-        if (null == bdTradeWhiteConfig) {
-            //查询是否配置营业执照
-            BdTradeConfig bdTradeConfig = iCuMemberBaseService.selectConfigTrade(pkMember, pkCountry, businessModule, EVerificationModule.BUSINESS_LICENSE);
-            //配置后才进行验证
-            if (null != bdTradeConfig) {
-                //查询是否完成经销商认证
-                CuMember cuMember = iCuMemberService.queryMember(pkMember);
-                flag = null != cuMember && cuMember.getIsDealer().equals(EYesNo.YES.getIntValue()) ? EYesNo.YES.getValue() : EYesNo.NO.getValue();
-            }
-        }
-        return AjaxResult.success().put("flag", flag);
-    }
-
-
     /**
      * 校验参数
      *
@@ -173,5 +129,4 @@ public class ApiCuMemberBusinessLicenseController extends BaseController {
         return AjaxResult.success();
     }
 
-
 }

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

@@ -599,10 +599,6 @@ public interface CuMemberMapper extends BaseMapper<CuMember> {
      */
     BdTradeWhiteConfig selectMemberByUnderBlood(@Param("pkMember") Long pkMember, @Param("memberType") Integer memberType);
 
-    int validateCompanyCount(@Param("gradeValue") Integer gradeValue);
-
-    int validateBranchOfficeCount(@Param("areaId") Integer areaId, @Param("userId") Long userId);
-
     /**
      * 查询博羚店主会员
      *

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/ICuMemberService.java

@@ -868,10 +868,6 @@ public interface ICuMemberService extends IService<CuMember> {
      */
     BdTradeWhiteConfig selectMemberByUnderBlood(Long pkMember, Integer memberType);
 
-    int validateCompanyCount();
-
-    int validateBranchOfficeCount(Integer areaId, Long userId);
-
     /**
      * 查询博羚店主会员
      *

bd-business/bd-business-member/src/main/java/com/hzs/member/base/service/impl/CuMemberServiceImpl.java

@@ -3138,16 +3138,6 @@ public class CuMemberServiceImpl extends ServiceImpl<CuMemberMapper, CuMember> i
         return baseMapper.selectMemberByUnderBlood(pkMember, memberType);
     }
 
-    @Override
-    public int validateCompanyCount() {
-        return baseMapper.validateCompanyCount(EGrade.COMPANY.getValue());
-    }
-
-    @Override
-    public int validateBranchOfficeCount(Integer areaId, Long userId) {
-        return baseMapper.validateBranchOfficeCount(areaId, userId);
-    }
-
     @Override
     public CuMember getShopkeeperMember(Long pkMember) {
         return baseMapper.getShopkeeperMember(pkMember);

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

@@ -2371,18 +2371,6 @@
                 and t0.category = 0)
         where rownum = 1
     </select>
-    <select id="validateCompanyCount" resultType="java.lang.Integer">
-        select count(pk_id)
-        from cu_member
-        where PK_SETTLE_GRADE in (select pk_id from BD_GRADE where GRADE_VALUE = #{gradeValue})
-    </select>
-    <select id="validateBranchOfficeCount" resultType="java.lang.Integer">
-        select count(pk_id)
-        from cu_member
-        where PK_AREA_ID is not null
-          and pk_area_id = #{areaId}
-          and pk_id != #{userId}
-    </select>
 
     <!-- 查询博羚店主会员 -->
     <select id="getShopkeeperMember" resultType="com.hzs.common.domain.member.base.CuMember">