From 8b3a7400f42ad265243787b70c144e2c1fb8d37f Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 27 Nov 2022 13:11:48 +0800 Subject: [PATCH] // --- .../controller/WxMerchantBUserController.java | 40 ++++++++++--------- .../WxMsgValidationcodeController.java | 4 +- .../service/WxMerchantBUserService.java | 2 +- .../impl/WxMerchantBUserServiceImpl.java | 13 +----- .../mapper/WxMerchantBUserMapper.xml | 2 +- 5 files changed, 28 insertions(+), 33 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 168333504..7a3301774 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -3,6 +3,7 @@ package com.iformall.controller; import com.iformall.annotation.AuthIgnore; import com.iformall.annotation.RedisCache; +import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; @@ -122,6 +123,7 @@ public class WxMerchantBUserController extends BaseController { * @param map * @return */ + @TenantIgnore @AuthIgnore @PostMapping("/login") @ApiOperation(value = "用户登录", notes = "{" + @@ -158,8 +160,8 @@ public class WxMerchantBUserController extends BaseController { } WxMerchantBUser userQ = new WxMerchantBUser(); - userQ.updateTenantInfo(wxAppinfo); -// userQ.setAppId(appId); +// userQ.updateTenantInfo(wxAppinfo); + userQ.setAppId(appId); userQ.setPhone(phone); userQ.setStatus(EnumMerchantBUserStatus.VALID.getCode()); List orgList = wxMerchantBUserService.getBUserByAppId(userQ); @@ -174,12 +176,12 @@ public class WxMerchantBUserController extends BaseController { ResultData merchantStatus = checkMerchantStatus(orgUser); if (merchantStatus != null) return merchantStatus; - try { - wxMerchantBUserService.saveOrUpdate(orgUser); - } catch (Exception e) { - logger.error("B端用户更新用户信息失败, e:" + e.getMessage()); - return new ResultData(ErrorCode.DB_FAIL.getCode(), "数据库保存失败,e:" + e.getMessage()); - } +// try { +// wxMerchantBUserService.saveOrUpdate(orgUser); +// } catch (Exception e) { +// logger.error("B端用户更新用户信息失败, e:" + e.getMessage()); +// return new ResultData(ErrorCode.DB_FAIL.getCode(), "数据库保存失败,e:" + e.getMessage()); +// } Map resultMap = new HashMap<>(); resultMap.put("bUserId", orgUser.getId()); resultMap.put("logined", true); @@ -202,9 +204,9 @@ public class WxMerchantBUserController extends BaseController { List merchantListInfo = wxMerchantBUserService.getMerchantInfoByBUser(userQ); Map resultMap = new HashMap<>(); resultMap.put("merchantList", merchantListInfo); - resultMap.put("logined", true); - resultMap.put("bUserId", orgUser.getId()); - request.setAttribute(Constant.LOGIN_B_USER_KEY, orgUser.getId()); + resultMap.put("logined", false); +// resultMap.put("bUserId", orgUser.getId()); +// request.setAttribute(Constant.LOGIN_B_USER_KEY, orgUser.getId()); return new ResultData(resultMap); } else { logger.error(ErrorCode.PASSWORD_ERROR.getMessage()); @@ -220,6 +222,7 @@ public class WxMerchantBUserController extends BaseController { } } + @TenantIgnore @AuthIgnore @PostMapping("/selectMerchant") @ApiOperation(value = "选择商户", notes = "{" + @@ -245,12 +248,12 @@ public class WxMerchantBUserController extends BaseController { if (orgUser != null) { ResultData merchantStatus = checkMerchantStatus(orgUser); if (merchantStatus != null) return merchantStatus; - try { - wxMerchantBUserService.saveOrUpdate(orgUser); - } catch (Exception e) { - logger.error("B端用户更新用户信息失败, e:" + e.getMessage()); - return new ResultData(ErrorCode.DB_FAIL.getCode(), "数据库保存失败,e:" + e.getMessage()); - } +// try { +// wxMerchantBUserService.saveOrUpdate(orgUser); +// } catch (Exception e) { +// logger.error("B端用户更新用户信息失败, e:" + e.getMessage()); +// return new ResultData(ErrorCode.DB_FAIL.getCode(), "数据库保存失败,e:" + e.getMessage()); +// } Map resultMap = new HashMap<>(); resultMap.put("bUserId", orgUser.getId()); resultMap.put("logined", true); @@ -285,6 +288,7 @@ public class WxMerchantBUserController extends BaseController { } + @TenantIgnore @AuthIgnore @ApiOperation(value = "修改密码,集团版会修改集团下同一手机号的密码", notes = "{\"appId\",\"string\", \"phone\",\"string\",\"code\",\"string\",\"pwd\",\"string\"}") @PostMapping("/updatepwd") @@ -306,7 +310,7 @@ public class WxMerchantBUserController extends BaseController { if (StringUtils.isBlank(pwd)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "密码不能为空"); } - return wxMerchantBUserService.updatePwd(getTenantInfo(), phone, code, pwd); + return wxMerchantBUserService.updatePwd(appId, phone, code, pwd); } } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index fcca737fb..1fe79b5fd 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -1,5 +1,6 @@ package com.iformall.controller; +import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; @@ -37,8 +38,7 @@ public class WxMsgValidationcodeController extends BaseController { @Autowired private WxMerchantService wxMerchantService; - - + @TenantIgnore @GetMapping("sendvalidationcode") @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true), diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java index 00c58f123..1f3d0f2b7 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java @@ -64,6 +64,6 @@ public interface WxMerchantBUserService { boolean hasPhone(TenantEntity tenantEntity, String phone); - ResultData updatePwd(TenantEntity tenantEntity, String phone, String code, String pwd); + ResultData updatePwd(String appId, String phone, String code, String pwd); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index f4a3f0300..c0e06e6fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -148,10 +148,9 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { } @Override - public ResultData updatePwd(TenantEntity tenantEntity, String phone, String code, String pwd) { + public ResultData updatePwd(String appId, String phone, String code, String pwd) { WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode(); - wxMsgValidationcode.setTenantId(tenantEntity.getTenantId()); wxMsgValidationcode.setPhone(phone); wxMsgValidationcode.setCode(code); List msgValidationCodeList = wxMsgValidationcodeMapper.findList(wxMsgValidationcode); @@ -161,18 +160,10 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { if (msgValidationCodeList.size() > 0) { //更新 WxMerchantBUser bUser = new WxMerchantBUser(); - bUser.setTenantId(tenantEntity.getTenantId()); + bUser.setAppId(appId); bUser.setPhone(phone); bUser.setStatus(EnumMerchantBUserStatus.VALID.getCode()); List list = wxMerchantBUserMapper.findList(bUser); - if(wxMallService.isgroupSupport(tenantEntity)){ - bUser.setTenantId(null); - bUser.setParentTenantId(tenantEntity.getTenantId()); - List list1 = wxMerchantBUserMapper.findList(bUser); - if(list1.size() > 0){ - list.addAll(list1); - } - } if (list.size() > 0) { for (WxMerchantBUser merchantBUser:list) { merchantBUser.setUserPwd(pwd); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index ba745d56e..9db3cffde 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -155,7 +155,7 @@ mbu.tenant_id, mbu.parent_tenant_id, m.name tenant_name, mc.name merchant_name, mbu.id bu_user_id, mbu.merchant_id, mc.img_url from wx_merchant_b_user mbu, wx_merchant mc, wx_mall m - m.tenant_id = mbu.parent_tenant_id + m.tenant_id = mbu.tenant_id and mbu.merchant_id = mc.id and mc.status = 1 and mbu.`app_id` = #{appId}