## 去除部分不需要内容；

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

@@ -4,16 +4,23 @@ 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.*;
 
@@ -30,6 +37,11 @@ public class ApiCuMemberBusinessLicenseController extends BaseController {
     private ICuMemberBusinessLicenseService iCuMemberBusinessLicenseService;
     @Autowired
     private ICuMemberAuthenticationService iCuMemberAuthenticationService;
+    @Autowired
+    ICuMemberService iCuMemberService;
+    @Autowired
+    private ICuMemberBaseService iCuMemberBaseService;
+
 
     /**
      * 保存营业执照
@@ -109,6 +121,32 @@ public class ApiCuMemberBusinessLicenseController extends BaseController {
         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);
+    }
+
     /**
      * 校验参数
      *

bd-business/bd-business-member/src/main/resources/mapper/member/achieve/CuMemberTreeMapper.xml

@@ -31,7 +31,6 @@
         <result column="PK_SETTLE_COUNTRY" property="pkSettleCountry"/>
         <result column="IS_REAL_NAME" property="isRealName"/>
         <result column="IS_BUS_LICENSE" property="isBusLicense"/>
-        <result column="IS_MAKER_SPACE" property="isMakerSpace"/>
         <result column="PK_COUNTRY" property="pkCountry"/>
         <result column="PK_RATE" property="pkRate"/>
         <result column="A_BALANCE" property="aBalance"/>

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

@@ -135,7 +135,6 @@
         <result column="ORDER_SOURCE" property="orderSource"/>
         <result column="IS_REAL_NAME" property="isRealName"/>
         <result column="IS_BUS_LICENSE" property="isBusLicense"/>
-        <result column="IS_MAKER_SPACE" property="isMakerSpace"/>
         <result column="CHANGE_NUMBER" property="changeNumber"/>
         <result column="WECHAT" property="wechat"/>
         <result column="CARD_TYPE" property="cardType"/>
@@ -2382,9 +2381,6 @@
         <if test="isBusLicense != null">
             and cm.is_bus_license=#{isBusLicense}
         </if>
-        <if test="isMakerSpace != null">
-            and cm.IS_MAKER_SPACE=#{isMakerSpace}
-        </if>
         <if test="orderSource != null">
             and cm.order_source=#{orderSource}
         </if>

bd-business/bd-business-member/src/main/resources/mapper/member/detail/CuMemberServiceLogMapper.xml

@@ -71,7 +71,6 @@
         <result column="PURCHASE_STATUS" property="purchaseStatus"/>
         <result column="SHARE_STATUS" property="shareStatus"/>
         <result column="REGISTER_AUTHORITY" property="registerAuthority"/>
-        <result column="IS_MAKER_SPACE" property="isMakerSpace"/>
         <result column="IS_TRANSFER" property="isTransfer"/>
         <result column="IS_WITHDRAW" property="isWithdraw"/>
         <result column="IS_CONSUME" property="isConsume"/>

bd-business/bd-business-report/src/main/resources/mapper/report/report/CuMemberTreeMapper.xml

@@ -31,7 +31,6 @@
         <result column="PK_SETTLE_COUNTRY" property="pkSettleCountry"/>
         <result column="IS_REAL_NAME" property="isRealName"/>
         <result column="IS_BUS_LICENSE" property="isBusLicense"/>
-        <result column="IS_MAKER_SPACE" property="isMakerSpace"/>
         <result column="PK_COUNTRY" property="pkCountry"/>
         <result column="PK_RATE" property="pkRate"/>
         <result column="A_BALANCE" property="aBalance"/>

bd-business/bd-business-sale/src/main/resources/mapper/sale/wares/BdWaresDetailMapper.xml

@@ -28,7 +28,6 @@
         <result column="PK_OCEAN_POSTAGE" property="pkOceanPostage"/>
         <result column="PK_OCEAN_POSTAGE" property="pkOceanPostage"/>
         <result column="WARES_QUANTITY" property="waresQuantity"/>
-        <result column="IS_MAKER_GIFT" property="isMakerGift"/>
         <result column="PK_SPECIAL_CURRENCY" property="pkSpecialCurrency"/>
         <result column="SHIPPING_CHANNEL" property="shippingChannel"/>
         <result column="PK_SUPPLIER" property="pkSupplier"/>