Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -338,7 +338,12 @@ public class TaUserController extends BaseController {
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
-        if (taUser.getExpDate().isBefore(LocalDateTime.now())){
+        QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+        taUserQueryWrapper.eq("org_id", taUser.getOrgId());
+        taUserQueryWrapper.eq("is_admin", 1);
+        TaUser taUserAdmin = iTaUserService.getOne(taUserQueryWrapper);
+
+        if (taUserAdmin.getExpDate().isBefore(LocalDateTime.now())){
             return ResponseBean.error("该账号已经过期，请联系管理员", ResponseBean.ERROR_UNAVAILABLE);
         }
 

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

@@ -918,6 +918,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         // 发放积分
         applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
 
+        //授权手机给推广人加积分
+        String sharePersonId = getSharePersonFrom(person);
+        if (validateSceneId(sceneId) && !StringUtils.isEmpty(sharePersonId)){
+            applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
+        }
+
         // 客户来源
         TaCustomerFrom customerFrom = new TaCustomerFrom();
         customerFrom.setPersonId(person.getPersonId());

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -438,7 +438,7 @@
         FROM
         ta_person_visit_record tp
         where tp.org_id = #{orgId} AND
-        tp.event  = 'index'
+        tp.event  = 'start'
         AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
     </select>