diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java index 6b88e2d2..6b5b1b55 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java @@ -7,6 +7,7 @@ import com.suisung.mall.account.service.AccountUserBaseService; import com.suisung.mall.account.service.AccountUserInfoService; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.constant.AuthConstant; +import com.suisung.mall.common.constant.CommonConstant; import com.suisung.mall.common.constant.RedisConstant; import com.suisung.mall.common.service.impl.BaseControllerImpl; import com.suisung.mall.common.utils.I18nUtil; @@ -70,7 +71,7 @@ public class LoginController extends BaseControllerImpl { //user_account判断是否手机号 if (result.getStatus() != 200 && Validator.isNumber(user_account)) { - user_account = "+86" + user_account; + user_account = CommonConstant.IDD_ZH_CN + user_account; if (PhoneNumberUtils.isValidNumber(user_account)) { //尝试手机号绑定登录 result = accountUserBaseService.doMobileBindLogin(user_account, user_password); @@ -101,7 +102,7 @@ public class LoginController extends BaseControllerImpl { //user_account判断是否手机号 if (result.getStatus() != 200 && Validator.isNumber(user_account)) { - user_account = "+86" + user_account; + user_account = CommonConstant.IDD_ZH_CN + user_account; if (PhoneNumberUtils.isValidNumber(user_account)) { //尝试手机号绑定登录 result = accountUserBaseService.doMobileBindLogin(user_account, user_password); diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java index 71450d8c..9188513f 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java @@ -10,6 +10,7 @@ import com.suisung.mall.account.service.AccountUserBaseService; import com.suisung.mall.account.service.AccountUserLoginService; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.constant.AuthConstant; +import com.suisung.mall.common.constant.CommonConstant; import com.suisung.mall.common.constant.RedisConstant; import com.suisung.mall.common.domain.UserDto; import com.suisung.mall.common.exception.ApiUserException; @@ -147,7 +148,7 @@ public class AccountUserBaseController extends BaseControllerImpl { //user_account判断是否手机号 if (result.getStatus() != 200 && Validator.isNumber(user_account)) { - user_account = "+86" + user_account; + user_account = CommonConstant.IDD_ZH_CN + user_account; if (PhoneNumberUtils.isValidNumber(user_account)) { //尝试手机号绑定登录 result = accountUserBaseService.doMobileBindLogin(user_account, user_password); diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/mobile/UserController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/mobile/UserController.java index 4cd39608..a5259821 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/mobile/UserController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/mobile/UserController.java @@ -10,6 +10,7 @@ import cn.hutool.core.util.StrUtil; import com.suisung.mall.account.service.*; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.api.ResultCode; +import com.suisung.mall.common.constant.CommonConstant; import com.suisung.mall.common.domain.UserDto; import com.suisung.mall.common.exception.ApiException; import com.suisung.mall.common.feignService.PayService; @@ -272,9 +273,18 @@ public class UserController extends BaseControllerImpl { @RequestMapping(value = "/verifyCode", method = RequestMethod.GET) public CommonResult getVerifyCode(@RequestParam(name = "mobile", required = false) String mobile, @RequestParam(name = "email", required = false) String email) { - if (StrUtil.isNotBlank(mobile) && !PhoneNumberUtils.isValidNumber(mobile)) { - throw new ApiException(I18nUtil._("请输入正确的手机号!")); + + // 2024-12-12 update + if(StrUtil.isNotBlank(mobile)) { + if(!StrUtil.startWith(mobile, CommonConstant.IDD_ZH_CN)) { + mobile = CommonConstant.IDD_ZH_CN + mobile; + } + + if(!PhoneNumberUtils.isValidNumber(mobile)){ + throw new ApiException(I18nUtil._("请输入正确的手机号!")); + } } + else if (StrUtil.isNotBlank(email) && !CheckUtil.isEmail(email)) { throw new ApiException(I18nUtil._("请输入正确邮箱格式!")); } 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 8137b036..62501034 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 @@ -29,10 +29,7 @@ import com.suisung.mall.common.api.BindCode; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.api.PointsType; import com.suisung.mall.common.api.ResultCode; -import com.suisung.mall.common.constant.AuthConstant; -import com.suisung.mall.common.constant.ConfigConstant; -import com.suisung.mall.common.constant.RedisConstant; -import com.suisung.mall.common.constant.SignConstant; +import com.suisung.mall.common.constant.*; import com.suisung.mall.common.domain.RoleIdEnum; import com.suisung.mall.common.domain.TokenDto; import com.suisung.mall.common.domain.UserDto; @@ -2079,7 +2076,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl tmplArgs = new HashMap<>(2); tmplArgs.put("order_id", order_id); tmplArgs.put("order_payment_amount", order_payment_amount); - // 所有店铺管理员的发送邮件, 提醒商家:您收到一笔${order_payment_amount}元新订单${order_id}付款,请及时处理! - shopMessageTemplateService.aliyunSmsSend(shopKeeperMobiles, "SMS_475831067", tmplArgs);//SMS_475945807 + // 所有店铺管理员的发送邮件, 提醒商家:您有一笔新的订单 ${order_id},请及时处理。 + shopMessageTemplateService.aliyunSmsSend(shopKeeperMobiles, "SMS_475836097", tmplArgs);//SMS_475945807 } // 付款成功,对通知推广员进行提醒 diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreEmployeeController.java b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreEmployeeController.java index d1d6e2b2..02f04576 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreEmployeeController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreEmployeeController.java @@ -2,6 +2,7 @@ package com.suisung.mall.shop.store.controller.admin; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.suisung.mall.common.api.CommonResult; +import com.suisung.mall.common.constant.CommonConstant; import com.suisung.mall.common.modules.store.ShopStoreEmployee; import com.suisung.mall.shop.store.service.ShopStoreEmployeeService; import io.swagger.annotations.Api; @@ -74,6 +75,8 @@ public class ShopStoreEmployeeController { userInfo.put("user_account", user_account); userInfo.put("user_password", user_password); userInfo.put("user_nickname", user_nickname); + // 2024-12-12 update + userInfo.put("user_intl", CommonConstant.IDD_ZH_CN); if (user_gender != null) { userInfo.put("user_gender", user_gender); } 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 5c293688..44d2e43c 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 @@ -148,6 +148,7 @@ public class ShopStoreEmployeeServiceImpl extends BaseServiceImpl