* bug

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -18,89 +18,95 @@ import java.util.Map;
  * @date 2018-12-18
  */
 public class BaseController {
-	@Autowired
-	private ITaUserService taUserService;
-
-	@Autowired
-	private ITaPersonBuildingService taPersonBuildingService;
-
-	/**
-	 * 获取orgId
-	 * @param request
-	 * @return
-	 */
-	public Integer getOrgId(HttpServletRequest request){
-		
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("orgId")){
-			return Integer.valueOf(map.get("orgId").toString());
-		}
-		
-		return null;
-	}
-
-	public Integer getChannelId(HttpServletRequest request){
-
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("channelId")){
-			return Integer.valueOf(map.get("channelId").toString());
-		}
-
-		return null;
-	}
-
-	public String getChannelUserName(HttpServletRequest request){
-
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("userName")){
-			return map.get("userName").toString();
-		}
-
-		return null;
-	}
-
-	public String getOpenId(HttpServletRequest request){
-
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("openId")){
-			return map.get("openId").toString();
-		}
-
-		return null;
-	}
-
-	public String getPersonId(HttpServletRequest request){
-
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("personId")){
-			return map.get("personId").toString();
-		}
-
-		return null;
-	}
-	/**
-	 * 获取orgId
-	 * @param request
-	 * @return
-	 */
-	public Integer getUserId(HttpServletRequest request){
-		
-		Map map = JWTUtils.getUserIdAndOrgId(request);
-		if (null != map && null != map.get("userId")){
-			return Integer.valueOf(map.get("userId").toString());
-		}
-		
-		return null;
-	}
-
-	public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
-		TaUser taUser = taUserService.getById(getUserId(request));
-		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
-		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
-		List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
-		if (null != taUser.getIsAdmin() && taUser.getIsAdmin()){
-			taPersonBuildingList = new ArrayList<>();
-		}
-		return taPersonBuildingList;
-	}
+    @Autowired
+    private ITaUserService taUserService;
+
+    @Autowired
+    private ITaPersonBuildingService taPersonBuildingService;
+
+    /**
+     * 获取orgId
+     *
+     * @param request
+     * @return
+     */
+    public Integer getOrgId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("orgId")) {
+            return Integer.valueOf(map.get("orgId").toString());
+        }
+
+        return null;
+    }
+
+    public Integer getChannelId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("channelId")) {
+            return Integer.valueOf(map.get("channelId").toString());
+        }
+
+        return null;
+    }
+
+    public String getChannelUserName(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userName")) {
+            return map.get("userName").toString();
+        }
+
+        return null;
+    }
+
+    public String getOpenId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("openId")) {
+            return map.get("openId").toString();
+        }
+
+        return null;
+    }
+
+    public String getPersonId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("personId")) {
+            return map.get("personId").toString();
+        }
+
+        return null;
+    }
+
+    /**
+     * 获取orgId
+     *
+     * @param request
+     * @return
+     */
+    public Integer getUserId(HttpServletRequest request) {
+
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        if (null != map && null != map.get("userId")) {
+            return Integer.valueOf(map.get("userId").toString());
+        }
+
+        return null;
+    }
+
+    public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
+        TaUser taUser = taUserService.getById(getUserId(request));
+        if (taUser == null) {
+            return null;
+        }
+        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+        if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
+            taPersonBuildingList = new ArrayList<>();
+        }
+        return taPersonBuildingList;
+    }
 }

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -616,4 +616,9 @@ public class CommConstant {
     public static final String SUFFIX_2003 = ".xls";
     public static final String SUFFIX_2007 = ".xlsx";
 
+    /**
+     * 小程序房源详情路径
+     */
+    public static final String HOUSE_DETAIL_PATH = "onlineSelling/pages/detail/index?id=%s";
+
 }

src/main/java/com/huiju/estateagents/controller/TaLiveActivityController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaLiveActivity;
 import com.huiju.estateagents.service.IExtendContentService;
@@ -61,7 +62,7 @@ public class TaLiveActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status,getTaPersonBuildingListByUserId(request));
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -107,18 +108,18 @@ public class TaLiveActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<Integer> liveActivityIds = new ArrayList<>();
-            for(TaLiveActivity activity : taLiveActivity){
+            for (TaLiveActivity activity : taLiveActivity) {
                 liveActivityIds.add(activity.getLiveActivityId());
             }
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq("content_type",CommConstant.LIVE);
-            queryWrapper.in("target_id",liveActivityIds);
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("content_type", CommConstant.LIVE);
+            queryWrapper.in("target_id", liveActivityIds);
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
             list.forEach(e -> {
                 e.setStatus(CommConstant.NOT_PUBLISH);
             });
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 iExtendContentService.updateBatchById(list);
             }
 
@@ -146,23 +147,27 @@ public class TaLiveActivityController extends BaseController {
             taLiveActivity.setLiveActivityId(id);
             taLiveActivity.setUpdateUser(getUserId(request).toString());
             QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.eq("content_type",CommConstant.LIVE);
-            queryWrapper.eq("target_id",taLiveActivity.getLiveActivityId());
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("content_type", CommConstant.LIVE);
+            queryWrapper.eq("target_id", taLiveActivity.getLiveActivityId());
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
-            if (CommConstant.NOT_PUBLISH.equals(taLiveActivity.getStatus())){
+            if (CommConstant.NOT_PUBLISH.equals(taLiveActivity.getStatus())) {
                 list.forEach(e -> {
                     e.setStatus(CommConstant.NOT_PUBLISH);
                 });
-            }else{
+            } else {
                 list.forEach(e -> {
                     e.setStatus(CommConstant.IS_PUBLISH);
                 });
             }
-            if (list.size() > 0){
+            if (list.size() > 0) {
                 iExtendContentService.updateBatchById(list);
             }
 
+            if(!StringUtils.isEmpty(taLiveActivity.getLiveRoomParam())){
+                taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html",""));
+            }
+
             if (iTaLiveActivityService.updateById(taLiveActivity)) {
                 responseBean.addSuccess(taLiveActivity);
             } else {
@@ -252,7 +257,8 @@ public class TaLiveActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             status = status == null ? 1 : status;
-            IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
+            Integer orgId = getOrgId(request);
+            IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
                     liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
 

src/main/java/com/huiju/estateagents/service/impl/TaPreselectionRecordServiceImpl.java

@@ -264,7 +264,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
                 return;
             }
 
-            String link = "";
+            String link = String.format(CommConstant.HOUSE_DETAIL_PATH, houseId);
             String progranName = (po.getBuildingName() + po.getTermName() + po.getBlockName() + po.getUnitName() + po.getFloorName() + po.getRoomName()).replace("null", "");
             String remark = progranName;
             miniAppService.sendCheckMessage(toUser, link, checkType, result, progranName, failReason, remark, LocalDateTime.now(), isSuccess);