Merge remote-tracking branch 'origin/master'

linwei

2024-01-02 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -396,7 +396,14 @@
            //根据手机号查询库里的数据
            User userParams = new User();
            userParams.setPhone(placeVO.getPrincipalPhone());
            userParams.setIsDeleted(0);
            User user = userService.getOne(Condition.getQueryWrapper(userParams));
            if (null==user){
                User userParams1 = new User();
                userParams1.setAccount(placeVO.getPrincipalPhone());
                userParams1.setIsDeleted(0);
                user = userService.getOne(Condition.getQueryWrapper(userParams1));
            }

            if (null!=user) {
                //如果用户存在，则该用户id绑定场所
@@ -447,8 +454,19 @@
        PlaceExtEntity one = placeExtService.getOne(wrapper);
        if (null == one) {
            placeExtEntity.setPlaceId(placeVO.getId());
            //新增
            placeExtService.savePlaceExt(placeExtEntity);
            if (!Strings.isBlank(placeVO.getPrincipalPhone())) {
                // 待审核
                placeExtEntity.setConfirmFlag(1);
            }else {
                // 待完善
                placeExtEntity.setConfirmFlag(4);
            }
            placeExtEntity.setCreateTime(new Date());
            placeExtEntity.setUpdateTime(new Date());
            placeExtEntity.setCreateUser(AuthUtil.getUserId());
            placeExtEntity.setUpdateUser(AuthUtil.getUserId());
            // 新增场所详情
            placeExtService.save(placeExtEntity);
        }
    }