胡轶钦 5 лет назад
Родитель
Сommit
11c1a4124c

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaPersonController.java Просмотреть файл

112
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
112
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
113
         queryWrapper.eq("phone",phone);
113
         queryWrapper.eq("phone",phone);
114
         queryWrapper.eq("org_id",orgId);
114
         queryWrapper.eq("org_id",orgId);
115
+        queryWrapper.eq("isConsultant",true);
115
         List<TaUser> users = taUserService.list(queryWrapper);
116
         List<TaUser> users = taUserService.list(queryWrapper);
116
         if(users.size()>0){
117
         if(users.size()>0){
117
             TaUser user = users.get(0);
118
             TaUser user = users.get(0);
129
             taPersonService.updateById(person);
130
             taPersonService.updateById(person);
130
             responseBean.addSuccess(person);
131
             responseBean.addSuccess(person);
131
         }else {
132
         }else {
132
-            responseBean.addError("您不是置业顾问。");
133
+            responseBean.addError("手机号不存在。");
133
         }
134
         }
134
         return responseBean;
135
         return responseBean;
135
     }
136
     }
334
     }
335
     }
335
 
336
 
336
     /**
337
     /**
337
-     * 个人签到
338
+     * 个人getPersonId(request);
338
      * @param request
339
      * @param request
339
      * @return
340
      * @return
340
      */
341
      */

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java Просмотреть файл

218
         taNewsQueryWrapper.eq("org_id",orgId);
218
         taNewsQueryWrapper.eq("org_id",orgId);
219
         taNewsQueryWrapper.eq("status", 1);
219
         taNewsQueryWrapper.eq("status", 1);
220
         taNewsQueryWrapper.eq("news_status", 0);
220
         taNewsQueryWrapper.eq("news_status", 0);
221
-        taNewsQueryWrapper.orderByDesc("create_date");
221
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
222
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
222
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
223
         IPage<TaNews> pageEmpty = new Page<>(pageNum, pageSize);
223
         IPage<TaNews> pageEmpty = new Page<>(pageNum, pageSize);
224
         injectType(taNewsIPage.getRecords());
224
         injectType(taNewsIPage.getRecords());

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java Просмотреть файл

380
         boolean yestodaySigned = null != taPersonSign && DateUtils.sameDay(LocalDateTime.now().minusDays(1), taPersonSign.getSignDate());
380
         boolean yestodaySigned = null != taPersonSign && DateUtils.sameDay(LocalDateTime.now().minusDays(1), taPersonSign.getSignDate());
381
 
381
 
382
         if (todaySigned) {
382
         if (todaySigned) {
383
-            return ResponseBean.error("请不要重复签到", ResponseBean.ERROR_ILLEGAL_PARAMS);
383
+            return ResponseBean.error("请不要重复getPersonId(request);", ResponseBean.ERROR_ILLEGAL_PARAMS);
384
         }
384
         }
385
 
385
 
386
         int durationDays = !yestodaySigned ? 1 : taPersonSign.getDurationDays() + 1;
386
         int durationDays = !yestodaySigned ? 1 : taPersonSign.getDurationDays() + 1;