diff --git a/mall-account/src/main/resources/mapper/account/AccountUserBindConnectMapper.xml b/mall-account/src/main/resources/mapper/account/AccountUserBindConnectMapper.xml
index 749f2f5b..09442284 100644
--- a/mall-account/src/main/resources/mapper/account/AccountUserBindConnectMapper.xml
+++ b/mall-account/src/main/resources/mapper/account/AccountUserBindConnectMapper.xml
@@ -4,6 +4,6 @@
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
diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/account/AccountUserBindConnect.java b/mall-common/src/main/java/com/suisung/mall/common/modules/account/AccountUserBindConnect.java
index 834caa0a..d5aa5662 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/modules/account/AccountUserBindConnect.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/account/AccountUserBindConnect.java
@@ -101,7 +101,7 @@ public class AccountUserBindConnect implements Serializable {
@ApiModelProperty(value = "新增时间")
private Date created_at;
-
+
@ApiModelProperty(value = "更新时间")
private Date updated_at;
@@ -111,4 +111,7 @@ public class AccountUserBindConnect implements Serializable {
@ApiModelProperty(value = "剩余订阅次数")
private Integer send_number;
+ @ApiModelProperty(value = "(商家的)代理商的邀请码")
+ private String invite_code;
+
}
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/admin/EsignAdminController.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/admin/EsignAdminController.java
index 4ad451ff..7635fc90 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/admin/EsignAdminController.java
+++ b/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);
+ }
+
}
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/mobile/EsignController.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/mobile/EsignController.java
index 9b83ea09..bfcf3772 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/controller/mobile/EsignController.java
+++ b/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);
- }
}
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java
index 6d32b09a..71d26b3e 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/esign/service/impl/EsignPlatformInfoServiceImpl.java
+++ b/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 queryWrapper = new LambdaQueryWrapper()
- .eq(EsignPlatformInfo::getCreated_by, userDto.getId())
+ .eq(EsignPlatformInfo::getCreated_by, userId.toString())
.orderByAsc(EsignPlatformInfo::getId);
- List records = find(queryWrapper);
- if (CollUtil.isEmpty(records)) {
+ EsignPlatformInfo record = getOne(queryWrapper, false);
+ if (ObjectUtil.isEmpty(record)) {
return CommonResult.failed("您尚未申请代理商入驻");
}
- return CommonResult.success(records);
+ return CommonResult.success(record);
}
/**
@@ -587,7 +592,14 @@ public class EsignPlatformInfoServiceImpl extends BaseServiceImpl