合并

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

@@ -204,6 +204,7 @@ public class TaBuildingController extends BaseController {
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
             HttpServletRequest request
     ){
+        Integer orgId = getOrgId(request);
         List<String> targets = null;
         if (null != mine && mine) {
             String openid = JWTUtils.getSubject(request);
@@ -220,7 +221,7 @@ public class TaBuildingController extends BaseController {
         List<String[]> priceList = getParamListOf(price);
         List<String[]> areaList = getParamListOf(area);
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList);
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId);
     }
 
 

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

@@ -103,6 +103,7 @@ public class TaBuildingDynamicController extends BaseController {
                                                @RequestParam(value = "cityId", required = false)Integer cityId,
                                                HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
+        Integer orgId = getOrgId(request);
         ResponseBean  responseBean = new ResponseBean();
         if(mine){
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -112,7 +113,7 @@ public class TaBuildingDynamicController extends BaseController {
             TaPerson person = taPersons.get(0);
             responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNum,pageSize,"",person));
         }else {
-            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId);
+            responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid,cityId,orgId);
         }
 
         return responseBean;

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

@@ -9,8 +9,10 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaGoods;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaGoodsService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.lang.invoke.ConstantCallSite;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -45,6 +50,9 @@ public class TaGoodsController extends BaseController {
     @Autowired
     public ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    public ITaPersonService taPersonService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -209,8 +217,15 @@ public class TaGoodsController extends BaseController {
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
-                                    @RequestParam(value = "orgId",required = false) Integer orgId){
+                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String openid = JWTUtils.getSubject(request);
+        Integer orgId = getOrgId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
         try {
             //使用分页插件
             IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
@@ -226,6 +241,9 @@ public class TaGoodsController extends BaseController {
             queryWrapper.orderByDesc("create_date");
             
             IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);
+            Map<String,Object> data = new HashMap<>();
+            data.put("goods",result);
+            data.put("person",person);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -88,6 +88,7 @@ public class TaNewsController extends BaseController {
                                      HttpServletRequest request
     ){
         List<String> targets = new ArrayList<>();
+        Integer orgId = getOrgId(request);
         if (null != mine && mine) {
             String openid = JWTUtils.getSubject(request);
             List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
@@ -98,7 +99,7 @@ public class TaNewsController extends BaseController {
             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_NEWS);
         }
 
-        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId,mine);
+        IPage<TaNews> results = iTaNewsService.getWxList(pageNum, pageSize, buildingId, targets,cityId,mine,orgId);
         return ResponseBean.success(results);
     }
 

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

@@ -59,7 +59,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPointsRecords",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taPointsRecords",method= RequestMethod.GET)
     public ResponseBean taPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -79,12 +79,47 @@ public class TaPointsRecordsController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
+    public ResponseBean taWxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String openid = JWTUtils.getSubject(request);
+            Integer orgId = getOrgId(request);
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            //使用分页插件
+            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPointsRecordsList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      * @param taPointsRecords 实体对象
      * @return
      */
-    @RequestMapping(value="/taPointsRecords",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taPointsRecords",method= RequestMethod.POST)
     public ResponseBean taPointsRecordsAdd(@RequestBody TaPointsRecords taPointsRecords){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -106,7 +141,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param id  实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taPointsRecords/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/admin/taPointsRecords/{id}", method= RequestMethod.DELETE)
     public ResponseBean taPointsRecordsDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -129,7 +164,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param taPointsRecords 实体对象
      * @return
      */
-    @RequestMapping(value="/taPointsRecords/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.PUT)
     public ResponseBean taPointsRecordsUpdate(@PathVariable Integer id,
                                         @RequestBody TaPointsRecords taPointsRecords){
         ResponseBean responseBean = new ResponseBean();
@@ -152,7 +187,7 @@ public class TaPointsRecordsController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taPointsRecords/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.GET)
     public ResponseBean taPointsRecordsGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -165,34 +200,34 @@ public class TaPointsRecordsController extends BaseController {
         return responseBean;
     }
     
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
-    public ResponseBean wxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                            HttpServletRequest request){
-        ResponseBean responseBean = new ResponseBean();
-        try {
-            String openid = JWTUtils.getSubject(request);
-            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
-            //使用分页插件
-            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("person_id",taPerson.getPersonId());
-            queryWrapper.orderByDesc("create_date");
-            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
-        }catch (Exception e){
-            e.printStackTrace();
-            logger.error("taPointsRecordsList -=- {}",e.toString());
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
+//    /**
+//     * 分页查询列表
+//     * @param pageNum
+//     * @param pageSize
+//     * @return
+//     */
+//    @RequestMapping(value="/wx/taPointsRecords",method= RequestMethod.GET)
+//    public ResponseBean wxPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+//                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+//                                            HttpServletRequest request){
+//        ResponseBean responseBean = new ResponseBean();
+//        try {
+//            String openid = JWTUtils.getSubject(request);
+//            TaPerson taPerson = taPersonService.getPersonsByOpenId(openid).get(0);
+//            //使用分页插件
+//            IPage<TaPointsRecords> pg = new Page<>(pageNum, pageSize);
+//            QueryWrapper<TaPointsRecords> queryWrapper = new QueryWrapper<>();
+//            queryWrapper.eq("person_id",taPerson.getPersonId());
+//            queryWrapper.orderByDesc("create_date");
+//            IPage<TaPointsRecords> result = iTaPointsRecordsService.page(pg, queryWrapper);
+//            responseBean.addSuccess(result);
+//        }catch (Exception e){
+//            e.printStackTrace();
+//            logger.error("taPointsRecordsList -=- {}",e.toString());
+//            responseBean.addError(e.getMessage());
+//        }
+//        return responseBean;
+//    }
 
     /**
      * 分页查询列表
@@ -200,7 +235,7 @@ public class TaPointsRecordsController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taPointsRecords/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/mine/taPointsRecords/{id}",method= RequestMethod.GET)
     public ResponseBean CustomerPointsRecordsList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                             @PathVariable(value = "id") String id){

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

@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 积分获取规则字典表  前端控制器
@@ -48,14 +50,55 @@ public class TdPointsRulesController extends BaseController {
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                           @RequestParam(value ="buildingId", required = false) String buildingId,
-                                          @RequestParam(value = "type", required = false) String type){
+                                          @RequestParam(value = "type", required = false) String type,
+                                          HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
+            Integer orgId = getOrgId(request);
+            queryWrapper.eq("org_id",orgId);
+            queryWrapper.orderByDesc("create_date");
+            queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
+            if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
+                queryWrapper.isNull("building_id");
+            } else if (CommConstant.POINTS_RULE_PROJECT.equals(type)) {
+                queryWrapper.isNotNull("building_id");
+            }
+
+            IPage<TdPointsRules> result = iTdPointsRulesService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdPointsRulesList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/wx/tdPointsRules",method= RequestMethod.GET)
+    public ResponseBean tdWxPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="buildingId", required = false) String buildingId,
+                                            @RequestParam(value = "type", required = false) String type,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
+
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
+            Integer orgId = getOrgId(request);
+            queryWrapper.eq("org_id",orgId);
             if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
                 queryWrapper.isNull("building_id");
             } else if (CommConstant.POINTS_RULE_PROJECT.equals(type)) {

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -75,6 +75,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
                                          @Param("houseTypeList") String[] houseTypeList,
                                          @Param("buildingTypeList") String[] buildingTypeList,
                                          @Param("priceList") List<String[]> priceList,
-                                         @Param("areaList") List<String[]> areaList);
+                                         @Param("areaList") List<String[]> areaList,
+                                         @Param("orgId")Integer orgId);
 
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java

@@ -38,7 +38,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 微信小程序 项目动态管理列表
      * @return
      */
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId);
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId);
 
     /**
      * 微信小程序 项目详情

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -126,7 +126,8 @@ public interface ITaBuildingService extends IService<TaBuilding> {
             String[] houseTypeList,
             String[] buildingTypeList,
             List<String[]> priceList,
-            List<String[]> areaList);
+            List<String[]> areaList,
+            Integer orgId);
 
     /**
      * 微信小程序 楼盘列表

src/main/java/com/huiju/estateagents/service/ITaNewsService.java

@@ -70,5 +70,5 @@ public interface ITaNewsService extends IService<TaNews> {
      */
     ResponseBean wxTaPvNum(Integer id);
 
-    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine);
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine,Integer orgId);
 }

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

