bug修复

house-biz/src/main/resources/mapper/TmHouseMapper.xml

@@ -54,23 +54,25 @@
 
 
     <select id="selectHouseInfoList" resultType="java.util.Map">
-        select * from (select
-              house.cover_image,
-              house.house_id,
-              house.title,
-              house.estate_name,
-              house.sale_type,
-              house.price,
-              house.area,
-              house.query_num,
-              house.last_modify_datetime,
-              house.create_time,
-              house.enable,
-              relation.agency_user_id as agency_user_id,
-              relation.name as name
-              from tm_house house
-                            left  join tm_house_agency_relation relation on house.house_id = relation.house_id) a
-        ${ew.customSqlSegment}
+        select
+            house.cover_image,
+            house.house_id,
+            house.title,
+            house.estate_name,
+            house.sale_type,
+            house.price,
+            house.area,
+            house.query_num,
+            house.last_modify_datetime,
+            house.create_time,
+            house.enable,
+            house.is_show,
+            relation.agency_user_id as agency_user_id,
+            relation.name as name
+        from tm_house house
+                 left  join tm_house_agency_relation relation
+                            on house.house_id = relation.house_id
+            ${ew.customSqlSegment}
     </select>
 
     <select id="selectAgencyHouseList" resultType="com.ljq.house.biz.model.TmHouse">

house-common/src/main/java/com/ljq/house/common/service/HouseHelperService.java

@@ -255,6 +255,10 @@ public class HouseHelperService {
             result.put("coverAdditionsImages" , tmHouse.getCoverAdditionsImages());
             result.put("unitPrice",tmHouse.getUnitPrice());
             result.put("addresImages",tmHouse.getAddresImages());
+            
+            //2021.6.23 增加
+            result.put("introduceVideo",tmHouse.getIntroduceVideo());
+            result.put("videoCoverImage",tmHouse.getVideoCoverImage());
 
         }
 
@@ -294,6 +298,9 @@ public class HouseHelperService {
             result.put("businessId" , tmAgency.getBusinessId());
             result.put("email" , tmAgency.getEmail());
 
+            //2021.6.23 增加
+            result.put("agencyCompanyName" , tmAgency.getAgencyCompanyName());
+
         }
 
         if(null != tmUser){

house-web/src/main/java/com/ljq/house/admin/controller/AdminTmAgencyController.java

@@ -57,8 +57,6 @@ public class AdminTmAgencyController {
     private TmAgencyUserRelationDao tmAgencyUserRelationDao;
 
 
-
-
     @ApiOperation(value = "获取经纪人详情")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "agency_user_id", value = "经纪人ID(32位)", paramType = "query", required = true, dataType = "String")}

house-web/src/main/java/com/ljq/house/admin/controller/AdminTmHouseController.java

@@ -552,4 +552,77 @@ public class AdminTmHouseController {
         return Result.success("删除成功");
     }
 
