xhxu 3 лет назад
Родитель
Сommit
8b3a7400f4
5 измененных файлов: 28 добавлений и 33 удалений
  1. +22
    -18
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java
  2. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java
  4. +2
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml

+ 22
- 18
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<WxMerchantBUser> 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<String, Object> resultMap = new HashMap<>();
resultMap.put("bUserId", orgUser.getId());
resultMap.put("logined", true);
@@ -202,9 +204,9 @@ public class WxMerchantBUserController extends BaseController {
List<WxMerchantBuInfoVo> merchantListInfo = wxMerchantBUserService.getMerchantInfoByBUser(userQ);
Map<String, Object> 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<String, Object> 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);
}

}

+ 2
- 2
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),


+ 1
- 1
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);

}

+ 2
- 11
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<WxMsgValidationcode> 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<WxMerchantBUser> list = wxMerchantBUserMapper.findList(bUser);
if(wxMallService.isgroupSupport(tenantEntity)){
bUser.setTenantId(null);
bUser.setParentTenantId(tenantEntity.getTenantId());
List<WxMerchantBUser> list1 = wxMerchantBUserMapper.findList(bUser);
if(list1.size() > 0){
list.addAll(list1);
}
}
if (list.size() > 0) {
for (WxMerchantBUser merchantBUser:list) {
merchantBUser.setUserPwd(pwd);


+ 1
- 1
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
<where> m.tenant_id = mbu.parent_tenant_id
<where> m.tenant_id = mbu.tenant_id
and mbu.merchant_id = mc.id and mc.status = 1
<if test=" null != appId ">
and mbu.`app_id` = #{appId}


Загрузка…
Отмена
Сохранить