Bläddra i källkod

去掉房源二维码生成

by su 4 år sedan
förälder
incheckning
18cd75f3cd

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

@@ -135,8 +135,10 @@ public class AdminTmAgencyController {
                    tmAgencyRspVo.setHouseNum(tmHouseAgencyRelationDao.countRelationHouse(tmAgency.getAgencyUserId()));
                    tmAgencyRspVo.setUserNum(tmAgencyUserRelationDao.countRelationUser(tmAgency.getAgencyUserId()));
                    //获取房源名称
-                   TmStore tmStore = tmStoreDao.getStoreInfo(Integer.valueOf(tmAgencyRspVo.getStoreId()));
-                   tmAgencyRspVo.setStore(tmStore.getName());
+                    if(tmAgencyRspVo.getStoreId()!=null){
+                        TmStore tmStore = tmStoreDao.getStoreInfo(Integer.valueOf(tmAgencyRspVo.getStoreId()));
+                        tmAgencyRspVo.setStore(tmStore.getName());
+                    }
                    listAgency.add(tmAgencyRspVo);
             }
         }

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

@@ -576,21 +576,21 @@ public class AdminTmHouseController {
 //                    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();
-                }
-            }
+//            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("用户未登录,登录");