渠道管理

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -49,6 +49,16 @@ public class BaseController {
 		return null;
 	}
 
+	public String getChannelUserName(HttpServletRequest request){
+
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("userName")){
+			return map.get("userName").toString();
+		}
+
+		return null;
+	}
+
 	public String getOpenId(HttpServletRequest request){
 
 		Map map = JWTUtils.getUserIdAndOrgId(request);

src/main/java/com/huiju/estateagents/center/sysUser/controller/SysUserController.java

@@ -176,7 +176,9 @@ public class SysUserController extends BaseController {
         QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
         taChannelProxyQueryWrapper.eq("user_name", map.get("userName")).or().eq("channel_tel", map.get("userName"));
         TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(taChannelProxyQueryWrapper);
-
+        if (StringUtils.isEmpty(taChannelProxy.getUserName())){
+            taChannelProxy.setUserName(map.get("userName").toString());
+        }
         return ResponseBean.success(taChannelProxy);
     }
     
@@ -205,7 +207,7 @@ public class SysUserController extends BaseController {
         }
 
         Map map = new HashMap();
-        map.put("userName",taChannelProxy.getUserName());
+        map.put("userName", StringUtils.isEmpty(taChannelProxy.getUserName()) ? taChannelProxy.getChannelTel() : taChannelProxy.getUserName());
         map.put("channelId",taChannelProxy.getChannelId().toString());
         String token = JWTUtils.newTokenByMap(map);
 

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

@@ -96,12 +96,18 @@ public class TaUserController extends BaseController {
      */
     @RequestMapping(value="/center/taUser",method= RequestMethod.GET)
     public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+									 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String userName = getChannelUserName(request);
+        Integer channelId = null;
+        if (!"admin".equals(userName)){
+            channelId = getChannelId(request);
+        }
+
         try {
             //使用分页插件
 		    IPage pg = new Page<>(pageNum, pageSize);
-            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, channelId);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -124,7 +130,7 @@ public class TaUserController extends BaseController {
         try {
             //使用分页插件
             IPage pg = new Page<>(pageNum, pageSize);
-            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, null);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -22,7 +22,7 @@ import java.util.Map;
 @Mapper
 public interface TaUserMapper extends BaseMapper<TaUser> {
 	
-	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
+	List<Map<String,Object>> getPageList(IPage<TaUser> pg, @Param("channelId") Integer channelId);
 	
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
 	

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface ITaUserService extends IService<TaUser> {
 	
-	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg);
+	IPage<Map<String,Object>> getPageList(IPage<TaUser> pg, Integer channelId);
 
     TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception;
 

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -92,8 +92,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	private ISysOrgParamsService iSysOrgParamsService;
 
 	@Override
-	public IPage<Map<String,Object>> getPageList(IPage pg) {
-		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg);
+	public IPage<Map<String,Object>> getPageList(IPage pg, Integer channelId) {
+		List<Map<String,Object>> taUserList = taUserMapper.getPageList(pg, channelId);
 		pg.setRecords(taUserList);
 		return pg;
 	}

src/main/java/com/huiju/estateagents/channel/sysChannel/entity/TaChannelProxy.java

@@ -17,7 +17,7 @@ public class TaChannelProxy {
 
     private String channelImg;
 
-    private String channelName;
+    private String channelContactName;
 
     private String channelTel;
 

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -612,7 +612,7 @@ FROM
         b.tel as consultTel
         FROM
         ta_recommend_customer a
-        LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_person b ON (a.realty_consultant = b.person_id or a.realty_consultant = b.user_id)
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0

src/main/resources/mapper/TaUserMapper.xml

@@ -20,13 +20,19 @@
             m.secret,
             m.token,
             m.NAME AS miniappName,
-            m.qr_code AS qrCode
+            m.qr_code AS qrCode,
+            z.expire_date
         FROM
             ta_user t
             LEFT JOIN ta_org o ON t.org_id = o.org_id
             LEFT JOIN ta_miniapp m ON o.org_id = m.org_id
+            left join ta_channel_app_relation n on m.org_id = n.org_id
+            left join ta_channel_proxy z on z.channel_id = n.channel_id
         WHERE
             t.is_admin =1
+            <if test="channelId != null and channelId != ''">
+                and n.channel_id = #{channelId}
+            </if>
     </select>
 
     <select id="getTagsList" resultType="com.huiju.estateagents.center.taUser.entity.TaTags">