Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

@@ -75,7 +75,7 @@ public class TaGoodsController extends BaseController {
      * @param taGoods 实体对象
      * @return
      */
-    @RequestMapping(value="/taGoods",method= RequestMethod.POST)
+    @RequestMapping(value="/admin/taGoods/add",method= RequestMethod.POST)
     public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -116,13 +116,11 @@ public class TaGoodsController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
      * @param taGoods 实体对象
      * @return
      */
-    @RequestMapping(value="/taGoods/{id}",method= RequestMethod.PUT)
-    public ResponseBean taGoodsUpdate(@PathVariable Integer id,
-                                        @RequestBody TaGoods taGoods){
+    @RequestMapping(value="/admin/taGoods",method= RequestMethod.PUT)
+    public ResponseBean taGoodsUpdate(@RequestBody TaGoods taGoods){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaGoodsService.updateById(taGoods)){
@@ -137,6 +135,33 @@ public class TaGoodsController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 修改对象
+     * @param taGoods 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taGoods/change",method= RequestMethod.PUT)
+    public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(null != taGoods.getStatus() && taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taGoods.setStatus(CommConstant.STATUS_UNACCALIMED);
+            }else {
+                taGoods.setStatus(CommConstant.STATUS_NORMAL);
+            }
+            if (iTaGoodsService.updateById(taGoods)){
+                responseBean.addSuccess(taGoods);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taGoodsUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 
     /**
      * 根据id查询对象

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TdPointsRules;
 import com.huiju.estateagents.service.ITdPointsRulesService;
 import org.slf4j.Logger;
@@ -42,7 +43,7 @@ public class TdPointsRulesController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/tdPointsRules",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.GET)
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         ResponseBean responseBean = new ResponseBean();
@@ -108,13 +109,11 @@ public class TdPointsRulesController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
      * @param tdPointsRules 实体对象
      * @return
      */
-    @RequestMapping(value="/tdPointsRules/{id}",method= RequestMethod.PUT)
-    public ResponseBean tdPointsRulesUpdate(@PathVariable Integer id,
-                                        @RequestBody TdPointsRules tdPointsRules){
+    @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.PUT)
+    public ResponseBean tdPointsRulesUpdate(@RequestBody TdPointsRules tdPointsRules){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTdPointsRulesService.updateById(tdPointsRules)){
@@ -129,12 +128,39 @@ public class TdPointsRulesController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 停用启用
+     * @param tdPointsRules 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/tdPointsRules/change",method= RequestMethod.PUT)
+    public ResponseBean tdPointsRulesChange(@RequestBody TdPointsRules tdPointsRules){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(null != tdPointsRules.getStatus() && tdPointsRules.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                tdPointsRules.setStatus(CommConstant.STATUS_UNACCALIMED);
+            }else {
+                tdPointsRules.setStatus(CommConstant.STATUS_NORMAL);
+            }
+            if (iTdPointsRulesService.updateById(tdPointsRules)){
+                responseBean.addSuccess(tdPointsRules);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdPointsRulesUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 
     /**
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/tdPointsRules/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/tdPointsRules/{id}",method= RequestMethod.GET)
     public ResponseBean tdPointsRulesGet(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {

src/main/java/com/huiju/estateagents/entity/TaNews.java

@@ -81,6 +81,21 @@ public class TaNews implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 阅读量
+     */
+    private Integer pvNum;
+
+    /**
+     * 点赞量
+     */
+    private Integer favorNum;
+
+    /**
+     * 收藏量
+     */
+    private Integer saveNum;
+
     /**
      * 类型
      */

src/main/java/com/huiju/estateagents/entity/TdPointsRules.java

@@ -59,6 +59,9 @@ public class TdPointsRules implements Serializable {
      * 楼盘id
      */
     private String buildingId;
-
-
+    
+    /**
+     * 停用启用状态
+     */
+    private Integer status;
 }

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

@@ -18,6 +18,7 @@ import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaFavorService;
 import com.huiju.estateagents.service.ITaNewsService;
 import com.huiju.estateagents.service.ITaNewsTypeService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -60,7 +61,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         page.setSize(pageSize);
 
         QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
-        taNewsQueryWrapper.eq(buildingId != null,"building_id", buildingId);
+        taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
         taNewsQueryWrapper.eq(newsTypeId != null,"news_type_id", newsTypeId);
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);

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

@@ -140,25 +140,30 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
         if (taPointsRecordsList.size() < 0){
             //发放积分
-            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(2);
-            //插入积分消费流水表
-            TaPointsRecords taPointsRecords = new TaPointsRecords();
-            taPointsRecords.setPersonId(person.getPersonId());
-            taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
-            taPointsRecords.setPersonType(person.getPersonType());
-            taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
-            taPointsRecords.setChangeType(CommConstant.POINTS_AUTHORIZE);
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("person_id",person.getPersonId());
-            taPointsRecords.setChangeParams(jsonObject.toJSONString());
-            taPointsRecords.setCreateDate(LocalDateTime.now());
-            taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-            taPointsRecordsMapper.insert(taPointsRecords);
-            //添加积分
-            UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
-            wrapper.eq("person_id", person.getPersonId());
-            wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
-            taPersonMapper.update(new TaPerson(), taPersonwrapper);
+            QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("rule_id",2);
+            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(queryWrapper);
+            if (null != tdPointsRules) {
+                //插入积分消费流水表
+                TaPointsRecords taPointsRecords = new TaPointsRecords();
+                taPointsRecords.setPersonId(person.getPersonId());
+                taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
+                taPointsRecords.setPersonType(person.getPersonType());
+                taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
+                taPointsRecords.setChangeType(CommConstant.POINTS_AUTHORIZE);
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("person_id",person.getPersonId());
+                taPointsRecords.setChangeParams(jsonObject.toJSONString());
+                taPointsRecords.setCreateDate(LocalDateTime.now());
+                taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+                taPointsRecordsMapper.insert(taPointsRecords);
+                //添加积分
+                UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
+                wrapper.eq("person_id", person.getPersonId());
+                wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
+                taPersonMapper.update(new TaPerson(), taPersonwrapper);
+            }
         }
 
         return person;

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

@@ -88,25 +88,30 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         }
         //发放分享积分
         if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
-            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(2);
-            //插入积分消费流水表
-            TaPointsRecords taPointsRecords = new TaPointsRecords();
-            taPointsRecords.setPersonId(taPerson.getPersonId());
-            taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
-            taPointsRecords.setPersonType(taPerson.getPersonType());
-            taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
-            taPointsRecords.setChangeType(CommConstant.POINTS_SHARE);
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("person_id",taPerson.getPersonId());
-            taPointsRecords.setChangeParams(jsonObject.toJSONString());
-            taPointsRecords.setCreateDate(LocalDateTime.now());
-            taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
-            taPointsRecordsMapper.insert(taPointsRecords);
-            //添加积分
-            UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
-            wrapper.eq("person_id", taPerson.getPersonId());
-            wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
-            taPersonMapper.update(new TaPerson(), wrapper);
+            QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("rule_id",2);
+            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
+            if (null != tdPointsRules){
+                //插入积分消费流水表
+                TaPointsRecords taPointsRecords = new TaPointsRecords();
+                taPointsRecords.setPersonId(taPerson.getPersonId());
+                taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
+                taPointsRecords.setPersonType(taPerson.getPersonType());
+                taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
+                taPointsRecords.setChangeType(CommConstant.POINTS_SHARE);
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("person_id",taPerson.getPersonId());
+                taPointsRecords.setChangeParams(jsonObject.toJSONString());
+                taPointsRecords.setCreateDate(LocalDateTime.now());
+                taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+                taPointsRecordsMapper.insert(taPointsRecords);
+                //添加积分
+                UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
+                wrapper.eq("person_id", taPerson.getPersonId());
+                wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
+                taPersonMapper.update(new TaPerson(), wrapper);
+            }
         }
         return ResponseBean.success("");
     }