diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java index feadc1005..cea098370 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java @@ -34,11 +34,13 @@ import com.mhd.user.domain.roleAggregate.entity.RoleEntity; import com.mhd.user.domain.roleAggregate.repository.todo.RoleDo; import com.mhd.user.domain.roleAggregate.service.RoleDomainService; import com.mhd.common.core.domain.po.RolePO; +import com.mhd.user.domain.userAggregate.entity.UserEntity; import com.mhd.user.domain.userAggregate.entity.UserRoleEntity; import com.mhd.user.domain.userAggregate.entity.AgreementDetails; import com.mhd.user.domain.userAggregate.entity.UserShipperEntity; import com.mhd.user.domain.userAggregate.event.ShipperEventPublisher; import com.mhd.user.domain.userAggregate.repository.mapper.AgreementDetailsMapper; +import com.mhd.user.domain.userAggregate.repository.mapper.UserMapper; import com.mhd.user.domain.userAggregate.repository.mapper.UserShipperMapper; import com.mhd.user.domain.userAggregate.repository.po.UserDriverPo; import com.mhd.user.domain.userAggregate.repository.todo.*; @@ -129,6 +131,8 @@ public class UserShipperApplicationService { @Resource private AgreementDetailsMapper agreementDetailsMapper; + @Resource + private UserMapper userMapper; /** * @Description 查询托运人列表 @@ -312,6 +316,10 @@ public class UserShipperApplicationService { if (ObjectUtil.isNull(configSwitch)) { throw new ServiceException("获取组织配置失败"); } + List userEntities = userMapper.selectByUserPhone(userShipperDO.getUserPhone()); + if (userEntities.size()>0){ + throw new ServiceException("账户名已存在"); + } LoginUser loginUser = SecurityUtils.getLoginUser(); Map result = new HashMap<>(); diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/AgreementDetails.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/AgreementDetails.java index 652ecc52f..371185ef2 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/AgreementDetails.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/AgreementDetails.java @@ -18,7 +18,7 @@ public class AgreementDetails extends BaseVOEntity { private static final long serialVersionUID = 1L; - @TableId(type = IdType.AUTO) + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private Long id; diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java index a55f709d5..7ef0384b8 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java @@ -79,4 +79,6 @@ public interface UserMapper extends BaseMapper { YmsSysUserDTO selectYmsByUserId(Long userId); Integer getOrdIsQueue(Long organizationId); + + List selectByUserPhone(String userPhone); } \ No newline at end of file diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml index 945639967..46852813a 100644 --- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml @@ -799,5 +799,8 @@ + \ No newline at end of file