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

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

@@ -16,12 +16,7 @@ import com.huiju.estateagents.center.taUser.service.*;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.entity.SysButtonInMenu;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
@@ -33,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -340,9 +336,14 @@ public class TaUserController extends BaseController {
         if (taUser == null) {
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-    
+
+        //校验是否过期且是否停用
+        if (LocalDateTime.now().isAfter(taUser.getExpDate())){
+            return ResponseBean.error("当前后台服务已到期，请联系相关管理人员", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
         if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
-            return ResponseBean.error("当前后台服务已到期，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("该账号已经停用，请联系管理员", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());

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

@@ -422,10 +422,11 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean getIndependentAgents(HttpServletRequest request,
                                              @RequestParam(value = "name", required = false) String name,
                                              @RequestParam(value = "tel", required = false) String tel,
+                                             @RequestParam(value = "channelId", required = false) String channelId,
                                              @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
-            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber, pageSize, name, tel, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getIndependentAgents(pageNumber, pageSize, name, tel, channelId, getOrgId(request)));
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);

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

@@ -36,7 +36,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
     IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
-    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
+    IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("channelId") String channelId, @Param("orgId") Integer orgId);
 
     /**
      * 公客

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

@@ -44,7 +44,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, Integer orgId);
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, String channelId, Integer orgId);
 
 
     TaRecommendCustomer getCustomerDetail(String customerId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId);

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

@@ -574,9 +574,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, Integer orgId) {
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, String channelId, Integer orgId) {
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        return taRecommendCustomerMapper.getIndependentAgents(page, name, tel, orgId);
+        return taRecommendCustomerMapper.getIndependentAgents(page, name, tel, channelId, orgId);
     }
 
     @Override

src/main/resources/mapper/TaChannelMapper.xml

@@ -31,14 +31,14 @@
     <select id="pageTaChannel" resultType="com.huiju.estateagents.entity.TaChannel">
         SELECT
         c.*,
-        COUNT(cp.person_id) AS brokerCount,
-        COUNT(rc.person_id) AS recommendCount,
+        (select count(*) AS brokerCount from ta_person a where a.person_id = cp.person_id) AS brokerCount,
+        COUNT(rc.recommend_person) AS recommendCount,
         (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
         cp.person_id
         FROM
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
-        LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.person_id AND rc.`status` = 1
+        LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.recommend_person and rc.verify_status = 1 and rc.`status` = 1
         <where>
             <if test="channelId != null and channelId != ''">
                 c.channel_id = #{channelId}

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -92,10 +92,13 @@ FROM
             a.person_type in ('estate agent', 'channel agent')
             and a.status >0
             <if test="name != null and name !=''">
-                and a.nickname = #{name}
+                and a.nickname like concat('%', #{name}, '%')
             </if>
             <if test="tel != null and tel!=''">
-                and a.phone = #{tel}
+                and a.phone like concat('%', #{tel}, '%')
+            </if>
+            <if test="channelId != null and channelId != '' ">
+                and tc.channel_id = #{channelId}
             </if>
             <if test="orgId != null">
                 and a.org_id = #{orgId}

src/main/resources/mapper/TaUserMapper.xml

@@ -64,7 +64,7 @@
             t.*,
             b.building_id,
             d.person_id as consultant_person_id,
-            if(d.person_id,1,0) as mini_status
+            if(d.person_id is not null,1,0) as mini_status
         FROM
             ta_user t
             LEFT JOIN ta_person_building b ON t.user_id = b.user_id

src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

@@ -1447,9 +1447,9 @@
         person.person_id
         from (
         SELECT t.*, f.nickname, f.phone, f.person_type
+        LEFT JOIN ta_share_activity b ON t.be_share = b.share_id
         FROM ta_share_count t
         LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
-        LEFT JOIN ta_share_activity b ON t.be_share = b.share_id
         LEFT JOIN ta_live_activity c ON t.be_share = c.live_activity_id
         LEFT JOIN ta_drainage d ON t.be_share = d.drainage_id
         LEFT JOIN ta_building_dynamic e ON t.be_share = e.dynamic_id