|
@@ -44,7 +44,7 @@ public class KfGuestServiceImpl implements IKfGuestService {
|
|
|
* @return 客人管理
|
|
* @return 客人管理
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
- public KfGuestVo queryById(Long id){
|
|
|
|
|
|
|
+ public KfGuestVo queryById(Long id) {
|
|
|
return baseMapper.selectVoById(id);
|
|
return baseMapper.selectVoById(id);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -84,15 +84,15 @@ public class KfGuestServiceImpl implements IKfGuestService {
|
|
|
return lqw;
|
|
return lqw;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private QueryWrapper<KfGuest> buildQueryWrapper(KfGuestBo bo,String tableAlias) {
|
|
|
|
|
|
|
+ private QueryWrapper<KfGuest> buildQueryWrapper(KfGuestBo bo, String tableAlias) {
|
|
|
QueryWrapper<KfGuest> lqw = new QueryWrapper<>();
|
|
QueryWrapper<KfGuest> lqw = new QueryWrapper<>();
|
|
|
String columnPrefix = "";
|
|
String columnPrefix = "";
|
|
|
- if(StringUtils.isNotBlank(tableAlias)){
|
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(tableAlias)) {
|
|
|
columnPrefix = tableAlias + ".";
|
|
columnPrefix = tableAlias + ".";
|
|
|
}
|
|
}
|
|
|
- lqw.like(StringUtils.isNotBlank(bo.getName()), columnPrefix+"name", bo.getName());
|
|
|
|
|
- lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), columnPrefix+"id_card", bo.getIdCard());
|
|
|
|
|
- lqw.eq(StringUtils.isNotBlank(bo.getPhone()), columnPrefix+"phone", bo.getPhone());
|
|
|
|
|
|
|
+ lqw.like(StringUtils.isNotBlank(bo.getName()), columnPrefix + "name", bo.getName());
|
|
|
|
|
+ lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), columnPrefix + "id_card", bo.getIdCard());
|
|
|
|
|
+ lqw.eq(StringUtils.isNotBlank(bo.getPhone()), columnPrefix + "phone", bo.getPhone());
|
|
|
return lqw;
|
|
return lqw;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -133,13 +133,14 @@ public class KfGuestServiceImpl implements IKfGuestService {
|
|
|
/**
|
|
/**
|
|
|
* 保存前的数据校验
|
|
* 保存前的数据校验
|
|
|
*/
|
|
*/
|
|
|
- private void validEntityBeforeSave(KfGuest entity){
|
|
|
|
|
|
|
+ private void validEntityBeforeSave(KfGuest entity) {
|
|
|
// 身份证号、手机号不允许重复
|
|
// 身份证号、手机号不允许重复
|
|
|
- if(StringUtils.isNotBlank(entity.getIdCard()) || StringUtils.isNotBlank(entity.getPhone())){
|
|
|
|
|
|
|
+ if (StringUtils.isNotBlank(entity.getIdCard()) || StringUtils.isNotBlank(entity.getPhone())) {
|
|
|
LambdaQueryWrapper<KfGuest> lqw = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<KfGuest> lqw = Wrappers.lambdaQuery();
|
|
|
- lqw.and(StringUtils.isNotBlank(entity.getIdCard()), qw -> qw.eq(KfGuest::getIdCard, entity.getIdCard()).or().eq(KfGuest::getPhone, entity.getPhone()));
|
|
|
|
|
|
|
+ lqw.and(StringUtils.isNotBlank(entity.getIdCard()),
|
|
|
|
|
+ qw -> qw.eq(KfGuest::getIdCard, entity.getIdCard()).or().eq(KfGuest::getPhone, entity.getPhone()));
|
|
|
lqw.ne(entity.getId() != null, KfGuest::getId, entity.getId());
|
|
lqw.ne(entity.getId() != null, KfGuest::getId, entity.getId());
|
|
|
- if(baseMapper.selectCount(lqw) > 0){
|
|
|
|
|
|
|
+ if (baseMapper.selectCount(lqw) > 0) {
|
|
|
throw new ServiceException("身份证号或手机号已存在!");
|
|
throw new ServiceException("身份证号或手机号已存在!");
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -154,19 +155,30 @@ public class KfGuestServiceImpl implements IKfGuestService {
|
|
|
*/
|
|
*/
|
|
|
@Override
|
|
@Override
|
|
|
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
|
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
|
|
|
- if(isValid){
|
|
|
|
|
- //TODO 做一些业务上的校验,判断是否需要校验
|
|
|
|
|
|
|
+ if (isValid) {
|
|
|
|
|
+ // TODO 做一些业务上的校验,判断是否需要校验
|
|
|
}
|
|
}
|
|
|
return baseMapper.deleteByIds(ids) > 0;
|
|
return baseMapper.deleteByIds(ids) > 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 根据客人业务对象查询客人信息
|
|
|
|
|
+ *
|
|
|
|
|
+ * @param bo 客人业务对象
|
|
|
|
|
+ * @return 客人信息
|
|
|
|
|
+ */
|
|
|
@Override
|
|
@Override
|
|
|
public KfGuestVo selectGuestByBo(KfGuestBo bo) {
|
|
public KfGuestVo selectGuestByBo(KfGuestBo bo) {
|
|
|
LambdaQueryWrapper<KfGuest> lqw = this.buildQueryWrapper(bo);
|
|
LambdaQueryWrapper<KfGuest> lqw = this.buildQueryWrapper(bo);
|
|
|
- return baseMapper.selectVoOne(lqw,KfGuestVo.class);
|
|
|
|
|
|
|
+ return baseMapper.selectVoOne(lqw, KfGuestVo.class);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void insertGuestTeam( KfGuestBo bo) {
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 生成客人与团客对应关系
|
|
|
|
|
+ *
|
|
|
|
|
+ * @param bo 客人业务对象
|
|
|
|
|
+ */
|
|
|
|
|
+ private void insertGuestTeam(KfGuestBo bo) {
|
|
|
if (ObjectUtil.isNotEmpty(bo.getTeamId()) && bo.getTeamId() > 0) {
|
|
if (ObjectUtil.isNotEmpty(bo.getTeamId()) && bo.getTeamId() > 0) {
|
|
|
KfGuestTeamRBo kfGuestTeamR = new KfGuestTeamRBo();
|
|
KfGuestTeamRBo kfGuestTeamR = new KfGuestTeamRBo();
|
|
|
kfGuestTeamR.setTeamId(bo.getTeamId());
|
|
kfGuestTeamR.setTeamId(bo.getTeamId());
|