代理商入驻相关接口

mall-account/src/main/resources/mapper/account/AccountUserBindConnectMapper.xml

@@ -4,6 +4,6 @@
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         bind_id
-        , bind_type, user_id, bind_time, bind_nickname, bind_icon, bind_gender, bind_vip, bind_level, bind_client_id, bind_country, bind_province, bind_city, bind_county, bind_code, bind_openid, bind_unionid, bind_access_token, bind_expires_in, bind_refresh_token, bind_token_ttl, bind_active, created_at, updated_at
+        , bind_type, user_id, bind_time, bind_nickname, bind_icon, bind_gender, bind_vip, bind_level, bind_client_id, bind_country, bind_province, bind_city, bind_county, bind_code, bind_openid, bind_unionid, bind_access_token, bind_expires_in, bind_refresh_token, bind_token_ttl, bind_active, invite_code, created_at, updated_at
     </sql>
 </mapper>

mall-common/src/main/java/com/suisung/mall/common/modules/account/AccountUserBindConnect.java

@@ -111,4 +111,7 @@ public class AccountUserBindConnect implements Serializable {
     @ApiModelProperty(value = "剩余订阅次数")
     private Integer send_number;
 
+    @ApiModelProperty(value = "（商家的）代理商的邀请码")
+    private String invite_code;
+
 }

mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/admin/EsignAdminController.java

@@ -64,4 +64,11 @@ public class EsignAdminController extends BaseControllerImpl {
     public CommonResult getSignedContactFile(@RequestBody JSONObject paramsJSON) {
         return esignContractService.getSignedContactFile(paramsJSON.getInt("store_id"));
     }
+
+    @ApiOperation(value = "区域（二级）代理商审核", notes = "区域（二级）代理商审核")
+    @RequestMapping(value = "/approval/2nd/agent", method = RequestMethod.POST)
+    public CommonResult approval2ndAgent(@RequestBody JSONObject paramsJSON) {
+        return esignPlatformInfoService.approval2ndAgent(paramsJSON);
+    }
+
 }

mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/mobile/EsignController.java

@@ -44,10 +44,5 @@ public class EsignController extends BaseControllerImpl {
         return esignPlatformInfoService.apply2ndAgent(paramsJSON);
     }
 
-    @ApiOperation(value = "区域（二级）代理商审核", notes = "区域（二级）代理商审核")
-    @RequestMapping(value = "/approval/2nd/agent", method = RequestMethod.POST)
-    public CommonResult approval2ndAgent(@RequestBody JSONObject paramsJSON) {
-        return esignPlatformInfoService.approval2ndAgent(paramsJSON);
-    }
 
 }

mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java

@@ -8,7 +8,6 @@
 
 package com.suisung.mall.shop.esign.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -461,9 +460,13 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformI
     }
 
     public CommonResult apply2ndAgent(JSONObject paramsJSON) {
-        log.debug("[申请二级代理商] 开始处理申请，params={}", paramsJSON);
+        log.info("[申请二级代理商] 开始处理申请，params={}", paramsJSON);
 
-        // TODO 鉴权登录情况
+        // 鉴权登录情况
+//        UserDto userDto = getCurrentUser();
+//        if (userDto == null || CheckUtil.isEmpty(userDto.getId())) {
+//            return CommonResult.failed("请先登录");
+//        }
 
         // 参数校验
         if (paramsJSON == null) {
@@ -560,7 +563,7 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformI
      */
     @Override
     public CommonResult get2ndAgentDetailByUserId() {
-        log.debug("[获取二级代理商] 开始处理");
+        log.info("[获取二级代理商] 开始处理");
 
         // 鉴权登录情况
         UserDto userDto = getCurrentUser();
@@ -568,15 +571,17 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformI
             return CommonResult.failed("请先登录");
         }
 
+        Integer userId = Convert.toInt(userDto.getId());
+
         LambdaQueryWrapper<EsignPlatformInfo> queryWrapper = new LambdaQueryWrapper<EsignPlatformInfo>()
-                .eq(EsignPlatformInfo::getCreated_by, userDto.getId())
+                .eq(EsignPlatformInfo::getCreated_by, userId.toString())
                 .orderByAsc(EsignPlatformInfo::getId);
-        List<EsignPlatformInfo> records = find(queryWrapper);
+        EsignPlatformInfo record = getOne(queryWrapper, false);
-        if (CollUtil.isEmpty(records)) {
+        if (ObjectUtil.isEmpty(record)) {
             return CommonResult.failed("您尚未申请代理商入驻");
         }
 
-        return CommonResult.success(records);
+        return CommonResult.success(record);
     }
 
     /**
@@ -587,7 +592,14 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl<EsignPlatformI
      */
     @Override
     public CommonResult approval2ndAgent(JSONObject paramsJSON) {
-        log.debug("[审批二级代理商] 开始处理申请，params={}", paramsJSON);
+        log.info("[审批二级代理商] 开始处理申请，params={}", paramsJSON);
+        // 鉴权登录情况
+//        UserDto userDto = getCurrentUser();
+//        if (userDto == null || CheckUtil.isEmpty(userDto.getId())) {
+//            return CommonResult.failed("请先登录");
+//        }
+
+
         if (paramsJSON == null || paramsJSON.isEmpty()) {
             return CommonResult.failed("缺少必要参数");
         }

mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklLedgerReceiverServiceImpl.java

@@ -191,7 +191,7 @@ public class LklLedgerReceiverServiceImpl extends BaseServiceImpl<LklLedgerRecei
         // legalPersonCertificateType 法人证件类型: 17 身份证，18 护照，19 港澳居民来往内地通行证 20 台湾居民来往内地通行证
         reqParam.set("legalPersonCertificateType", "17");
         reqParam.set("legalPersonCertificateNo", esignPlatformInfo.getLegal_person_id_card()); // 法人身份证号
-        reqParam.set("contactMobile", esignPlatformInfo.getLegal_person_mobile());
+        reqParam.set("contactMobile", esignPlatformInfo.getLegal_person_mobile()); // 使用法人手机号
 
         reqParam.set("level", esignPlatformInfo.getLevel());
         reqParam.set("splitRatio", esignPlatformInfo.getSplit_ratio());