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

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.service.ITaBuildingService;
@@ -184,6 +185,28 @@ public class TaNewsController extends BaseController {
         return responseBean;
     }
 
+    @ApiOperation(value = "资讯置顶", notes = "资讯置顶")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "newsId", paramType = "query",value = "资讯ID"),
+            @ApiImplicitParam(dataType = "Integer", name = "weight", paramType = "query",value = "权重")
+    })
+    @RequestMapping(value = "/admin/taNews/weight" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicWeight(@RequestParam Integer newsId,@RequestParam Integer weight,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        TaNews taNews = iTaNewsService.getById(newsId);
+        taNews.setWeight(weight);
+        taNews.setOrgId(getOrgId(request));
+        QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
+        newsQueryWrapper.eq("news_id",newsId);
+        if (iTaNewsService.updateById(taNews)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("失败");
+        }
+        return responseBean;
+    }
+
+
     /**
      * 微信 根据id查询对象
      * @param id  实体ID

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

@@ -112,6 +112,7 @@ public class TaPersonController extends BaseController {
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone",phone);
         queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("isConsultant",true);
         List<TaUser> users = taUserService.list(queryWrapper);
         if(users.size()>0){
             TaUser user = users.get(0);
@@ -129,7 +130,7 @@ public class TaPersonController extends BaseController {
             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {
-            responseBean.addError("您不是置业顾问。");
+            responseBean.addError("手机号不存在。");
         }
         return responseBean;
     }
@@ -334,7 +335,7 @@ public class TaPersonController extends BaseController {
     }
 
     /**
-     * 个人签到
+     * 个人getPersonId(request);
      * @param request
      * @return
      */

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

@@ -107,6 +107,11 @@ public class TaNews implements Serializable {
      */
     private Integer shareNum;
 
+    /**
+     * 权重
+     */
+    private Integer weight;
+
     /**
      * 类型
      */

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

@@ -72,7 +72,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
-        taNewsQueryWrapper.orderByDesc("create_date");
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
         injectType(taNewsIPage.getRecords());
@@ -218,7 +218,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq("org_id",orgId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.eq("news_status", 0);
-        taNewsQueryWrapper.orderByDesc("create_date");
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
         IPage<TaNews> pageEmpty = new Page<>(pageNum, pageSize);
         injectType(taNewsIPage.getRecords());

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

@@ -380,7 +380,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         boolean yestodaySigned = null != taPersonSign && DateUtils.sameDay(LocalDateTime.now().minusDays(1), taPersonSign.getSignDate());
 
         if (todaySigned) {
-            return ResponseBean.error("请不要重复签到", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error("请不要重复getPersonId(request);", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int durationDays = !yestodaySigned ? 1 : taPersonSign.getDurationDays() + 1;