@@ -93,7 +93,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId) {
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,String buildingId,String openid,Integer cityId,Integer orgId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
@@ -107,6 +107,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id", buildingId);
         buildingDynamicQueryWrapper.eq("status", "1");
         buildingDynamicQueryWrapper.eq(null != cityId,"city_id",cityId);
+        buildingDynamicQueryWrapper.eq("org_id",orgId);
         buildingDynamicQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaBuildingDynamic> buildingDynamicIPage = buildingDynamicMapper.selectPage(page, buildingDynamicQueryWrapper);
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();

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

@@ -391,7 +391,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String[] houseTypeList,
             String[] buildingTypeList,
             List<String[]> priceList,
-            List<String[]> areaList) {
+            List<String[]> areaList,
+            Integer orgId) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         if(CollectionUtils.isEmpty(targets) && mine){
@@ -409,7 +410,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 //
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
 
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId);
 
         List<TaBuilding> buildingList = result.getRecords();
         if (CollectionUtils.isNotEmpty(buildingList)) {

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

@@ -200,13 +200,14 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
     }
 
     @Override
-    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine) {
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId,boolean mine,Integer orgId) {
         IPage<TaNews> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
         taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
         taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
         taNewsQueryWrapper.eq(null != cityId && cityId != 0,"city_id",cityId);
+        taNewsQueryWrapper.eq("org_id",orgId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.eq("news_status", 0);
         taNewsQueryWrapper.orderByDesc("create_date");

src/main/resources/mapper/TaBuildingMapper.xml

@@ -92,6 +92,7 @@
              select * from  ta_building
                 WHERE
                 `status` = 1
+                and org_id = #{orgId}
                 <if test="cityId != null">
                     AND city_id = #{cityId}
                 </if>