backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

补偿机制 fix bug

Browse Source
This commit is contained in:
Jack 2025-09-03 18:19:31 +08:00
parent 978d76a87c
commit 830bbe8183
5 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java
View File

@ -106,14 +106,6 @@ public class LoginController extends BaseControllerImpl {
return geTuiPushService.pushMessageToCid("d4df466ea274314ec1025bafa0043f8b", title, paramsJSON.getStr("message"), clickType, clinkContent);
}
@RequestMapping(value = "/testcase", method = RequestMethod.GET)
public Object testcase() {
Map<String, Object> arg = new HashMap<String, Object>();
arg.put("password", "HzMk23");
return accountUserBaseService.sendSmsMessage("", "SMS_481085172", arg);
}
@ApiOperation(value = "登录以后返回token")
@ApiImplicitParams({
@ApiImplicitParam(name = "user_account", value = "账号", paramType = "query", required = false, dataType = "String"),

2
mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java
View File

@ -193,7 +193,7 @@ public class AccountUserBaseController extends BaseControllerImpl {
params.put("password", "");
params.put("user_mobile", userMobile);
params.put("is_merch", "1"); // 是否为商家入驻 1-是；其他-否
params.put("user_is_admin", "2"); // //user_is_admin 用户类型：0-普通用户；1-管理员；2-入驻商户；默认是普通用户
params.put("user_is_admin", CommonConstant.USER_TYPE_MCH.toString()); // //user_is_admin 用户类型：0-普通用户；1-管理员；2-入驻商户；默认是普通用户
if (StrUtil.isNotBlank(cid)) {
params.put("cid", cid); // 个推客户端Id

11
mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java
View File

@ -218,7 +218,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
//user_is_admin 用户类型：0-普通用户；1-管理员；2-入驻商户；默认是普通用户
if (StrUtil.isNotBlank(params.get("user_mobile"))
&& CommonConstant.USER_TYPE_MCH.equals(params.get("user_is_admin"))) {
&& CommonConstant.USER_TYPE_MCH.toString().equals(params.get("user_is_admin"))) {
// 商家版app，显示申请入驻的状态
String userMobile = params.get("user_mobile");
@ -2994,13 +2994,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
// 找出手机对应的绑定用户
// 是否为手机号注册，密码6位随机数
CommonResult result = doMobileBindLogin(verifyMobile, CommonConstant.USER_TYPE_MCH, cid, osType);
if (result.getStatus() == 200L) {
// 登录成功之后，异步检查并修复商户店铺信息
asyncTaskService.checkAndFixMchStoreInfo(PhoneNumberUtils.cleanPhoneNumber(user_mobile));
}
return result;
return doMobileBindLogin(verifyMobile, CommonConstant.USER_TYPE_MCH, cid, osType);
}
/**
@ -3234,7 +3228,6 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl<AccountUserBaseM
// 检查输入字符是不是包含 sql 注入特征，如果包含不给以通过
if (!CommonService.isValidInput(user_mobile, cid, osType)) {
// new ApiException(ResultCode.VALIDATE_INPUTS);
return CommonResult.failed(ResultCode.VALIDATE_INPUTS);
}

4
mall-account/src/main/java/com/suisung/mall/account/service/impl/AsyncTaskService.java
View File

@ -31,11 +31,11 @@ public class AsyncTaskService {
@Async
public Boolean checkAndFixMchStoreInfo(String loginMobile) {
try {
logger.info("开始检查并修复商户店铺信息，手机号: {}", loginMobile);
logger.debug("开始检查并修复商户店铺信息，手机号: {}", loginMobile);
// 调用shop服务检查并修复商户店铺信息
Boolean result = shopService.checkAndFixMchStoreInfo(loginMobile);
// 记录处理结果日志
logger.info("商户店铺信息检查与修复完成，手机号: {}，结果: {}", loginMobile, result);
logger.debug("商户店铺信息检查与修复完成，手机号: {}，结果: {}", loginMobile, result);
return result;
} catch (Exception e) {
// 捕获所有异常，防止影响主流程

2
mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopMchEntryAdminController.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@Slf4j
@Api(tags = "店铺基础信息表")
@Api(tags = "商家入驻业务控制器")
@RestController
@RequestMapping("/admin/shop/merch")
public class ShopMchEntryAdminController extends BaseControllerImpl {