diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountController.java index 9ce348c9..0355e1c6 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountController.java @@ -284,6 +284,12 @@ public class AccountController { return CommonResult.success(data); } + /** + * 新用户注册(供后台远程调用) + * + * @param userInfo + * @return + */ @RequestMapping(value = "/register", method = RequestMethod.POST) public CommonResult register(@RequestBody Map userInfo) { return CommonResult.success(accountUserBaseService.register(userInfo)); @@ -441,7 +447,7 @@ public class AccountController { @RequestMapping(value = "/getAccountsMapByMobile", method = RequestMethod.POST) - public Map getAccountsMapByMobile(@RequestBody List mobiles) { + public Map getAccountsMapByMobile(@RequestBody List mobiles) { return accountUserBaseService.getAccountBaseMapByMobile(mobiles); } @@ -458,7 +464,7 @@ public class AccountController { @RequestMapping(value = "/saveBatchAccountInfo", method = RequestMethod.POST) public ThirdApiRes saveBatchAccountInfo(@RequestBody List accountUserInfoList) { - return accountUserBaseService.saveBatchAccountInfo( accountUserInfoList); + return accountUserBaseService.saveBatchAccountInfo(accountUserInfoList); } @@ -466,7 +472,7 @@ public class AccountController { public AccountUserBase findOneAccountUserBase(@RequestBody AccountUserBase accountUserBase) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("user_is_admin", accountUserBase.getUser_is_admin()); - queryWrapper.eq("store_ids",accountUserBase.getStore_ids()); + queryWrapper.eq("store_ids", accountUserBase.getStore_ids()); queryWrapper.last("limit 1"); return accountUserBaseService.getOne(queryWrapper); } diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBaseService.java b/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBaseService.java index 4b0ea07f..e02b03ec 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBaseService.java +++ b/mall-account/src/main/java/com/suisung/mall/account/service/AccountUserBaseService.java @@ -225,6 +225,15 @@ public interface AccountUserBaseService extends IBaseService { */ Boolean existByMobile(String userAccount, String storeId); + /** + * 判断某类型的用户账号是否存在 + * + * @param userAccount + * @param userIsAdmin + * @return + */ + Boolean existByUserAccount(String userAccount, Integer userIsAdmin); + Pair saveOrUpdate2(AccountUserBase entity); diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java index 82566c52..129f409f 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java +++ b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java @@ -1698,9 +1698,22 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl 0; } + /** + * 判断某类型的用户账号是否存在 + * + * @param userAccount + * @param userIsAdmin + * @return + */ + @Override + public Boolean existByUserAccount(String userAccount, Integer userIsAdmin) { + if (StrUtil.isBlank(userAccount) && ObjectUtil.isEmpty(userIsAdmin)) { + return false; + } + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AccountUserBase::getUser_account, userAccount).eq(AccountUserBase::getUser_is_admin, userIsAdmin); + return count(queryWrapper) > 0; + } + @Override public Pair saveOrUpdate2(AccountUserBase entity) { Boolean flag = false; 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 62e4eba3..dd1d5caa 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 @@ -99,5 +99,10 @@ public class AccountUserBindConnect implements Serializable { @ApiModelProperty(value = "是否激活(BOOL):0-未激活;1-激活") private Integer bind_active; + @ApiModelProperty(value = "新增时间") + private Date created_at; + + @ApiModelProperty(value = "更新时间") + private Date updated_at; } diff --git a/mall-common/src/main/java/com/suisung/mall/common/utils/CheckUtil.java b/mall-common/src/main/java/com/suisung/mall/common/utils/CheckUtil.java index d30444a5..fb4bc945 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/utils/CheckUtil.java +++ b/mall-common/src/main/java/com/suisung/mall/common/utils/CheckUtil.java @@ -86,7 +86,7 @@ public class CheckUtil { } /** - * 手机号码校验(三大运营商最新号段 合作版 2021-03) + * 手机号码校验(三大运营商最新号段 合作版 2021-03), 手机号去掉国家码之后,验证手机号段是否属于三大运营商 * 移动号段: * 134 135 136 137 138 139 147 148 150 151 152 157 158 159 172 178 182 183 184 187 188 195 198 *

diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreEmployeeServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreEmployeeServiceImpl.java index 8e8792ba..69bb25bd 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreEmployeeServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreEmployeeServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.suisung.mall.common.api.BindCode; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.api.ResultCode; import com.suisung.mall.common.api.StateCode; @@ -155,10 +156,14 @@ public class ShopStoreEmployeeServiceImpl extends BaseServiceImpl