+
+    @ApiOperation(value = "新增房源")
+    @PostMapping(value = "/add")
+    @ResponseBody
+    @RequiresRoles(value = {"super_admin", "normal_admin", "agency","sub_normal_admin"}, logical = Logical.OR)
+    public Result addHouse(@RequestBody @ApiParam(name = "房源对象", value = "传入json格式", required = true) TmHouse tmHouse) {
+
+        boolean result = false;
+        String houseId = UUidGenerator.generatorUuid(IdStarterEnum.HOUSE.getStarter());
+        if (null != tmHouse) {
+            if (StringUtils.isBlank(tmHouse.getAddress())) {
+                throw new CommonBaseException(ResultCodeEnum.D024);
+            }
+            //管控一个场景只能绑定一个房源
+            if (StringUtils.isNoneBlank(tmHouse.getSceneNum())) {
+                QueryWrapper<TmHouse> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("scene_num", tmHouse.getSceneNum());
+                queryWrapper.eq("enable", 1);
+                queryWrapper.last("limit 1");
+                TmHouse dbhouse = tmHouseDao.selectOne(queryWrapper);
+                if (null != dbhouse) {
+                    throw new CommonBaseException(ResultCodeEnum.D025);
+                }
+            }
+            if (StringUtils.isNoneBlank(tmHouse.getVrLink())) {
+                String qrCodeUrl = "/pages/web/web?vr_link=" + tmHouse.getVrLink();
+                //生成带看页面的二维码
+                String imageLocalPath = imageFilePath + houseId + "_QRCode.png";
+                WxOpUtils.getWxQRCode(qrCodeUrl, userWxAppId, userWxAppSecret, imageLocalPath);
+                String ossPath = ossImagePath + houseId + "_QRCode.png";
+                ossCheckPointUploadUtil.upload2(imageLocalPath, ossPath);
+                String imageTotalOssUrl = ossQueryUrl + ossPath;
+                tmHouse.setWxAqrCode(imageTotalOssUrl);
+                File file = new File(imageLocalPath);
+                if (file.exists()) {
+                    //删除本地缓存的二维码
+                    file.delete();
+                }
+            }
+            TmAdmin user = ShiroUtils.getAdmin();
+            if(user == null){
+                log.error("用户未登录，登录");
+                throw new CommonBaseException(ResultCodeEnum.D101 , "未登录，请登录");
+            }
+            if(null == user.getDeptId()){
+                log.error("用户未分配部门，无法新增数据");
+                throw new CommonBaseException(ResultCodeEnum.D101 , "用户未分配部门，无法新增数据");
+            }
+            tmHouse.setCreateUserDeptId(user.getDeptId());
+            tmHouse.setCreateUserId(user.getAdminId());
+            tmHouse.setUpdateUserId(user.getAdminId());
+//            tmHouse.setArea(tmHouse.getBuildingArea());
+            tmHouse.setHouseId(houseId);
+            tmHouse.setDistributeStatus(0);
+            tmHouse.setCreateTime(new Date());
+            tmHouse.setLastModifyDatetime(new Date());
+            tmHouse.setEnable(1);
+            tmHouse.setQueryNum(0L);
+            //TODO:这里添加部门信息
+            int insert = tmHouseDao.insert(tmHouse);
+            if (insert == 1) {
+                result = true;
+                log.info("成功插入房源[{}]数据", houseId);
+            } else {
+                log.info("插入房源失败:{}", insert);
+            }
+
+        } else {
+            log.warn("数据非法，无法新增房源");
+        }
+        return result ? Result.success("新增房源成功", houseId) : Result.failure("新增房源失败");
+    }
+
 }

house-web/src/main/java/com/ljq/house/app/controller/AppAgencyController.java

@@ -227,19 +227,15 @@ public class AppAgencyController {
     @RequestMapping(value = "/add/customer", method = RequestMethod.POST)
     @ResponseBody
     public Result addAgencyCustomer(@RequestBody @ApiParam(name="经纪人下的客源对象",value="传入json格式",required=true)TmAgencyUserRelation agencyUserRelation) {
-        if (null != agencyUserRelation) {
+        if (null != agencyUserRelation && agencyUserRelation.getAgencyUserId()!=null) {
             agencyUserRelation.setIsValid(1);
-
-            TmAgencyUserRelation tmAgencyUserRelation = agencyUserRelationDao.getAgencyUserDetail(agencyUserRelation.getAgencyUserId(),agencyUserRelation.getUserId());
-            if(null == tmAgencyUserRelation){
-                int result = agencyUserRelationDao.insert(agencyUserRelation);
-                return result == 1 ? Result.success("新增客源成功") : Result.failure("新增客源失败");
-            }else {
-                return Result.failure("新增客源失败");
-            }
-
+            agencyUserRelation.setCreateTime(new Date());
+            agencyUserRelation.setLastModifyDatetime(new Date());
+            int result = agencyUserRelationDao.insert(agencyUserRelation);
+            return result == 1 ? Result.success("新增客源成功") : Result.failure("新增客源失败");
+        }else{
+            return Result.failure("参数缺失!");
         }
-        return Result.failure("新增客源失败");
     }