diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java index 5d9eeec22..bc274be35 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java @@ -68,7 +68,7 @@ public class WxMerchantBUserController extends BaseController { @GetMapping("/hasphone") @ApiImplicitParam(name="phone",value="phone",dataType="String", paramType = "query",required=true) public ResultData hasphone(String phone) { - boolean has=wxMerchantBUserService.hasphone(phone); + boolean has=wxMerchantBUserService.hasphone(phone,getTenantId()); return new ResultData(Result.SUCCESS,"查询成功",has); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java index fe5d196d3..4adc85da5 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantBUserService.java @@ -55,7 +55,7 @@ public interface WxMerchantBUserService { void deleteById(Long id); - boolean hasphone(String phone); + boolean hasphone(String phone, String tenantId); 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 595e9e337..6e6b0eb23 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -10,6 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.domain.po.WxMsgValidationcode; +import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.exception.MallinkException; import com.iformall.mapper.WxAppinfoMapper; import com.iformall.mapper.WxMerchantBUserMapper; @@ -85,10 +86,11 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { } @Override - public boolean hasphone(String phone) { + public boolean hasphone(String phone, String tenantId) { WxMerchantBUser bUser = new WxMerchantBUser(); + bUser.setTenantId(tenantId); bUser.setPhone(phone); - bUser.setStatus(0); + bUser.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode()); List list = wxMerchantBUserMapper.findList(bUser); return list.size()>=1?true:false; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 78cb42b70..6660a9f64 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -132,6 +132,15 @@ public class WxMerchantServiceImpl implements WxMerchantService { wxShop.setStatus(EnumShopStatus.NOT_RENT.getCode());//未出租 WxShopMapper.updateByPrimaryKeySelective(wxShop); } + + //解绑用户 + WxMerchantBUser bUser = new WxMerchantBUser(); + bUser.setMerchantId(wxMerchant.getId()); + List wxMerchantBUserMapperList = wxMerchantBUserMapper.findList(bUser); + for(WxMerchantBUser wxMerchantBUser:wxMerchantBUserMapperList){ + wxMerchantBUser.setStatus(EnumMerchantBUserStatus.NOT_BOUND.getCode()); + wxMerchantBUserMapper.updateByPrimaryKeySelective(wxMerchantBUser); + } } @Transactional diff --git a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml index 5d8a61c02..603e233e3 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantBUserMapper.xml @@ -30,7 +30,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId}