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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.5</version>
+	<version>v3.5.6</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -142,51 +142,27 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>test</id>
+			<id>green</id>
 			<properties>
-				<profiles.active>test</profiles.active>
+				<profiles.active>green</profiles.active>
 			</properties>
 		</profile>
 		<profile>
-			<id>prod</id>
+			<id>prod-blue</id>
 			<properties>
-				<profiles.active>prod</profiles.active>
+				<profiles.active>prod-blue</profiles.active>
 			</properties>
 		</profile>
 		<profile>
-			<id>xs</id>
+			<id>prod-green</id>
 			<properties>
-				<profiles.active>xs</profiles.active>
+				<profiles.active>prod-green</profiles.active>
 			</properties>
 		</profile>
 		<profile>
-			<id>rc</id>
+			<id>blue</id>
 			<properties>
-				<profiles.active>rc</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>nj</id>
-			<properties>
-				<profiles.active>nj</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>hj</id>
-			<properties>
-				<profiles.active>hj</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>gzysd</id>
-			<properties>
-				<profiles.active>gzysd</profiles.active>
-			</properties>
-		</profile>
-		<profile>
-			<id>jj</id>
-			<properties>
-				<profiles.active>jj</profiles.active>
+				<profiles.active>blue</profiles.active>
 			</properties>
 		</profile>
 	</profiles>

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

@@ -39,6 +39,26 @@ public class BaseController {
 		return null;
 	}
 
+	public Integer getChannelId(HttpServletRequest request){
+
+		Map map = JWTUtils.getUserIdAndOrgId(request);
+		if (null != map && null != map.get("channelId")){
+			return Integer.valueOf(map.get("channelId").toString());
+		}
+
+		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

@@ -10,6 +10,10 @@ import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
@@ -44,6 +48,12 @@ public class SysUserController extends BaseController {
     @Autowired
     private ISysTokenService sysTokenService;
 
+    @Autowired
+    private ITaUserService iTaUserService;
+
+    @Autowired
+    private ITaChannelProxyService iTaChannelProxyService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -162,13 +172,14 @@ public class SysUserController extends BaseController {
      */
     @RequestMapping(value="/center/current",method=RequestMethod.GET)
     public ResponseBean currentUser(HttpServletRequest request){
-        String userName = JWTUtils.getSubject(request);
-        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
-        sysUserQueryWrapper.eq("user_name",userName);
-        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
-        sysUser.setPassword(null);
-
-        return ResponseBean.success(sysUser);
+        Map map = JWTUtils.getUserIdAndOrgId(request);
+        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);
     }
     
     @PostMapping("/center/signin")
@@ -177,35 +188,68 @@ public class SysUserController extends BaseController {
         if (params == null) {
             return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
         }
-        
+
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
         String userName = params.getString("userName");
-        String userPassword = params.getString("password");
-        
+        if (StringUtils.isEmpty(userName)){
+            return ResponseBean.error("用户名不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taChannelProxyQueryWrapper.eq("user_name", userName).or().eq("channel_tel", userName);
+
         //验证用户名密码是否正确
-        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
-        sysUserQueryWrapper.eq("user_name",userName);
-        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
-        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
-        if (sysUser == null) {
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(taChannelProxyQueryWrapper);
+        String defaultPsw = MD5Utils.md5(params.getString("password"));
+        if (taChannelProxy == null || !defaultPsw.equals(taChannelProxy.getPassword())) {
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        
-        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+
+        //校验是否过期且是否停用
+        if (LocalDateTime.now().isAfter(taChannelProxy.getExpireDate()) || taChannelProxy.getStatus() == 0){
+            return ResponseBean.error("当前后台服务已到期，请联系管理员", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
-        
-        String token = JWTUtils.newToken(sysUser.getUserName());
-    
+
+        Map map = new HashMap();
+        map.put("userName", StringUtils.isEmpty(taChannelProxy.getUserName()) ? taChannelProxy.getChannelTel() : taChannelProxy.getUserName());
+        map.put("channelId",taChannelProxy.getChannelId().toString());
+        String token = JWTUtils.newTokenByMap(map);
+
         //保存token
         sysTokenService.saveToken(token);
         
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
-        result.put("user", sysUser);
+        result.put("user", taChannelProxy);
         
         return ResponseBean.success(result);
     }
-    
+
+    @PostMapping("/center/changePassword")
+    public ResponseBean changePassword(@RequestParam String originalPassword,
+                                       @RequestParam String newPassword,HttpServletRequest request) {
+
+        if (org.apache.commons.lang3.StringUtils.isBlank(newPassword) || newPassword.length() < 6) {
+            return ResponseBean.error("新密不能小于6位", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        Integer channelId = getChannelId(request);
+
+        // 校验当前旧密码是否正确
+        String password = MD5Utils.md5(MD5Utils.md5(originalPassword));
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getById(channelId);
+        if (!password.equals(taChannelProxy.getPassword())){
+            return ResponseBean.error("旧密码错误,请重新输入", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        try {
+            iTaChannelProxyService.resetPassword(channelId, newPassword);
+            return ResponseBean.success("操作成功！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
     @PostMapping("/center/signout")
     public ResponseBean signout(HttpServletRequest request) {
         String token = JWTUtils.getToken(request);
@@ -214,4 +258,14 @@ public class SysUserController extends BaseController {
         sysTokenService.remove(sysTokenQueryWrapper);
         return ResponseBean.success("成功退出");
     }
+
+    @RequestMapping(value="/center/logo",method= RequestMethod.GET)
+    public ResponseBean getLogoImg(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer channelId = getChannelId(request);
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getById(channelId);
+        responseBean.addSuccess(taChannelProxy);
+        return responseBean;
+    }
+
 }

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

@@ -96,12 +96,36 @@ 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();
+
         try {
             //使用分页插件
 		    IPage pg = new Page<>(pageNum, pageSize);
-            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, getChannelId(request));
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taUser",method= RequestMethod.GET)
+    public ResponseBean taUserChannelList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage pg = new Page<>(pageNum, pageSize);
+            IPage<Map<String,Object>> result = iTaUserService.getPageList(pg, null);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -117,10 +141,11 @@ public class TaUserController extends BaseController {
      * @return
      */
     @RequestMapping(value="/center/taUser",method= RequestMethod.POST)
-    public ResponseBean taUserAdd(@RequestBody TaUser taUser){
+    public ResponseBean taUserAdd(@RequestBody TaUser taUser, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer channelId = getChannelId(request);
         try {
-            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser));
+            responseBean.addSuccess(iTaUserService.newUserAndOrg(taUser, channelId));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taUserAdd -=- {}",e.toString());
@@ -224,7 +249,7 @@ public class TaUserController extends BaseController {
 
     /**
      * 业务端  修改密码
-     * @return
+     * @return/
      */
     @PutMapping(value = "/admin/update/password")
     public ResponseBean updatePassword( @RequestParam String originalPassword,
@@ -314,7 +339,7 @@ public class TaUserController extends BaseController {
         }
     
         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/center/taUser/entity/TaUser.java

@@ -201,4 +201,16 @@ public class TaUser implements Serializable {
 
     @TableField(exist = false)
     private List<String> buildingIds = new ArrayList<String>();
+
+    /**
+     * 新密码
+     */
+    @TableField(exist = false)
+    private String newPassword;
+
+    /**
+     * 确认新密码
+     */
+    @TableField(exist = false)
+    private String confirmPassword;
 }

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,9 +20,9 @@ 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) throws Exception;
+    TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception;
 
     TaUser getInfoWithOrg(Integer id);
 

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

@@ -14,6 +14,8 @@ import com.huiju.estateagents.center.taUser.mapper.TaTagUserMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserRoleMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
@@ -21,11 +23,13 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -88,16 +92,34 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Autowired
 	private ISysOrgParamsService iSysOrgParamsService;
-	
+
+	@Autowired
+	private TaChannelAppRelationMapper taChannelAppRelationMapper;
+
+	@Autowired
+	private TaChannelProxyMapper taChannelProxyMapper;
+
 	@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);
+
+		for (Map map : taUserList){
+			if (map.get("orgId") == null){
+				map.put("userCount", 0);
+				map.put("registeredCount", 0);
+				continue;
+			}
+			Integer userCount = taPersonMapper.selectChannelUserCount(map.get("orgId").toString());
+			Integer registeredCount = taPersonMapper.selectChannelRegisteredCount(map.get("orgId").toString());
+			map.put("userCount", userCount);
+			map.put("registeredCount", registeredCount);
+		}
 		pg.setRecords(taUserList);
 		return pg;
 	}
 
 	@Override
-	public TaUser newUserAndOrg(TaUser taUser) throws Exception {
+	public TaUser newUserAndOrg(TaUser taUser, Integer channelId) throws Exception {
 		if (StringUtils.isEmpty(taUser.getPhone())) {
 			throw new Exception("电话号码不能为空");
 		}
@@ -119,6 +141,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("电话号码或登录名重复");
 		}
 
+		//判断渠道端新增小程序最大数
+		QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+		taChannelProxyQueryWrapper.eq("channel_id", channelId);
+		TaChannelProxy taChannelProxy = taChannelProxyMapper.selectOne(taChannelProxyQueryWrapper);
+
+		QueryWrapper<TaChannelAppRelation> relationQueryWrapper = new QueryWrapper<>();
+		relationQueryWrapper.eq("channel_id", channelId);
+		Integer miniAppCount = taChannelAppRelationMapper.selectCount(relationQueryWrapper);
+		if (miniAppCount >= taChannelProxy.getAppMaxNum()){
+			throw new Exception("当前系统仅供维护"+ taChannelProxy.getAppMaxNum() +"个小程序，需要维护更多项目，请联系相关管理人员");
+		}
+
 		// 先插入 org
 		TaOrg taOrg = new TaOrg();
 		taOrg.setName(taUser.getOrgName());
@@ -130,6 +164,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("生成用户公司信息失败");
 		}
 
+		//维护渠道和小程序关系
+		TaChannelAppRelation taChannelAppRelation = new TaChannelAppRelation();
+		taChannelAppRelation.setChannelId(channelId);
+		taChannelAppRelation.setOrgId(taOrg.getOrgId());
+		taChannelAppRelation.setCreateTime(LocalDateTime.now());
+		taChannelAppRelationMapper.insert(taChannelAppRelation);
+
 		// 维护当前城市所在城市
 		addAndupdate(taUser.getSelectCityTree(),false,taOrg.getOrgId());
 
@@ -294,9 +335,11 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		Integer status = isOn ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_CLOSED;
 		TaUser user = new TaUser();
 		user.setStatus(status);
-		user.setUserId(id);
 
-		if (!this.updateById(user)) {
+		QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+		taUserQueryWrapper.eq("org_id", taUserMapper.selectById(id).getOrgId());
+
+		if (!this.update(user, taUserQueryWrapper)) {
 			throw new Exception("开启或禁用用户失败");
 		}
 	}
@@ -336,7 +379,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setLoginName(taUser.getPhone());
 		}
 		
-		List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(),taUser.getLoginName(),taUser.getOrgId());
+		List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(),taUser.getLoginName(),null);
 		if (null != taUserList && taUserList.size() > 0) {
 			throw new Exception("电话号码或登录名重复");
 		}

src/main/java/com/huiju/estateagents/channel/sysChannel/controller/SysUserChannelController.java

@@ -0,0 +1,289 @@
+package com.huiju.estateagents.channel.sysUser.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.sysUser.entity.SysToken;
+import com.huiju.estateagents.center.sysUser.entity.SysUser;
+import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
+import com.huiju.estateagents.center.sysUser.service.ISysUserService;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import com.huiju.estateagents.service.ITaChannelAppRelationService;
+import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
+import java.util.Map;
+
+/**
+ * <p>
+    * 系统用户 系统中心账户 前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@RestController
+@RequestMapping("/api")
+public class SysUserChannelController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(SysUserChannelController.class);
+
+    @Autowired
+    public ISysUserService iSysUserService;
+    
+    @Autowired
+    private ISysTokenService sysTokenService;
+
+    @Autowired
+    private ITaUserService iTaUserService;
+
+    @Autowired
+    private ITaChannelProxyService iTaChannelProxyService;
+
+    @Autowired
+    private ITaChannelAppRelationService iTaChannelAppRelationService;
+
+    /**
+     * 修改对象
+     * @param sysUser 实体对象
+     * @return
+     */
+    @RequestMapping(value="/channel/sysUser",method= RequestMethod.PUT)
+    public ResponseBean sysUserUpdate(@RequestBody SysUser sysUser, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            String userName = JWTUtils.getSubject(request);
+            sysUser.setPassword(MD5Utils.md5(sysUser.getPassword()));
+            sysUser.setUserName(userName);
+            if (iSysUserService.updateById(sysUser)){
+                responseBean.addSuccess(sysUser);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("sysUserUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    @PostMapping("/channel/signin")
+    public ResponseBean signinChannel(@RequestBody String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (params == null) {
+            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        String userName = params.getString("userName");
+        String userPassword = params.getString("password");
+
+        //验证用户名密码是否正确
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        sysUserQueryWrapper.eq("password", MD5Utils.md5(userPassword));
+        sysUserQueryWrapper.eq("type", CommConstant.LOGIN_TYPE_CHANNEL);
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        if (sysUser == null) {
+            return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (sysUser.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        String token = JWTUtils.newToken(sysUser.getUserName());
+
+        //保存token
+        sysTokenService.saveToken(token);
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("token", token);
+        result.put("user", sysUser);
+
+        return ResponseBean.success(result);
+    }
+
+    @PostMapping("/channel/signout")
+    public ResponseBean signoutChannel(HttpServletRequest request) {
+        String token = JWTUtils.getToken(request);
+        QueryWrapper<SysToken> sysTokenQueryWrapper = new QueryWrapper<>();
+        sysTokenQueryWrapper.eq("token",token);
+        sysTokenService.remove(sysTokenQueryWrapper);
+        return ResponseBean.success("成功退出");
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/current",method=RequestMethod.GET)
+    public ResponseBean currentChannelUser(HttpServletRequest request){
+        String userName = JWTUtils.getSubject(request);
+        QueryWrapper<SysUser> sysUserQueryWrapper = new QueryWrapper<>();
+        sysUserQueryWrapper.eq("user_name",userName);
+        sysUserQueryWrapper.eq("type",CommConstant.LOGIN_TYPE_CHANNEL);
+        SysUser sysUser = iSysUserService.getOne(sysUserQueryWrapper);
+        sysUser.setPassword(null);
+
+        return ResponseBean.success(sysUser);
+    }
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/channel/taChannel",method= RequestMethod.GET)
+    public ResponseBean taUserList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage pg = new Page<>(pageNum, pageSize);
+            IPage<TaChannelProxy> result = iTaChannelProxyService.getChannelList(pg);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 新增代理商
+     * @param taChannelProxy
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/channel/taChannel",method= RequestMethod.POST)
+    public ResponseBean taUserList(@RequestBody TaChannelProxy taChannelProxy, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() <= 0){
+                responseBean.addError("维护小程序数量不得小于0");
+                return responseBean;
+            }
+            if (StringUtils.isEmpty(taChannelProxy.getUserName())){
+                taChannelProxy.setUserName(taChannelProxy.getChannelTel());
+            }
+
+            QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
+            userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
+            Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
+            if (countUserName > 0){
+                responseBean.addError("账户名已存在");
+                return responseBean;
+            }
+
+
+            QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+            taChannelProxyQueryWrapper.eq("channel_tel", taChannelProxy.getChannelTel());
+            Integer countChannel = iTaChannelProxyService.count(taChannelProxyQueryWrapper);
+            if (countChannel > 0){
+                responseBean.addError("手机号已存在");
+                return responseBean;
+            }
+            taChannelProxy.setPassword(MD5Utils.md5(MD5Utils.md5("abc@123")));
+            taChannelProxy.setStatus(1);
+            taChannelProxy.setCreateTime(LocalDateTime.now());
+            iTaChannelProxyService.save(taChannelProxy);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taUserList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/channel/taChannel/{id}",method= RequestMethod.GET)
+    public ResponseBean getChannelProxyById(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaChannelProxy> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("channel_id", id);
+        TaChannelProxy taChannelProxy = iTaChannelProxyService.getOne(queryWrapper);
+        responseBean.addSuccess(taChannelProxy);
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id
+     * @param taChannelProxy
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/channel/taChannel/{id}",method= RequestMethod.PUT)
+    public ResponseBean taNewsTypeUpdate(@PathVariable Integer id,
+                                         @RequestBody TaChannelProxy taChannelProxy, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        if (taChannelProxy.getAppMaxNum() != null && taChannelProxy.getAppMaxNum() <= 0){
+            responseBean.addError("维护小程序数量不得小于0");
+            return responseBean;
+        }
+
+        if (StringUtils.isEmpty(taChannelProxy.getUserName())){
+            taChannelProxy.setUserName(taChannelProxy.getChannelTel());
+        }
+
+        QueryWrapper<TaChannelProxy> userNameQueryWrapper = new QueryWrapper<>();
+        userNameQueryWrapper.eq("user_name", taChannelProxy.getUserName());
+        userNameQueryWrapper.ne("channel_id", id);
+        Integer countUserName = iTaChannelProxyService.count(userNameQueryWrapper);
+        if (countUserName > 0){
+            responseBean.addError("账户名已存在");
+            return responseBean;
+        }
+
+        taChannelProxy.setExpireDate(taChannelProxy.getExpireDate().plusDays(1L));
+        //更新业务层的登录账号为禁用
+        if (taChannelProxy.getStatus() != null){
+            QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
+            taChannelAppRelationQueryWrapper.eq("channel_id", id);
+            List<TaChannelAppRelation> taChannelAppRelation = iTaChannelAppRelationService.list(taChannelAppRelationQueryWrapper);
+            List<Integer> orgIdList = new ArrayList<>();
+            taChannelAppRelation.forEach(e->{
+                orgIdList.add(e.getOrgId());
+            });
+            if (CollectionUtils.isNotEmpty(orgIdList)){
+                QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
+                taUserQueryWrapper.in("org_id", orgIdList);
+                TaUser taUser = new TaUser();
+                taUser.setStatus(taChannelProxy.getStatus());
+                iTaUserService.update(taUser, taUserQueryWrapper);
+            }
+
+        }
+
+        QueryWrapper<TaChannelProxy> taChannelProxyQueryWrapper = new QueryWrapper<>();
+        taChannelProxyQueryWrapper.eq("channel_id", id);
+        iTaChannelProxyService.update(taChannelProxy, taChannelProxyQueryWrapper);
+        return ResponseBean.success("更新成功");
+    }
+
+}

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

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.channel.sysChannel.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaChannelProxy {
+    @TableId(value = "channel_id", type = IdType.AUTO)
+    private Integer channelId;
+
+    private String channelProxyName;
+
+    private String channelImg;
+
+    private String channelContactName;
+
+    private String channelTel;
+
+    private String userName;
+
+    private String password;
+
+    private LocalDateTime expireDate;
+
+    private Integer status;
+
+    private Integer appMaxNum;
+
+    private LocalDateTime createTime;
+
+    @TableField(exist = false)
+    private Integer appCurrentNum;
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/mapper/TaChannelProxyMapper.java

@@ -0,0 +1,12 @@
+package com.huiju.estateagents.channel.sysChannel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TaChannelProxyMapper extends BaseMapper<TaChannelProxy> {
+    IPage<TaChannelProxy> getChannelList(IPage page);
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/service/ITaChannelProxyService.java

@@ -0,0 +1,12 @@
+package com.huiju.estateagents.channel.sysChannel.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+
+
+public interface ITaChannelProxyService extends IService<TaChannelProxy> {
+    IPage<TaChannelProxy> getChannelList(IPage page);
+
+    void resetPassword(Integer id, String newPass) throws Exception;
+}

src/main/java/com/huiju/estateagents/channel/sysChannel/service/impl/TaChannelProxyServiceImpl.java

@@ -0,0 +1,57 @@
+package com.huiju.estateagents.channel.sysChannel.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
+import com.huiju.estateagents.channel.sysChannel.service.ITaChannelProxyService;
+import com.huiju.estateagents.common.MD5Utils;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TaChannelProxyServiceImpl extends ServiceImpl<TaChannelProxyMapper, TaChannelProxy>  implements ITaChannelProxyService {
+    @Autowired
+    private TaChannelProxyMapper taChannelProxyMapper;
+
+    @Autowired
+    private TaChannelAppRelationMapper taChannelAppRelationMapper;
+
+    @Override
+    public IPage<TaChannelProxy> getChannelList(IPage page) {
+        IPage<TaChannelProxy> taChannelProxyIPage = taChannelProxyMapper.getChannelList(page);
+        if (CollectionUtils.isNotEmpty(taChannelProxyIPage.getRecords())){
+            taChannelProxyIPage.getRecords().forEach(e->{
+                QueryWrapper<TaChannelAppRelation> taChannelAppRelationQueryWrapper = new QueryWrapper<>();
+                taChannelAppRelationQueryWrapper.eq("channel_id", e.getChannelId());
+                taChannelAppRelationQueryWrapper.groupBy("channel_id");
+                e.setAppCurrentNum(taChannelAppRelationMapper.selectCount(taChannelAppRelationQueryWrapper));
+            });
+            taChannelProxyIPage.setRecords(taChannelProxyIPage.getRecords());
+        }
+        return taChannelProxyIPage;
+    }
+
+    @Override
+    public void resetPassword(Integer id, String newPass) throws Exception {
+        TaChannelProxy taChannelProxy = this.getById(id);
+        if (null == taChannelProxy) {
+            throw new Exception("未找到有效的渠道信息");
+        }
+
+        String encryptPass = MD5Utils.md5(MD5Utils.md5(newPass));
+        TaChannelProxy proxy = new TaChannelProxy();
+        proxy.setPassword(encryptPass);
+        proxy.setChannelId(id);
+
+        if (!this.updateById(proxy)) {
+            throw new Exception("重置渠道密码失败");
+        }
+    }
+}

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -135,7 +135,7 @@ public class CommConstant {
      */
     public final static String MINIAPP_INDEX = "/index/index";
 
-    public final static String MINIAPP_DEFAULT_AVATAR = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/default_avatar.jpg";
+    public final static String MINIAPP_DEFAULT_AVATAR = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/default_avatar.jpg";
 
 
     /**
@@ -440,6 +440,7 @@ public class CommConstant {
 	public static final Object GROUP_ACTIVITY = "groupActivity";
 	public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    public static final String DRAINAGE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
     
     /**
      * 消息通知
@@ -541,4 +542,49 @@ public class CommConstant {
      */
     public static final String MESSAGE_TYPE_OF_MINIAPP_TEMPLATE = "miniapp_template";
 
+    /**
+     * 进入小程序
+     */
+    public static final String BIZ_EVENT_START = "start";
+
+    /**
+     * 登录渠道端系统类型
+     */
+    public static final String LOGIN_TYPE_CHANNEL = "channel";
+
+    /**
+     * 登录中心端系统类型
+     */
+    public static final String LOGIN_TYPE_CENTER = "center";
+
+    /**
+     * 查看分享者活动类型 h5
+     */
+    public static final String H5_SHARE = "h5_share";
+
+    /**
+     * 查看分享者活动类型 拼团
+     */
+    public static final String GROUP_SHARE = "group_share";
+
+    /**
+     * 查看分享者活动类型 助力
+     */
+    public static final String HELP_SHARE = "help_share";
+
+    /**
+     * 查看分享者活动类型 活动
+     */
+    public static final String DYNAMIC_SHARE = "dynamic_share";
+
+    /**
+     * 户型
+     */
+    public static final String APARTMENT_TYPR_APART = "apart";
+
+    /**
+     * 户型全景图
+     */
+    public static final String PANORAMA_TYPE_APARTMENT = "apartment";
+
 }

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

@@ -18,16 +18,11 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
@@ -156,6 +151,17 @@ public class ExtendContentController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 针对首屏优化, 获取一些 banner, 开屏等配置
+     * @param cityId
+     * @param request
+     * @return
+     */
+    @GetMapping("/wx/extendContent")
+    public ResponseBean extendContentListOfWX(@RequestParam(value = "cityId") Integer cityId, HttpServletRequest request) {
+        return iExtendContentService.selectExtendContentListShowType(null, null, null,null, null, null, cityId,getOrgId(request));
+    }
+
 
     /**
      * 保存对象

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

@@ -16,12 +16,14 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
+import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TaShareMapper;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
+import net.bytebuddy.asm.Advice;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
@@ -82,6 +84,17 @@ public class MiniAppController extends BaseController {
     @Autowired
     private ITaCustomImgService iTaCustomImgService;
 
+    @Autowired
+    public ITdPointsRulesService iTdPointsRulesService;
+
+    @Autowired
+    public ITaMiniappService iTaMiniappService;
+
+    @Autowired
+    public TaOrgCityMapper taOrgCityMapper;
+
+    @Autowired
+    public ITdCityService iTdCityService;
 
     /**
      * 验证接入
@@ -94,6 +107,60 @@ public class MiniAppController extends BaseController {
         return echostr;
     }
 
+
+    /**
+     * 小程序数据预拉取 https://developers.weixin.qq.com/miniprogram/dev/framework/ability/pre-fetch.html
+     * @param appid
+     * @param timestamp
+     * @param token
+     * @param code
+     * @param path
+     * @param query
+     * @param scene
+     * @return
+     */
+    @GetMapping("/preload")
+    public ResponseBean getPreloadData(
+            @RequestParam(name = "appid") String appid,
+            @RequestParam(name = "timestamp") Long timestamp,
+            String token,
+            String code,
+            String path,
+            String query,
+            Integer scene
+    ) {
+        // 获取小程序信息
+        TaMiniapp taMiniapp = iTaMiniappService.getInfoWithTpls(appid);
+        if (null == taMiniapp) {
+            return ResponseBean.error("当前 appid 未在系统内注册", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 获取组织信息
+        TaOrg taOrg = taOrgService.getById(taMiniapp.getOrgId());
+        if (null == taOrg) {
+            return ResponseBean.error("当前 appid 未设置对应组织", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 获取城市列表
+        QueryWrapper<TaOrgCity> queryCity = new QueryWrapper<>();
+        queryCity.eq("id", taOrg.getOrgId());
+        queryCity.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaOrgCity> taOrgCityList = taOrgCityMapper.selectList(queryCity);
+
+        // 获取默认扩展设置
+        QueryWrapper<TaCustomImg> queryExt = new QueryWrapper<>();
+        queryExt.eq("org_id", taOrg.getOrgId());
+        queryExt.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaCustomImg> taCustomImg = iTaCustomImgService.list(queryExt);
+
+        return ResponseBean.success(new HashMap<String, Object>(){{
+            put("miniapp", taMiniapp);
+            put("org", taOrg);
+            put("cityList", taOrgCityList);
+            put("customImg", taCustomImg);
+        }});
+    }
+
     /**
      * 登陆接口
      */
@@ -101,8 +168,10 @@ public class MiniAppController extends BaseController {
     public ResponseBean login(
             String code,
             @RequestParam(required = false) String from,
-            @RequestParam(required = false)String recommender,
-            @RequestParam(required = false)String targetId,
+            @RequestParam(required = false) String recommender,
+            @RequestParam(required = false) String targetId,
+            @RequestParam(required = false) String lon,
+            @RequestParam(required = false) String lat,
             HttpServletRequest request) {
         String appid = request.getHeader("appid");
 
@@ -130,15 +199,21 @@ public class MiniAppController extends BaseController {
             personQueryWrapper.eq("org_id",orgId);
             int count = taPersonService.count(personQueryWrapper);
 
-            if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
-                // 添加积分
-                 applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
-            }
-
             TaPerson taPerson = taPersonService.newPersonByOpenid(session.getOpenid(), orgId);
             if (null == taPerson) {
                 return ResponseBean.error("发生未知错误", ResponseBean.ERROR_UNAVAILABLE);
             }
+
+            if(null!=from&&from.contains("share") && StringUtils.isNotBlank(recommender) && count>0){
+                // 校验是否点击过此人的分享
+                boolean checkPoint = checkSharePersonFrom(from,taPerson.getPersonId(),targetId,orgId);
+                if (checkPoint){
+                    // 添加积分
+                    applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
+                }
+            }
+
+
             Map<Object,Object> map = new HashMap<>();
             map.put("openId",session.getOpenid());
             map.put("orgId",orgId);
@@ -175,7 +250,8 @@ public class MiniAppController extends BaseController {
                 QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
                 sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
                 if(from.equals("dynamic_share")){ // activity_share
-                    taSharePersonFrom.setStatus(CommConstant.STATUS_UNACCALIMED);
+                    //产品不认了
+                    taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
                     TaBuildingDynamic buildingDynamic = buildingDynamicService.getById(targetId);
                     taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
                     sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());
@@ -215,7 +291,7 @@ public class MiniAppController extends BaseController {
             // 所有人员都返回 org yansen 2019-11-13 19:56:18
 //            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
                 QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
-                orgQueryWrapper.eq("org_id",taPerson.getOrgId());
+                orgQueryWrapper.eq("org_id", orgId);
                 TaOrg org = taOrgService.getOne(orgQueryWrapper);
                 taPerson.setOrg(org);
 //            }
@@ -227,15 +303,25 @@ public class MiniAppController extends BaseController {
 
             //返回是否授权标识
             QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("org_id", orgId);
             queryWrapper.eq("img_type", "auth");
             List<TaCustomImg>  taCustomImgs = iTaCustomImgService.list(queryWrapper);
             result.put("avatarAuth", CollectionUtils.isEmpty(taCustomImgs) ? false : "1".equals(taCustomImgs.get(0).getImgUrl()) ? true: false);
 
-
             String token = (String) miniResp.get("token");
             sysTokenService.saveToken(token);
 
+            //把積分規則返回給小程序
+            QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
+            tdPointsRulesQueryWrapper.eq("org_id", orgId);
+            List<TdPointsRules> rulesPointList = iTdPointsRulesService.list(tdPointsRulesQueryWrapper);
+            result.put("rulesPointList",rulesPointList);
+
+            // 定位城市
+            String location = null == lon ? null : lon + "," + lat;
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId);
+            result.put("city", tdCity);
+
             return ResponseBean.success(result);
         } catch (WxErrorException e) {
             System.err.println(e.getError());
@@ -243,6 +329,19 @@ public class MiniAppController extends BaseController {
         }
     }
 
+    private boolean checkSharePersonFrom(String from, String personId, String targetId, Integer orgId) {
+        QueryWrapper<TaSharePersonFrom> queryWrapper =  new QueryWrapper<>();
+        queryWrapper.eq("target_type",from);
+        queryWrapper.eq("person_id",personId);
+        queryWrapper.eq("target_id",targetId);
+        queryWrapper.eq("org_id",orgId);
+        List<TaSharePersonFrom> list = taSharePersonFromService.list(queryWrapper);
+        if (list.size() > 0){
+            return false;
+        }
+        return true;
+    }
+
     /**
      * 登陆接口
      */

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

@@ -163,4 +163,25 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId);
     }
 
+    /**
+     * 用户来源  首页
+     * @return
+     */
+    @GetMapping(value = "/admin/selectPersonFrom")
+    public ResponseBean selectPersonFrom(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                            HttpServletRequest request) {
+        return iStatisticalService.selectPersonFrom(getOrgId(request), startDate,endDate);
+    }
+
+    /**
+     * 用户来源  折线图 首页
+     * @return
+     */
+    @GetMapping(value = "/admin/selectPersonFromGroupByDay")
+    public ResponseBean selectPersonFromGroupByDay(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                         HttpServletRequest request) {
+        return iStatisticalService.selectPersonFromGroupByDay(getOrgId(request), startDate,endDate);
+    }
 }

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

@@ -321,9 +321,10 @@ public class TaBuildingController extends BaseController {
      * 微信推荐楼盘列表
      * @return
      */
-    @RequestMapping(value = "/wx/building/mian", method = RequestMethod.GET)
-    public ResponseBean getWxMainBuildingList(){
-        return taBuildingService.getWxMainBuildingList();
+    @RequestMapping(value = "/wx/building/main", method = RequestMethod.GET)
+    public ResponseBean getWxMainBuildingList(String cityId, HttpServletRequest request){
+        Integer orgId = getOrgId(request);
+        return taBuildingService.getWxMainBuildingList(cityId, orgId);
     }
 
     /**

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

@@ -532,7 +532,7 @@ public class TaBuildingDynamicController extends BaseController {
         dynamicQueryWrapper.eq("dynamic_id",dynamic);
         if (iBuildingDynamicService.updateById(dynamic)){
             responseBean.addSuccess("成功");
-        }else {
+        } else {
             responseBean.addError("失败");
         }
         return responseBean;
@@ -553,7 +553,7 @@ public class TaBuildingDynamicController extends BaseController {
         dynamicQueryWrapper.eq("dynamic_id",dynamic);
         if (iBuildingDynamicService.updateById(dynamic)){
             responseBean.addSuccess("成功");
-        }else {
+        } else {
             responseBean.addError("失败");
         }
         return responseBean;

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

@@ -0,0 +1,211 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuildingApartment;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
+import com.huiju.estateagents.service.ITaBuildingApartmentService;
+import com.huiju.estateagents.service.ITaBuildingPanoramaService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * <p>
+    *   前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-30
+ */
+@RestController
+@RequestMapping("/api")
+public class TaBuildingPanoramaController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaBuildingPanoramaController.class);
+
+    @Autowired
+    public ITaBuildingPanoramaService iTaBuildingPanoramaService;
+
+
+    @Autowired
+    private ITaBuildingApartmentService taBuildingApartmentService;
+
+    /**
+     * 查询列表
+     * @return
+     */
+    @RequestMapping(value="/admin/panorama/{buildingId}",method= RequestMethod.GET)
+    public ResponseBean taBuildingPanoramaList(@PathVariable String buildingId,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TaBuildingPanorama> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            
+            queryWrapper.orderByDesc("create_date");
+            List<TaBuildingPanorama> result = iTaBuildingPanoramaService.list(queryWrapper);
+
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 获取全景图的户型列表
+     * @return
+     */
+    @RequestMapping(value="/admin/panorama/apartment",method= RequestMethod.GET)
+    public ResponseBean getApartmentList(@RequestParam(value ="buildingId") String buildingId,
+                                               HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //获取此楼盘下的所有的户型
+            QueryWrapper<TaBuildingApartment> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("apartment_type",CommConstant.APARTMENT_TYPR_APART);
+            queryWrapper.eq("building_id",buildingId);
+            List<TaBuildingApartment> apartmentList = taBuildingApartmentService.list(queryWrapper);
+
+            //获取此楼盘下所有已经有全景图的户型
+            QueryWrapper<TaBuildingPanorama> panoramaQueryWrapper = new QueryWrapper<>();
+            panoramaQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            panoramaQueryWrapper.eq("panorama_type",CommConstant.PANORAMA_TYPE_APARTMENT);
+            panoramaQueryWrapper.eq("building_id",buildingId);
+            panoramaQueryWrapper.eq("org_id",getOrgId(request));
+            List<TaBuildingPanorama> panoramaList = iTaBuildingPanoramaService.list(panoramaQueryWrapper);
+            List<String> stringList = panoramaList.stream().map(TaBuildingPanorama::getApartmentId).collect(Collectors.toList());
+
+            List<TaBuildingApartment> resultList = new ArrayList<>();
+            //过滤已经选择的
+            apartmentList.forEach(e -> {
+                if (!stringList.contains(e.getApartmentId())){
+                    resultList.add(e);
+                }
+            });
+
+            responseBean.addSuccess(resultList);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getApartmentList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taBuildingPanorama 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/panorama",method= RequestMethod.POST)
+    public ResponseBean taBuildingPanoramaAdd(@RequestBody TaBuildingPanorama taBuildingPanorama,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taBuildingPanorama.setStatus(CommConstant.STATUS_NORMAL);
+            taBuildingPanorama.setCreateDate(LocalDateTime.now());
+            taBuildingPanorama.setOrgId(getOrgId(request));
+            //把户型给内容
+            if (taBuildingPanorama.getPanoramaType().equals(CommConstant.PANORAMA_TYPE_APARTMENT)){
+                TaBuildingApartment apartment = taBuildingApartmentService.getById(taBuildingPanorama.getApartmentId());
+                taBuildingPanorama.setContent(apartment.getApartmentName());
+            }
+            if (iTaBuildingPanoramaService.save(taBuildingPanorama)){
+                responseBean.addSuccess(taBuildingPanorama);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象--逻辑删除
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/panorama/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taBuildingPanoramaDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TaBuildingPanorama taBuildingPanorama = new TaBuildingPanorama();
+            taBuildingPanorama.setPanoramaId(id);
+            taBuildingPanorama.setStatus(CommConstant.STATUS_UNACCALIMED);
+            if(iTaBuildingPanoramaService.updateById(taBuildingPanorama)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taBuildingPanorama 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/panorama/{id}",method= RequestMethod.PUT)
+    public ResponseBean taBuildingPanoramaUpdate(@PathVariable Integer id,
+                                        @RequestBody TaBuildingPanorama taBuildingPanorama){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taBuildingPanorama.setPanoramaId(id);
+            if (iTaBuildingPanoramaService.updateById(taBuildingPanorama)){
+                responseBean.addSuccess(taBuildingPanorama);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/panorama/{id}",method= RequestMethod.GET)
+    public ResponseBean taBuildingPanoramaGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaBuildingPanoramaService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingPanoramaDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -79,9 +79,9 @@ public class TaMiniappController extends BaseController {
     @RequestMapping(value="/center/taMiniapp",method= RequestMethod.POST)
     public ResponseBean taMiniappAdd(@RequestBody TaMiniapp taMiniapp, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-
+        Integer channelId = getChannelId(request);
         try {
-            iTaMiniappService.saveInfoWithTpls(taMiniapp);
+            iTaMiniappService.saveInfoWithTpls(taMiniapp, channelId);
             responseBean.addSuccess(taMiniapp);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -0,0 +1,147 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.service.ITaPersonFromRecordService;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.List;
+
+/**
+ * <p>
+    * 新增用户来源表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-03
+ */
+@RestController
+@RequestMapping("/api")
+public class TaPersonFromRecordController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaPersonFromRecordController.class);
+
+    @Autowired
+    public ITaPersonFromRecordService iTaPersonFromRecordService;
+
+    @Autowired
+    public ITaPersonService taPersonService;
+
+    @Autowired
+    private ITsUserBehaviorStatisticService iTsUserBehaviorStatisticService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taPersonFromRecord",method= RequestMethod.GET)
+    public ResponseBean taPersonFromRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        iTaPersonFromRecordService.personFromStatistic();
+        iTsUserBehaviorStatisticService.userBehaviorStatustic();
+        responseBean.addSuccess("成功");
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taPersonFromRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPersonFromRecord",method= RequestMethod.POST)
+    public ResponseBean taPersonFromRecordAdd(@RequestBody TaPersonFromRecord taPersonFromRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPersonFromRecordService.save(taPersonFromRecord)){
+                responseBean.addSuccess(taPersonFromRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonFromRecordAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taPersonFromRecord/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taPersonFromRecordDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaPersonFromRecordService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonFromRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taPersonFromRecord 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taPersonFromRecord/{id}",method= RequestMethod.PUT)
+    public ResponseBean taPersonFromRecordUpdate(@PathVariable Integer id,
+                                        @RequestBody TaPersonFromRecord taPersonFromRecord){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaPersonFromRecordService.updateById(taPersonFromRecord)){
+                responseBean.addSuccess(taPersonFromRecord);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonFromRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taPersonFromRecord/{id}",method= RequestMethod.GET)
+    public ResponseBean taPersonFromRecordGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaPersonFromRecordService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taPersonFromRecordDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+}

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

@@ -53,7 +53,8 @@ public class TaPersonVisitRecordController extends BaseController {
     public ITaBuildingService buildingService;
     @Autowired
     private ITaRecommendCustomerService taRecommendCustomerService;
-
+    @Autowired
+    public ITaPersonFromRecordService iTaPersonFromRecordService;
 
 
     /**
@@ -80,7 +81,7 @@ public class TaPersonVisitRecordController extends BaseController {
     }
 
     /**
-     * 保存对象
+     * 保存对象--埋点数据保存
      * @param taPersonVisitRecord 实体对象
      * @return
      */
@@ -141,6 +142,11 @@ public class TaPersonVisitRecordController extends BaseController {
         }
         try {
             if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
+                //清洗埋點數據到新增用戶表--只有进入小程序的时候 start才记录
+                if(taPersonVisitRecord.getEvent().equals(CommConstant.BIZ_EVENT_START)){
+                    iTaPersonFromRecordService.addNewPersonRecordRecord(taPersonVisitRecord);
+                }
+
                 return ResponseBean.success(taPersonVisitRecord);
             }else {
                 return ResponseBean.error("保存失败",ResponseBean.ERROR_UNAVAILABLE);
@@ -344,13 +350,16 @@ public class TaPersonVisitRecordController extends BaseController {
         }
         //使用分页插件
         IPage<TaConsultantInfo> pg = new Page<>(pageNumber, pageSize);
-        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, userId, getOrgId(request));
+        QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+        taPersonQueryWrapper.eq("user_id", userId);
+        TaPerson taPerson = taPersonService.getOne(taPersonQueryWrapper);
+        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, taPerson.getPersonId());
 
         List<TaConsultantInfo> taConsultantInfos = result.getRecords();
         taConsultantInfos.forEach(e ->{
-            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getEventType());
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(getOrgId(request), e.getTargetId(), userId, taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(e.getEventType()) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(e.getEventType()) ? "dynamic" : e.getEventType())  + "_share");
             switch (e.getEventType()){
-                case CommConstant.POSTER_CONTENT_TYPE_ACTIVITY:
+                case CommConstant.FAVOR_ACTIVITY:
                     e.setActivityShareNum(shareNum);
                     break;
                 case CommConstant.POINTS_CHANGE_HELP:
@@ -362,7 +371,7 @@ public class TaPersonVisitRecordController extends BaseController {
                 case CommConstant.CAROUSEL_NEWS:
                     e.setNewsNum(shareNum);
                     break;
-                case CommConstant.POSTER_CONTENT_TYPE_BUILDING:
+                case CommConstant.FAVOR_PROJECT:
                     e.setBuildingNum(shareNum);
                     break;
                 case CommConstant.EVENT_H5:

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

@@ -111,7 +111,7 @@ public class TaPointsRecordsController extends BaseController {
                         result.getRecords().get(i).setRecordName("兑换商品");
                         break;
                     case CommConstant.POINTS_CHANGE_SHARE_POSTER:
-                        result.getRecords().get(i).setRecordName("分享海报");
+                        result.getRecords().get(i).setRecordName("分享转发");
                         break;
                     case CommConstant.POINTS_CHANGE_CHECKIN:
                         result.getRecords().get(i).setRecordName("签到");

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

@@ -306,7 +306,8 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex,
                                          @RequestParam(value = "customerType") String customerType,// public 公  private 私
-                                         @RequestParam(value = "status",required = false) Integer status){
+                                         @RequestParam(value = "status",required = false) Integer status,
+                                         @RequestParam(value = "sceneType",required = false) String sceneType){
         try{
 
             // TODO 目前如果是公客，就取当前操作人员的 buildingId
@@ -320,7 +321,7 @@ public class TaRecommendCustomerController extends BaseController {
 //                TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(queryWrapper);
 //                buildingId = personBuilding.getBuildingId();
 //            }
-            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request),sceneType));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -393,6 +394,20 @@ public class TaRecommendCustomerController extends BaseController {
         }
     }
 
+    /**
+     * 分配置业顾问
+     */
+    @RequestMapping(value="/admin/customer/consultant/assist/{personId}",method= RequestMethod.POST)
+    public ResponseBean assistConsultant (@RequestBody TaUser taUser, @PathVariable String personId, HttpServletRequest request){
+        try{
+            Integer orgId = getOrgId(request);
+            taRecommendCustomerService.consultantAssist(taUser, personId, orgId);
+            return ResponseBean.success("");
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
 
     @GetMapping("/admin/customer/recommend/{customerId}")
     public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId,HttpServletRequest request){
@@ -521,10 +536,12 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
     public ResponseBean getCustomerDetail(@PathVariable String id,
                                           @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @RequestParam(value ="buildingId",required = false) String buildingId,
+                                          HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -535,10 +552,11 @@ public class TaRecommendCustomerController extends BaseController {
     @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
     public ResponseBean getPublicCustomerDetail(@PathVariable String id,
                                                 @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value ="buildingId",required = false) String buildingId,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request),buildingId));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -548,11 +566,12 @@ public class TaRecommendCustomerController extends BaseController {
 
     @GetMapping("/admin/customer/recommend/drift")
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
-                                              @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,
+                                              @RequestParam(value ="buildingId",defaultValue = "") String buildingId,
+                                              @RequestParam(value ="sceneType",defaultValue = "") String sceneType,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
         try{
-            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId, getOrgId(request)));
+            return ResponseBean.success(taPersonService.getDriftCustomerList(pageNumber,pageSize,buildingId, getOrgId(request),sceneType));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);

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

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.entity.TaSharePersonFrom;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.ITaSharePersonFromService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
 /**
  * <p>
     *   前端控制器
@@ -63,18 +68,21 @@ public class TaSharePersonFromController extends BaseController {
     }
 
     /**
-     * 保存对象
-     * @param taSharePersonFrom 实体对象
+     * 保存对象--分享记录埋点
+     *
      * @return
      */
-    @RequestMapping(value="/taSharePersonFrom",method= RequestMethod.POST)
-    public ResponseBean taSharePersonFromAdd(@RequestBody TaSharePersonFrom taSharePersonFrom){
+    @RequestMapping(value="/wx/taSharePersonFrom",method= RequestMethod.POST)
+    public ResponseBean taSharePersonFromAdd( @RequestParam(required = false) String from,
+                                              @RequestParam(required = false)String recommender,
+                                              @RequestParam(required = false)String targetId,
+                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaSharePersonFromService.save(taSharePersonFrom)){
+            if(StringUtils.isNotBlank(from) &&StringUtils.isNotBlank(recommender) &&StringUtils.isNotBlank(targetId)){
+                //添加客户分享信息记录
+                TaSharePersonFrom taSharePersonFrom = iTaSharePersonFromService.addSharePersonRecord(getPersonId(request), getOrgId(request), from, recommender, targetId);
                 responseBean.addSuccess(taSharePersonFrom);
-            }else {
-                responseBean.addError("fail");
             }
         }catch (Exception e){
             e.printStackTrace();

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

@@ -189,8 +189,9 @@ public class TdCityController extends BaseController {
     @RequestMapping(value="/wx/location/city",method= RequestMethod.GET)
     public ResponseBean wxLocationCityDetail(@RequestParam(value = "location") String location,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
         try {
-            TdCity tdCity = iTdCityService.getLocationCity(location);
+            TdCity tdCity = iTdCityService.getLocationCity(location, orgId);
             responseBean.addSuccess(tdCity);
         }catch (Exception e){
             logger.error("tdCityList -=- {}",e.toString());

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TdReport;
 import com.huiju.estateagents.service.ITdReportService;
 import io.swagger.annotations.Api;
@@ -60,6 +61,7 @@ public class TdReportController extends BaseController {
             //使用分页插件
 		    IPage<TdReport> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdReport> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TdReport> result = iTdReportService.page(pg, queryWrapper);

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

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdWxDict;
+import com.huiju.estateagents.service.ITdWxDictService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 微信字典表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@RestController
+@RequestMapping("/api")
+public class TdWxDictController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TdWxDictController.class);
+
+    @Autowired
+    public ITdWxDictService iTdWxDictService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/tdWxDict",method= RequestMethod.GET)
+    public ResponseBean tdWxDictList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TdWxDict> pg = new Page<>(pageNumber, pageSize);
+            QueryWrapper<TdWxDict> queryWrapper = new QueryWrapper<>();
+            queryWrapper.groupBy("scene_type");
+
+            IPage<TdWxDict> result = iTdWxDictService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tdWxDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdWxDict",method= RequestMethod.POST)
+    public ResponseBean tdWxDictAdd(@RequestBody TdWxDict tdWxDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdWxDictService.save(tdWxDict)){
+                responseBean.addSuccess(tdWxDict);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tdWxDict/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tdWxDictDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTdWxDictService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tdWxDict 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tdWxDict/{id}",method= RequestMethod.PUT)
+    public ResponseBean tdWxDictUpdate(@PathVariable Integer id,
+                                        @RequestBody TdWxDict tdWxDict){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTdWxDictService.updateById(tdWxDict)){
+                responseBean.addSuccess(tdWxDict);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tdWxDict/{id}",method= RequestMethod.GET)
+    public ResponseBean tdWxDictGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTdWxDictService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tdWxDictDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -12,7 +12,10 @@ import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.ExtendContent;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.service.IExtendContentService;
+import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.swagger.models.auth.In;
@@ -60,6 +63,12 @@ public class TaDrainageController extends BaseController {
     @Autowired
     public IExtendContentService iExtendContentService;
 
+    @Autowired
+    private TaMiniappMapper taMiniappMapper;
+
+    @Autowired
+    private IMiniAppService miniAppService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -128,7 +137,16 @@ public class TaDrainageController extends BaseController {
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
             }
             if (iTaDrainageService.save(taDrainage)){
-                //添加第三方appid和secret
+                // 根据ORGID查询当前小程序表的miniapp_id
+                QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();
+                taMiniappQuery.eq("org_id",getOrgId(request));
+                TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
+                // 生成二维码
+                ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.DRAINAGE_QRCODE.replace("#0",taDrainage.getDrainageId().toString()).replace("#1","h5"),taMiniapp.getMiniappId());
+                taDrainage.setQrCode(String.valueOf(taMiniappQrcode.getData()));
+                iTaDrainageService.updateById(taDrainage);
+
+                //添加第三方appid和secretis
                 TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = new TaThirdPartyMiniappConfig();
                 taThirdPartyMiniappConfig.setOrgId(getOrgId(request));
                 taThirdPartyMiniappConfig.setAppid(getUUIDS());

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -73,7 +73,8 @@ public class TaDrainage implements Serializable {
     private String middleImg ;
     /** 状态 */
     private Integer status ;
-
+    /** 二维码*/
+    private String qrCode;
     @TableField(exist = false)
     private String appid;
     

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

@@ -52,7 +52,7 @@ public class TaBuilding implements Serializable {
     /**
      * 开盘时间
      */
-    private LocalDateTime openingDate;
+    private String openingDate;
 
     /**
      * 项目地址
@@ -198,6 +198,21 @@ public class TaBuilding implements Serializable {
      */
     private Integer mapScope;
 
+    /**
+     * 开发商
+     */
+    private String propertyDeveloper;
+
+    /**
+     * 楼栋总数
+     */
+    private Integer buildingNum;
+
+    /**
+     * 备案名
+     */
+    private String recordName;
+
     /**
      * 地图数据
      */
@@ -275,4 +290,22 @@ public class TaBuilding implements Serializable {
      */
     @TableField(exist = false)
     private List<TaBuildingImg> buildingListImg;
+
+    /**
+     * 列表封面图
+     */
+    @TableField(exist = false)
+    private String listPoster;
+
+    /**
+     * 标签列表, 逗哈分隔
+     */
+    @TableField(exist = false)
+    private String tags;
+
+    /**
+     * 全景图
+     */
+    @TableField(exist = false)
+    private List<TaBuildingPanorama> panoramaList;
 }

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

@@ -0,0 +1,79 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *  
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaBuildingPanorama implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 全景图ID 全景图ID
+     */
+    @TableId(value = "panorama_id", type = IdType.AUTO)
+    private Integer panoramaId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 户型ID
+     */
+    private String apartmentId;
+
+    /**
+     * 全景图类型 全景图类型building指楼盘全景图，apartment指户型全景图
+     */
+    private String panoramaType;
+
+    /**
+     * 全景内容
+     */
+    private String content;
+
+    /**
+     * 全景封面
+     */
+    private String coverImg;
+
+    /**
+     * 全景图链接地址
+     */
+    private String panoramaLink;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+}

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

@@ -0,0 +1,49 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 渠道小程序关系表
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaChannelAppRelation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 关系id
+     */
+    @TableId(value = "relation_id", type = IdType.AUTO)
+    private Integer relationId;
+
+    /**
+     * 渠道id
+     */
+    private Integer channelId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+
+}

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

@@ -287,4 +287,10 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String personFrom;
+
+    /**
+     * 用户来源
+     */
+    @TableField(exist = false)
+    private String sceneAlias;
 }

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

@@ -0,0 +1,93 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 新增用户来源表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPersonFromRecord implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 新增用户来源id
+     */
+    @TableId(value = "from_record_id", type = IdType.AUTO)
+    private Integer fromRecordId;
+
+    /**
+     * 微信来源字典id
+     */
+    private String sceneId;
+
+    /**
+     * 新增用户id
+     */
+    private String personId;
+
+    /**
+     * 是否第一次
+     */
+    private Boolean isFirstTime;
+
+    /**
+     * 类型ID值
+     */
+    private String targetId;
+
+    /**
+     * 分享人Id
+     */
+    private String sharePersonId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 事件
+     */
+    private String event;
+
+    /**
+     * 事件类型
+     */
+    private String eventType;
+
+    /**
+     * 行为
+     */
+    private String activity;
+
+    /**
+     * 微信来源类型
+     */
+    private String sceneType;
+}

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

@@ -81,6 +81,12 @@ public class TaPersonVisitRecord implements Serializable {
      */
     private String consultantId;
 
+    /**
+     * 场景值id
+     */
+    @TableField(exist = false)
+    private String sceneId;
+
     /**
      * 分享者personid
      */
@@ -94,6 +100,8 @@ public class TaPersonVisitRecord implements Serializable {
 
     private String targetId;
 
+    private String targetType ;
+
     /**
      * 用户名称
      */

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

@@ -93,19 +93,19 @@ public class TaShareRecord implements Serializable {
 
     @TableField(exist = false)
     private String activityName;
-    
+
     @TableField(exist = false)
     private String mainImg;
-    
+
     @TableField(exist = false)
     private Integer activityStatus;
-    
+
     @TableField(exist = false)
     private LocalDateTime endDate;
-    
+
     @TableField(exist = false)
     private Integer id;
-    
+
     /**
      * 是否发起者
      */

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

@@ -55,6 +55,10 @@ public class TdBizEvent implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 分数
+     */
+    private Integer points;
     /**
      * 意向值
      */

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

@@ -0,0 +1,62 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 微信字典表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdWxDict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 场景值id
+     */
+    @TableId(value = "scene_id", type = IdType.AUTO)
+    private String sceneId;
+
+    /**
+     * 场景名称
+     */
+    private String sceneName;
+
+    /**
+     * 场景类型
+     */
+    private String sceneType;
+
+    /**
+     * 场景类型别名
+     */
+    private String sceneAlias;
+
+
+    /**
+     * 来源人数合集
+     */
+    @TableField(exist = false)
+    private Integer fromData;
+
+    /**
+     * 注册人数合集
+     */
+    @TableField(exist = false)
+    private Integer registerSum;
+}

src/main/java/com/huiju/estateagents/excel/TaActivityDynamicEnlistExport.java

@@ -41,10 +41,10 @@ public class TaActivityDynamicEnlistExport implements Serializable {
      * 推广人
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "推广人", index = 4)
+    @ExcelProperty(value = "引流人", index = 4)
     private String sharePersonName;
 
-    /**
+    /*
      * 公司
      */
     @ColumnWidth(15)

src/main/java/com/huiju/estateagents/interceptor/AccessInterceptor.java

@@ -52,10 +52,12 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/wx/chat", // 聊天暂时不鉴权
             "/api/wx/",
             "/api/wx/tdCity",
+            "/api/wx/preload",
             "/api/admin/signin",
             "/api/taCheckin/activity",
             "/api/wx/qrcode/scene",
 		    "/api/center/signin",
+            "/api/channel/signin",
 		    "/api/admin/taUser/signin",
             "/swagger-resources/configuration/ui",
             "/swagger-resources",
@@ -66,7 +68,8 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/webjars/springfox-swagger-ui",
             "/webjars/springfox-swagger-ui/css/typography.css",
             "/clean/menurole",
-            "/clean/buttonrole"
+            "/clean/buttonrole",
+            "/api/admin/taPersonFromRecord"
     };
 
     /*
@@ -142,7 +145,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             // 只尝试去解析
             Jwts.parser().setSigningKey(JWTUtils.key).parseClaimsJws(jwtAuths[1]);
         } catch (ExpiredJwtException e) {
-            ResponseBean resp = ResponseBean.error("权限验证非法, Token 已过期", ResponseBean.ERROR_AUTH_EXPIRED);
+            ResponseBean resp = ResponseBean.error("权限验证非法, 身份信息已过期", ResponseBean.ERROR_AUTH_EXPIRED);
             response.addHeader("Content-type", "application/json");
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;

src/main/java/com/huiju/estateagents/job/CustomerStatisticTimeJob.java

@@ -1,9 +1,11 @@
 package com.huiju.estateagents.job;
 
 import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.service.ITaPersonFromRecordService;
 import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
 import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +38,12 @@ public class CustomerStatisticTimeJob extends BaseController {
     @Autowired
     private ITsCustomerStatisticMonthlyService customerStatisticMonthlyService;
 
+    @Autowired
+    public ITaPersonFromRecordService iTaPersonFromRecordService;
+
+    @Autowired
+    private ITsUserBehaviorStatisticService iTsUserBehaviorStatisticService;
+
     /**
      *
      * 盘客工具数据统计
@@ -43,36 +51,42 @@ public class CustomerStatisticTimeJob extends BaseController {
      * 开启定时任务，每天23:50执行
      */
     @Scheduled(cron = "59 50 23 * * ?")
-    //@Scheduled(cron = "* 0/5 * * * ?")
+//    @Scheduled(cron = "* 0/1 * * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();
-    
+
         //每天的新增客户统计并入表
         customerStatisticDailyService.newCustomerStatisticDaily(nowDate);
-        
+
         //每天的跟进客户统计并入表
         customerStatisticDailyService.followUpStatisticDaily(nowDate);
-        
+
         //每天的到访客户统计并入表
         customerStatisticDailyService.visiteStatisticDaily(nowDate);
-    
+
         //每天的新增客户性别统计并入表
         taCustomerGenderStatisticService.newCustomerSexStatisticDaily(nowDate);
-    
+
         //每天的跟进客户性别统计并入表
         taCustomerGenderStatisticService.followUpSexStatisticDaily(nowDate);
-    
+
         //每天的到访客户性别统计并入表
         taCustomerGenderStatisticService.visiteSexStatisticDaily(nowDate);
-    
+
         //每月的新增客户统计并入表,但是每天都更新
         customerStatisticMonthlyService.newCustomerStatisticMonthly(nowDate);
-    
+
         //每月的跟进客户统计并入表,但是每天都更新
         customerStatisticMonthlyService.followUpStatisticMonthly(nowDate);
-    
+
         //每月的到访客户统计并入表,但是每天都更新
         customerStatisticMonthlyService.visiteStatisticMonthly(nowDate);
+
+        //统计新增来源用户
+        iTaPersonFromRecordService.personFromStatistic();
+
+        //统计用户行为数据
+        iTsUserBehaviorStatisticService.userBehaviorStatustic();
     }
 
 }

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -1,7 +1,6 @@
 package com.huiju.estateagents.job;
 
 import com.huiju.estateagents.base.BaseController;
-import com.huiju.estateagents.center.sysUser.controller.SysUserController;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.service.*;
@@ -89,7 +88,6 @@ public class JudglActivityTimeJob extends BaseController {
 
         //更新H5活动状态为已结束
         iTaDrainageService.updateDrainageToEnd();
-
     }
 
 }

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

@@ -91,4 +91,6 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @return
      */
     int countNumByHeavy(@Param("heavy") Integer heavy, @Param("dynamicId") String dynamicId);
+
+    List<TaBuilding> selectMainBuildings(@Param("cityId") String cityId, @Param("orgId") Integer orgId);
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *   Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-30
+ */
+@Mapper
+public interface TaBuildingPanoramaMapper extends BaseMapper<TaBuildingPanorama> {
+
+}

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 渠道小程序关系表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Mapper
+public interface TaChannelAppRelationMapper extends BaseMapper<TaChannelAppRelation> {
+
+}

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

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonFromRecord;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 新增用户来源表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-03
+ */
+@Mapper
+public interface TaPersonFromRecordMapper extends BaseMapper<TaPersonFromRecord> {
+
+    List<TsPersonFromStatistic> getNowDataList();
+}

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

@@ -67,6 +67,22 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent') and phone is not null")
     Integer selectRegisteredCount(@Param("org") Integer orgId);
 
+    /**
+     * 渠道代理后台总用户数
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Select("select count(1) from ta_person where org_id = #{org}")
+    Integer selectChannelUserCount(@Param("org") String orgId);
+
+    /**
+     * 渠道代理后台总注册数
+     * @return
+     */
+    @ResultType(Integer.class)
+    @Select("select count(1) from ta_person where org_id = #{org} and phone is not null")
+    Integer selectChannelRegisteredCount(@Param("org") String orgId);
+
     /**
      * 根据时间段查询
      * @param personType
@@ -203,4 +219,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer judgeBindStatusByCondition(@Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("phone") String phone);
+
+    IPage<TaPerson> selectDriftCustomerPageList(IPage<TaPerson> page,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId,@Param("personEstateDrift") String personEstateDrift,@Param("sceneType") String sceneType);
+
+    int selectFromNum(@Param("orgId") Integer orgId,@Param("personType") String personType);
 }

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

@@ -4,7 +4,6 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaConsultantInfo;
-import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import org.apache.ibatis.annotations.Mapper;
@@ -27,7 +26,7 @@ import java.util.List;
 @Mapper
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
 
-    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId);
+    IPage<TaPersonVisitRecord> visitRecordByPersonId(IPage<TaPersonVisitRecord> page,@Param("personId") String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId);
 
     Integer getDurationByPersonId(@Param("personId") String personId);
 
@@ -80,7 +79,11 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
 
     IPage<TaPersonVisitRecord> getWxVisitRecordActivityList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId,@Param("personId") String personId,@Param("orgId") Integer orgId,@Param("eventType") String eventType);
 
-    IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId);
+    IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, @Param("personId") String personId);
 
-    Integer countShareNumByEventType(@Param("targetId") String targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
+    Integer countShareNumByEventType(@Param("orgId")Integer orgId, @Param("targetId") String targetId, @Param("userId")Integer userId, @Param("personId")String personId, @Param("eventType")String eventType);
+
+    List<TaPersonVisitRecord> selectData();
+
+    List<TaPersonVisitRecord> selectTapersonFromShare();
 }

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

@@ -33,7 +33,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 
-    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);
+    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);
     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);
@@ -48,7 +48,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel,@Param("sceneType") String sceneType);
 
     /**
      * 导出数据 获取推荐用户数据

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

@@ -26,4 +26,6 @@ public interface TdCityMapper extends BaseMapper<TdCity> {
      * @return
      */
     List<TdCity> selectWxCity(@Param("orgId") Integer orgId);
+
+    TdCity getOrgDefaultCity(@Param("orgId") Integer orgId);
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdWxDict;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 微信字典表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@Mapper
+public interface TdWxDictMapper extends BaseMapper<TdWxDict> {
+
+}

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

@@ -106,4 +106,22 @@ public interface IStatisticalService {
      * @return
      */
     ResponseBean selectIntentionUser(Integer pageNum, Integer pageSize, Integer orgId, String buildingId);
+
+    /**
+     * 用户来源数据 首页
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 用户来源数据统计折线图
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ResponseBean selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate);
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
+
+/**
+ * <p>
+ *   服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-30
+ */
+public interface ITaBuildingPanoramaService extends IService<TaBuildingPanorama> {
+
+}

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

@@ -133,7 +133,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * 微信小程序 楼盘列表
      * @return
      */
-    ResponseBean getWxMainBuildingList();
+    ResponseBean getWxMainBuildingList(String cityId, Integer orgId);
 
     ResponseBean getWxBuildingById(String buildingId);
 

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+
+/**
+ * <p>
+ * 渠道小程序关系表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+public interface ITaChannelAppRelationService extends IService<TaChannelAppRelation> {
+
+}

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

@@ -13,5 +13,7 @@ import com.huiju.estateagents.entity.TaMiniapp;
  */
 public interface ITaMiniappService extends IService<TaMiniapp> {
 
-    TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp) throws Exception;
+    TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp, Integer channelId) throws Exception;
+
+    TaMiniapp getInfoWithTpls(String appid);
 }

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

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonFromRecord;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
+
+/**
+ * <p>
+ * 新增用户来源表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-03
+ */
+public interface ITaPersonFromRecordService extends IService<TaPersonFromRecord> {
+
+    void addNewPersonRecordRecord(TaPersonVisitRecord taPersonVisitRecord);
+
+    /**
+     * 定时任务批量保存数据
+     */
+    void personFromStatistic();
+}

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

@@ -57,7 +57,7 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     List<TaPerson> getPersonsByOpenId(String openid);
 
-    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId);
+    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId, String sceneType);
 
     String getPersonIdByCustomerId(String customerId);
 

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

@@ -60,7 +60,7 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 
 	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, String eventType, String shareName, String shareTel, String buildingId, String personType, List<TaPersonBuilding> taPersonBuildingList);
 
-	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId);
+	IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, String personId);
 
-	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType);
+	Integer countShareNumByEventType(Integer orgId, String targetId, Integer userId, String personId, String eventType);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
@@ -9,8 +10,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import io.swagger.models.auth.In;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -35,7 +36,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 
-    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType);
 
     IPage<TaRecommendCustomer> getRecCustomerList(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);
 
@@ -44,9 +45,9 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
 
-    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
 
-    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
 
     TaRecommendCustomer getCustomerById(String customerId);
 
@@ -54,6 +55,8 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer newByPerson(TaPerson person);
 
+    ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId);
+
     /**
      * 导出数据(推荐客户)
      * @param orgId

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaSharePersonFrom;
 
 /**
@@ -13,4 +14,14 @@ import com.huiju.estateagents.entity.TaSharePersonFrom;
  */
 public interface ITaSharePersonFromService extends IService<TaSharePersonFrom> {
 
+    /**
+     * 添加客户分享记录
+     * @param personId
+     * @param orgId
+     * @param from
+     * @param recommender
+     * @param targetId
+     * @return
+     */
+    TaSharePersonFrom addSharePersonRecord(String personId, Integer orgId, String from, String recommender, String targetId);
 }

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

@@ -18,12 +18,12 @@ public interface ITdCityService extends IService<TdCity> {
     List<TdCity> selectCity(String leveltype,String status);
 
     // 微信端城市
-    List<TdCity> selectWxCity(String leveltype,Integer orgId);
+    List<TdCity> selectWxCity(String leveltype, Integer orgId);
 	
 	/**
 	 * 根据经纬度获取城市详情信息
 	 * @param location
 	 * @return
 	 */
-	TdCity getLocationCity(String location);
+	TdCity getLocationCity(String location, Integer orgId);
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdWxDict;
+
+/**
+ * <p>
+ * 微信字典表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+public interface ITdWxDictService extends IService<TdWxDict> {
+
+}

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

@@ -76,7 +76,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
         // 开屏
         QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
         // banner 或 screen(首屏广告) ,这里是 screen
-        extendContentQuery.eq("show_type",showType);
+        extendContentQuery.eq(StringUtils.isNotBlank(showType), "show_type",showType);
         extendContentQuery.eq(StringUtils.isNotBlank(showPosition), "show_position",showPosition);
         extendContentQuery.eq(StringUtils.isNotBlank(targetId), "target_id",targetId);
         extendContentQuery.eq(StringUtils.isNotBlank(contentId), "content_id",contentId);

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

@@ -1,20 +1,29 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.entity.TdWxDict;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.mapper.TsPersonFromStatisticMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 数据统计
@@ -42,6 +51,12 @@ public class StatisticalServiceImpl implements IStatisticalService {
     @Autowired
     private TaPersonIntentionRecordMapper taPersonIntentionRecordMapper;
 
+    @Autowired
+    private TsPersonFromStatisticMapper tsPersonFromStatisticMapper;
+
+    @Autowired
+    private TdWxDictMapper tdWxDictMapper;
+
 
     @Override
     public ResponseBean indexStatistical(Integer orgId) {
@@ -198,13 +213,14 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectUserResource(Integer orgId, LocalDate startDate, LocalDate endDate) {
         ResponseBean responseBean = new ResponseBean();
         // 用户来源 柱状
-        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(orgId, CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+//        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(orgId, CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
 
         // 用户来源饼状
-        // 来源置业顾问, 来源全民经纪人，自由进入
-        Integer person_realty_consultant = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_estate_agent = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_ESTATE_AGENT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_null = taPersonMapper.selectUserSourcePie(orgId, null, CommConstant.PERSON_REALTY_CONSULTANT);
+        // 来源置业顾问, 来源客户，其他
+        Integer total = taPersonMapper.selectFromNum(orgId, null) ;
+        Integer person_realty_consultant = taPersonMapper.selectFromNum(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_estate_agent = taPersonMapper.selectFromNum(orgId, CommConstant.PERSON_ESTATE_CUSTOMER);
+        Integer person_null = total - person_realty_consultant - person_estate_agent;
         Map<String, Object> map = new HashMap<>();
         map.put("person_realty_consultant", person_realty_consultant);
         map.put("person_estate_agent", person_estate_agent);
@@ -214,7 +230,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(orgId, CommConstant.PERSON_ESTATE_AGENT, startDate, endDate);
 
         Map<String, Object> result = new HashMap<>();
-        result.put("columnar", mapList);
+        result.put("columnar", new ArrayList<Map<String,Object>>());
         result.put("pie", map);
         result.put("data", selectUserSourceData);
 
@@ -302,4 +318,86 @@ public class StatisticalServiceImpl implements IStatisticalService {
         responseBean.addSuccess(page);
         return responseBean;
     }
+
+    /**
+     * 用户来源数据 首页
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @Override
+    public ResponseBean selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate) {
+        ResponseBean responseBean = new ResponseBean();
+//        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFrom(orgId,startDate,endDate);
+        QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
+        tdWxDictQueryWrapper.groupBy("scene_type");
+        List<TdWxDict> tdWxDicts = tdWxDictMapper.selectList(tdWxDictQueryWrapper);
+//        tdWxDicts.forEach(e -> {
+//            int fromSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getFromNum).sum();
+//            int registerSum = list.stream().filter(l -> e.getSceneType().equals(l.getSceneType())).mapToInt(TsPersonFromStatistic::getRegisteredNum).sum();
+//            e.setFromData(fromSum);
+//            e.setRegisterSum(registerSum);
+//        });
+        Map<String,Object> map = new HashMap<>();
+        map.put("tdWxDicts",tdWxDicts);
+//        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectPersonFromGroupByData(orgId,startDate,endDate);
+//        map.put("list",tableList);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 用户来源数据统计折线图
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @Override
+    public ResponseBean selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate) {
+        List<TsPersonFromStatistic> dayList = getDayList(startDate, endDate);
+        List<TsPersonFromStatistic> list = tsPersonFromStatisticMapper.selectPersonFromGroupByDay(orgId,startDate,endDate);
+        dayList.forEach(e -> {
+            list.forEach(l -> {
+                if (e.getCreateTime().equals(l.getCreateTime())){
+                    e.setFromNum(l.getFromNum());
+                    e.setRegisteredNum(l.getRegisteredNum());
+                }
+            });
+        });
+        return ResponseBean.success(dayList);
+    }
+
+    /**
+     * 返回时间区间格式
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    private List<TsPersonFromStatistic> getDayList(LocalDate startDate, LocalDate endDate) {
+        if (null == startDate || null == endDate){
+            endDate = LocalDate.now();
+            startDate = LocalDate.now().plusDays(-7);
+        }
+
+        //获取时间区间
+        List<LocalDate> dates = Stream.iterate(startDate, date -> date.plusDays(1))
+                .limit(ChronoUnit.DAYS.between(startDate, endDate))
+                .collect(Collectors.toList());
+
+        //格式化时间
+        List<TsPersonFromStatistic> dataList = new ArrayList<>();
+        DateTimeFormatter dtf3 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        dates.forEach(e -> {
+            TsPersonFromStatistic tsPersonFromStatistic = new TsPersonFromStatistic();
+            tsPersonFromStatistic.setRegisteredNum(0);
+            tsPersonFromStatistic.setFromNum(0);
+            tsPersonFromStatistic.setCreateTime(dtf3.format(e));
+            dataList.add(tsPersonFromStatistic);
+        });
+        return dataList;
+    }
 }

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

@@ -79,7 +79,7 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
             taBuildingIntention.setEventId(e.getEventId());
             taBuildingIntention.setEventCode(e.getEventCode());
             taBuildingIntention.setEventName(e.getEventName());
-            taBuildingIntention.setIntention(1);
+            taBuildingIntention.setIntention(e.getPoints());
             taBuildingIntention.setCreateDate(LocalDateTime.now());
             taBuildingIntention.setBuildingId(buildingId);
             taBuildingIntention.setStatus(1);

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
+import com.huiju.estateagents.mapper.TaBuildingPanoramaMapper;
+import com.huiju.estateagents.service.ITaBuildingPanoramaService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *   服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-30
+ */
+@Service
+public class TaBuildingPanoramaServiceImpl extends ServiceImpl<TaBuildingPanoramaMapper, TaBuildingPanorama> implements ITaBuildingPanoramaService {
+
+}

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

@@ -102,6 +102,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     public ITaBuildingIntentionService iTaBuildingIntentionService;
 
+    @Autowired
+    private ITaBuildingPanoramaService taBuildingPanoramaService;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -292,6 +295,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingMapRelation> mapRelationList = iTaBuildingMapRelationService.list(mapRelationQueryWrapper);
         building.setMapJson(mapRelationList.size() > 0 ? JSONObject.toJSONString(mapRelationList) : null);
 
+        //查询关联的全景图列表
+        QueryWrapper<TaBuildingPanorama> panoramaQueryWrapper = new QueryWrapper<>();
+        panoramaQueryWrapper.eq("building_id", building.getBuildingId());
+        panoramaQueryWrapper.eq("org_id", building.getOrgId());
+        panoramaQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        panoramaQueryWrapper.orderByDesc("create_date");
+        List<TaBuildingPanorama> panoramaList = taBuildingPanoramaService.list(panoramaQueryWrapper);
+        building.setPanoramaList(panoramaList);
+
         return ResponseBean.success(building);
     }
 
@@ -304,7 +316,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
         if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
             return responseBean;
         }
 
@@ -458,9 +470,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        if(null!= object.getDate("openingDate")){
-            building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "add");
+        if (!isMainMoreThanTenFlag){
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
+            return responseBean;
         }
+
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(2);
         building.setOrgId(orgId);
@@ -556,7 +571,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(taBuildingMapper.selectOne(buildingIdQueryWrapper), orgId, status, "updateStatus");
         if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            responseBean.addError("当前城市最多只能推荐10个项目至首页哦");
             return responseBean;
         }
 
@@ -764,18 +779,60 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getWxMainBuildingList() {
-        QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
-        buildingQueryWrapper.eq("status", 1);
-        buildingQueryWrapper.eq("is_main", 1);
-        buildingQueryWrapper.orderByAsc("order_no");
-        List<TaBuilding> buildingList = taBuildingMapper.selectList(buildingQueryWrapper);
+    public ResponseBean getWxMainBuildingList(String cityId, Integer orgId) {
+        List<TaBuilding> buildingList = taBuildingMapper.selectMainBuildings(cityId, orgId);
+        if (null == buildingList) {
+            return ResponseBean.success(new ArrayList<>());
+        }
 
-        for (TaBuilding build:buildingList) {
-            getBuildingAttaches(build);
+        for (TaBuilding building : buildingList) {
+            String buildingId = building.getBuildingId();
+
+            // 列表封面
+            if (!StringUtils.isEmpty(building.getListPoster())) {
+                List<TaBuildingImg> listImage = new ArrayList<>();
+                TaBuildingImg img = new TaBuildingImg();
+                img.setImgType(CommConstant.BUILDING_IMG_LIST);
+                img.setBuildingId(buildingId);
+                img.setUrl(building.getListPoster());
+                listImage.add(img);
+                building.setBuildingListImg(listImage);
+            }
+
+            // tags
+            if (!StringUtils.isEmpty(building.getTags())) {
+                List<TaBuildingTag> tags = new ArrayList<>();
+                String[] tagsArray =  building.getTags().split(",");
+                if (null != tagsArray) {
+                    for(String tagName: tagsArray) {
+                        TaBuildingTag tag = new TaBuildingTag();
+                        tag.setBuildingId(buildingId);
+                        tag.setTagName(tagName);
+                        tags.add(tag);
+                    }
+                }
+                building.setBuildingTag(tags);
+            }
+
+            // Uv
+            IPage<TaUv> pageUv = new Page<>(1, 10);
+            QueryWrapper<TaUv> query3 = new QueryWrapper<>();
+            query3.eq("be_uv", buildingId);
+            query3.eq("tagert_type", CommConstant.FAVOR_PROJECT);
+            query3.orderByDesc("create_date");
+            IPage<TaUv> uvs = taUvMapper.selectPage(pageUv, query3);
+            building.setUvList(uvs);
+
+            // share num
+            IPage<TaShare> pageSN = new Page<>(1, 10);
+            pageSN.setTotal(null == building.getShareNum() ? 0l : building.getShareNum());
+            building.setShareList(pageSN);
         }
 
-        return ResponseBean.success(buildingList);
+        IPage<TaBuilding> page = new Page<>(1, 10);
+        page.setTotal(buildingList.size());
+        page.setRecords(buildingList);
+        return ResponseBean.success(page);
     }
 
     @Override
@@ -902,9 +959,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         queryWrapper.eq("building_id", taBuilding.getBuildingId());
         queryWrapper.eq("org_id", orgId);
         TaBuilding info = taBuildingMapper.selectOne(queryWrapper);
-        if (operte.equals("update") && (taBuilding.getIsMain() != 1 || info.getStatus() == 2)){
+        if (taBuilding.getIsMain() != 1){
             return true;
         }
+//        if (operte.equals("update") && (info.getStatus() == 2)){
+//            return true;
+//        }
         if (operte.equals("updateStatus") && status == 2){
             return true;
         }

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
+import com.huiju.estateagents.service.ITaChannelAppRelationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 渠道小程序关系表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Service
+public class TaChannelAppRelationServiceImpl extends ServiceImpl<TaChannelAppRelationMapper, TaChannelAppRelation> implements ITaChannelAppRelationService {
+
+}

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

@@ -3,10 +3,14 @@ package com.huiju.estateagents.service.impl;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.channel.sysChannel.entity.TaChannelProxy;
+import com.huiju.estateagents.channel.sysChannel.mapper.TaChannelProxyMapper;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.entity.TaChannelAppRelation;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
+import com.huiju.estateagents.mapper.TaChannelAppRelationMapper;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.service.ITaMiniappService;
@@ -14,6 +18,8 @@ import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 小程序表  服务实现类
@@ -24,14 +30,23 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp> implements ITaMiniappService {
+    @Autowired
+    TaMiniappMapper taMiniappMapper;
+
     @Autowired
     TaMiniappTemplateMapper taMiniappTemplateMapper;
 
     @Autowired
     WxUtils wxUtils;
 
+    @Autowired
+    private TaChannelAppRelationMapper taChannelAppRelationMapper;
+
+    @Autowired
+    private TaChannelProxyMapper taChannelProxyMapper;
+
     @Override
-    public TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp) throws Exception {
+    public TaMiniapp saveInfoWithTpls(TaMiniapp taMiniapp, Integer channelId) throws Exception {
         if (StringUtils.isEmpty(taMiniapp.getMiniappId())) {
             throw new Exception("请填写小程序 AppID");
         }
@@ -76,4 +91,16 @@ public class TaMiniappServiceImpl extends ServiceImpl<TaMiniappMapper, TaMiniapp
 
         return taMiniapp;
     }
+
+    @Override
+    public TaMiniapp getInfoWithTpls(String appid) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(appid);
+
+        QueryWrapper<TaMiniappTemplate> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("miniapp_id", appid);
+        queryWrapper.eq("is_subscribe", 1);
+        taMiniapp.setTpls(taMiniappTemplateMapper.selectList(queryWrapper));
+
+        return taMiniapp;
+    }
 }

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

@@ -0,0 +1,80 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaPersonFromRecord;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
+import com.huiju.estateagents.entity.TdWxDict;
+import com.huiju.estateagents.mapper.TaPersonFromRecordMapper;
+import com.huiju.estateagents.mapper.TdWxDictMapper;
+import com.huiju.estateagents.service.ITaPersonFromRecordService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.mapper.TsPersonFromStatisticMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 新增用户来源表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-03
+ */
+@Service
+public class TaPersonFromRecordServiceImpl extends ServiceImpl<TaPersonFromRecordMapper, TaPersonFromRecord> implements ITaPersonFromRecordService {
+
+    @Autowired
+    private TaPersonFromRecordMapper taPersonFromRecordMapper;
+
+    @Autowired
+    private TsPersonFromStatisticMapper tsPersonFromStatisticMapper;
+
+    @Autowired
+    private TdWxDictMapper tdWxDictMapper;
+
+    /**
+     * 通過買點表清洗數據
+     * @param taPersonVisitRecord
+     */
+    @Override
+    public void addNewPersonRecordRecord(TaPersonVisitRecord taPersonVisitRecord) {
+        TaPersonFromRecord taPersonFromRecord = new TaPersonFromRecord();
+        taPersonFromRecord.setCreateDate(LocalDateTime.now());
+        taPersonFromRecord.setActivity(taPersonVisitRecord.getActivity());
+        taPersonFromRecord.setOrgId(Integer.valueOf(taPersonVisitRecord.getOrgId()));
+        taPersonFromRecord.setPersonId(taPersonVisitRecord.getPersonId());
+        taPersonFromRecord.setBuildingId(taPersonVisitRecord.getBuildingId());
+        taPersonFromRecord.setEvent(taPersonVisitRecord.getEvent());
+        taPersonFromRecord.setEventType(taPersonVisitRecord.getEventType());
+        taPersonFromRecord.setSceneId(taPersonVisitRecord.getSceneId());
+        TdWxDict tdWxDict = tdWxDictMapper.selectById(taPersonVisitRecord.getSceneId());
+        taPersonFromRecord.setSceneType(null == tdWxDict ? "" : tdWxDict.getSceneType());
+        taPersonFromRecord.setSharePersonId(taPersonVisitRecord.getSharePersonId());
+        taPersonFromRecord.setTargetId(taPersonVisitRecord.getTargetId());
+        QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id",taPersonVisitRecord.getOrgId());
+        queryWrapper.eq("person_id",taPersonVisitRecord.getPersonId());
+        int count = taPersonFromRecordMapper.selectCount(queryWrapper);
+        if(count > 0){
+            return;
+        }else {
+            taPersonFromRecord.setIsFirstTime(true);
+        }
+        taPersonFromRecordMapper.insert(taPersonFromRecord);
+    }
+
+    /**
+     * 定时任务批量保存数据
+     */
+    @Override
+    public void personFromStatistic() {
+        List<TsPersonFromStatistic> list =  taPersonFromRecordMapper.getNowDataList();
+        tsPersonFromStatisticMapper.deleteByData();
+        tsPersonFromStatisticMapper.insertStatisticList(list);
+    }
+}

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

@@ -394,6 +394,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         Integer saved = taSaveMapper.selectCount(saveQueryWrapper);
         result.put("saved",saved);
         result.put("personType",taPerson.getPersonType());
+        result.put("userId", taPerson.getUserId());
 
         return ResponseBean.success(result);
     }
@@ -737,7 +738,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     }
 
     @Override
-    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId){
+    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building, Integer orgId,String sceneType){
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
         if(building.equals("") && null != building){
@@ -746,7 +747,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.orderByDesc("create_date");
         IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
-        return taPersonMapper.selectPage(page,queryWrapper);
+        return taPersonMapper.selectDriftCustomerPageList(page,building,orgId,CommConstant.PERSON_ESTATE_DRIFT,sceneType);
     }
 
     @Override

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

@@ -132,29 +132,31 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				e.setUserTel(personInfo.getPhone());
 			}
 
-			TaPerson userShareInfo = taPersonMapper.selectById(e.getSharePersonId());
+			QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("user_id", e.getSharePersonId()).or().eq("person_id", e.getSharePersonId());
+			TaPerson userShareInfo = taPersonMapper.selectOne(queryWrapper);
 			if (userShareInfo != null) {
 				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());
 			}
 
-			if (CommConstant.EVENT_H5.equals(e.getEventType())) {
+			if (CommConstant.H5_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getDrainageName());
 				continue;
 			}
-			if (CommConstant.POSTER_CONTENT_TYPE_BUILDING.equals(e.getEventType())) {
+			if (CommConstant.BUILDING_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getBuildingName());
 				continue;
 			}
-			if (CommConstant.POSTER_CONTENT_TYPE_NEWS.equals(e.getEventType())) {
+			if (CommConstant.NEWS_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getNewsName());
 				continue;
 			}
-			if (CommConstant.POINTS_CHANGE_HELP.equals(e.getEventType())) {
+			if (CommConstant.HELP_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getHelpActivityName());
 				continue;
 			}
-			if (CommConstant.POINTS_CHANGE_GROUP.equals(e.getEventType())) {
+			if (CommConstant.GROUP_SHARE.equals(e.getEventType())) {
 				e.setActivityName(e.getGroupActivityName());
 				continue;
 			}
@@ -164,14 +166,14 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	}
 
 	@Override
-	public IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId) {
-		IPage<TaConsultantInfo> result = personVisitRecordMapper.getConsultantShareInfoList(pg,userId,orgId);
+	public IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, String personId) {
+		IPage<TaConsultantInfo> result = personVisitRecordMapper.getConsultantShareInfoList(pg,personId);
 		return result;
 	}
 
 	@Override
-	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType) {
-		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
+	public Integer countShareNumByEventType(Integer orgId, String targetId, Integer userId, String personId, String eventType) {
+		return personVisitRecordMapper.countShareNumByEventType(orgId, targetId, userId, personId, eventType);
 	}
 
 	/**
@@ -197,8 +199,8 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 			QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper();
 			queryWrapper.eq("realty_consultant",e.getConsultantId());
 			queryWrapper.eq("person_id",e.getPersonId());
-			TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectOne(queryWrapper);
-			if (null != taRecommendCustomer){
+			List<TaRecommendCustomer> taRecommendCustomer = taRecommendCustomerMapper.selectList(queryWrapper);
+			if (taRecommendCustomer.size() > 0){
 				//1是我的客户
 				e.setMyCustomer(CommConstant.STATUS_NORMAL);
 			}
@@ -223,7 +225,7 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		taPersonQueryWrapper.eq("org_id",orgId);
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
 		//获取我的访问客户列表
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), eventType);
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxActivityVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), (CommConstant.FAVOR_PROJECT.equals(eventType) ? "building" : CommConstant.FAVOR_ACTIVITY.equals(eventType) ? "dynamic" : eventType)  + "_share");
 		List<TaPersonVisitRecord> records = result.getRecords();
 		//判断是否我的客户状态
 		records.forEach(e -> {

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

@@ -88,9 +88,15 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaUserMapper taUserMapper;
 
+    @Autowired
+    private TaPersonFromRecordMapper taPersonFromRecordMapper;
+
     @Autowired
     private TdPersonFromMapper tdPersonFromMapper;
 
+    @Autowired
+    private TdWxDictMapper tdWxDictMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -480,55 +486,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
+    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
-
-            /**
-             * <if test="buildingId != null">
-             *             ,(select tpp.name from ta_share_person_from tspf left join ta_person tpp on  tspf.share_person = tpp.person_id where tspf.building_id = #{buildingId} and tspf.is_first_time = 1) as sharePersonName
-             *         </if>
-             */
-
-            /**
-             * SELECT
-             *         b.*
-             *         FROM
-             *         ta_person b
-             *         <where>
-             *             b.status > 0
-             *             AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
-             *             <if test="name != null and name !=''">
-             *                 and b.nickname like CONCAT('%',#{name}, '%')
-             *             </if>
-             *             <if test="tel != null and tel!=''">
-             *                 and b.phone like CONCAT('%',#{tel}, '%')
-             *             </if>
-             *             <if test="entryType != null and entryType !=''">
-             *                 and b.entry_type = #{entryType}
-             *             </if>
-             *             <if test="sex != null and sex !=''">
-             *                 and b.sex = #{sex}
-             *             </if>
-             *             <if test="orgId != null">
-             *                 and b.org_id = #{orgId}
-             *             </if>
-             *             <if test="consultTel != null and consultTel !=''">
-             *                 and b.tel like CONCAT('%',#{consultTel}, '%')
-             *             </if>
-             *             and NOT EXISTS ( select * from ta_recommend_customer a where a.recommend_person = b.person_id)
-             *         </where>
-             *         order by b.create_date desc
-             */
-
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList,sceneType);
         }
 
     }
@@ -559,13 +527,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
+    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
         TaPerson person = taPersonMapper.selectById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题
@@ -609,16 +577,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
-            Map<String,String>geoInfo = new HashMap<>();
-            geoInfo.put("provience",person.getProvince());
-            geoInfo.put("country",person.getCountry());
-            TdCity city = cityMapper.selectById(person.getCity());
-            if(null!=city){
-                geoInfo.put("city",city.getName());
-            }else {
-                geoInfo.put("city","未知");
-            }
-            taRecommendCustomer.setGeoInfo(geoInfo);
         }
         if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
@@ -638,22 +596,40 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
         //构造来源类型
         taRecommendCustomer.setPersonFrom("");
-        if (null != person && null != person.getFromCode()){
-            QueryWrapper<TdPersonFrom> tdPersonFromQueryWrapper = new QueryWrapper<>();
-            tdPersonFromQueryWrapper.eq("from_code",person.getFromCode());
-            TdPersonFrom tdPersonFrom = tdPersonFromMapper.selectOne(tdPersonFromQueryWrapper);
-            taRecommendCustomer.setPersonFrom(null != tdPersonFrom ? tdPersonFrom.getFromName() : "");
+        if (null != person){
+            Map<String,String>geoInfo = new HashMap<>();
+            geoInfo.put("provience",person.getProvince());
+            geoInfo.put("country",person.getCountry());
+            TdCity city = cityMapper.selectById(person.getCity());
+            if(null!=city){
+                geoInfo.put("city",city.getName());
+            }else {
+                geoInfo.put("city","未知");
+            }
+            taRecommendCustomer.setGeoInfo(geoInfo);
+
+            QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",person.getOrgId());
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.eq("is_first_time",1);
+            List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
+            if (taPersonFromRecords.size() > 0){
+                QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
+                tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
+                taRecommendCustomer.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
+            }
         }
 
         return taRecommendCustomer;
     }
 
     @Override
-    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
-        TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
+    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
+        TaPerson taPerson = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题
@@ -694,26 +670,33 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 }
             });
             taPersonVisitRecordIPage.setRecords(records);
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
-            taRecommendCustomer.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
-            taRecommendCustomer.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
-            TdCity city = cityMapper.selectById(taRecommendCustomer.getCity());
+            taPerson.setVisitRecords(taPersonVisitRecordIPage);
+            taPerson.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
+            taPerson.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
+            taPerson.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
+            taPerson.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
+            TdCity city = cityMapper.selectById(taPerson.getCity());
             if(null != city){
-                taRecommendCustomer.setCity(city.getName());
+                taPerson.setCity(city.getName());
             }
 
             //构造来源类型
-            taRecommendCustomer.setPersonFrom("");
-            if (null != taRecommendCustomer.getFromCode()){
-                QueryWrapper<TdPersonFrom> tdPersonFromQueryWrapper = new QueryWrapper<>();
-                tdPersonFromQueryWrapper.eq("from_code",taRecommendCustomer.getFromCode());
-                TdPersonFrom tdPersonFrom = tdPersonFromMapper.selectOne(tdPersonFromQueryWrapper);
-                taRecommendCustomer.setPersonFrom(null != tdPersonFrom ? tdPersonFrom.getFromName() : "");
+            taPerson.setPersonFrom("");
+            if (null != taPerson){
+                QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id",taPerson.getOrgId());
+                queryWrapper.eq("person_id",taPerson.getPersonId());
+                queryWrapper.eq("is_first_time",1);
+                List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
+                if (taPersonFromRecords.size() > 0){
+                    QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
+                    tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                    TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
+                    taPerson.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
+                }
             }
         }
-        return taRecommendCustomer;
+        return taPerson;
     }
 
     @Override
@@ -767,6 +750,53 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
     }
 
+    @Override
+    public ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId) {
+        TaPerson taPerson = taPersonMapper.getById(personId);
+
+        TaPerson recommendPerson = taPersonMapper.selectById(personId);
+
+        QueryWrapper<TaUser> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("user_id", taUser.getUserId());
+        TaUser userInfo = taUserMapper.selectOne(queryWrapper);
+
+        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper();
+        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
+        TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(taPersonBuildingQueryWrapper);
+
+        if (null == userInfo || userInfo.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+        taRecommendCustomer.setOrgId(orgId);
+        taRecommendCustomer.setName(taPerson.getNickname());
+        taRecommendCustomer.setPicture(taPerson.getAvatarurl());
+        taRecommendCustomer.setPhone(taPerson.getPhone());
+        taRecommendCustomer.setSex(null == taPerson.getGender() ? null : ("1".equals(taPerson.getGender()) ? 1 : 2));
+        taRecommendCustomer.setRealtyConsultant(userInfo.getUserId().toString());
+        taRecommendCustomer.setBuildingId(taPersonBuilding.getBuildingId());
+        TaBuilding building = taBuildingMapper.selectById(taPersonBuilding.getBuildingId());
+        taRecommendCustomer.setIntention(building.getBuildingName());
+        taRecommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
+        taRecommendCustomer.setCreateDate(LocalDateTime.now());
+        taRecommendCustomer.setReportDate(LocalDateTime.now());
+        taRecommendCustomer.setPersonId(taPerson.getPersonId());
+        taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
+        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+        taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
+        taRecommendCustomer.setPersonId(personId);
+        taRecommendCustomer.setRecommendPerson(recommendPerson == null ? "" : recommendPerson.getRecommendPerson());
+
+        int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
+        if (row < 1) {
+            return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success(taRecommendCustomer);
+
+    }
+
     private List<TaRecommendCustomer> getCustomerByPhone(String phone) {
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", phone);

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

@@ -1,11 +1,17 @@
 package com.huiju.estateagents.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.TaSharePersonFrom;
-import com.huiju.estateagents.mapper.TaSharePersonFromMapper;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.ITaSharePersonFromService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *   服务实现类
@@ -17,4 +23,80 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaSharePersonFromServiceImpl extends ServiceImpl<TaSharePersonFromMapper, TaSharePersonFrom> implements ITaSharePersonFromService {
 
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
+    @Autowired
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
+
+    @Autowired
+    private TaPersonBuildingMapper taPersonBuildingMapper;
+
+    @Autowired
+    private TaNewsMapper taNewsMapper;
+
+    @Autowired
+    private TaSharePersonFromMapper taSharePersonFromMapper;
+    /**
+     * 添加客户分享记录
+     *
+     * @param personId
+     * @param orgId
+     * @param from
+     * @param recommender
+     * @param targetId
+     * @return
+     */
+    @Override
+    public TaSharePersonFrom addSharePersonRecord(String personId, Integer orgId, String from, String recommender, String targetId) {
+        TaPerson taPerson = taPersonMapper.getById(personId);
+        TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
+        TaPerson recommenderPerson = taPersonMapper.getById(recommender);
+        taSharePersonFrom.setCreateDate(LocalDateTime.now());
+        taSharePersonFrom.setOrgId(orgId);
+        taSharePersonFrom.setPersonId(taPerson.getPersonId());
+        taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
+        taSharePersonFrom.setTargetId(targetId);
+        taSharePersonFrom.setTargetType(from);
+        if(CommConstant.PERSON_REALTY_CONSULTANT.equals(recommenderPerson.getPersonType())){
+            taSharePersonFrom.setSharePerson(recommenderPerson.getUserId().toString());
+        }else {
+            taSharePersonFrom.setSharePerson(recommenderPerson.getPersonId());
+        }
+        QueryWrapper<TaSharePersonFrom> sharePersonFromQueryWrapper = new QueryWrapper<>();
+        sharePersonFromQueryWrapper.eq("person_id",taPerson.getPersonId());
+        if(from.equals("dynamic_share")){ // activity_share
+            taSharePersonFrom.setStatus(CommConstant.STATUS_UNACCALIMED);
+            TaBuildingDynamic buildingDynamic = taBuildingDynamicMapper.selectById(targetId);
+            taSharePersonFrom.setBuildingId(buildingDynamic.getBuildingId());
+            sharePersonFromQueryWrapper.eq("building_id",buildingDynamic.getBuildingId());
+        }else {
+            taSharePersonFrom.setStatus(CommConstant.STATUS_NORMAL);
+        }
+        if (from.contains("card")){
+            // 因为targetId 是 personId ，需要查询出 userId
+            TaPerson person = taPersonMapper.getById(targetId);
+
+            QueryWrapper<TaPersonBuilding> personBuildingQueryWrapper = new QueryWrapper<>();
+            personBuildingQueryWrapper.eq("user_id",person.getUserId());
+            TaPersonBuilding personBuilding = taPersonBuildingMapper.selectOne(personBuildingQueryWrapper);
+            taSharePersonFrom.setBuildingId(personBuilding.getBuildingId());
+            sharePersonFromQueryWrapper.eq("building_id",personBuilding.getBuildingId());
+        }else if (from.contains("news")){
+            TaNews news = taNewsMapper.selectById(targetId);
+            taSharePersonFrom.setBuildingId(news.getBuildingId());
+            sharePersonFromQueryWrapper.eq("building_id",news.getBuildingId());
+        }else if (from.contains("building")){
+            taSharePersonFrom.setBuildingId(targetId);
+            sharePersonFromQueryWrapper.eq("building_id",targetId);
+        }
+        Integer isFirstTime = taSharePersonFromMapper.selectCount(sharePersonFromQueryWrapper);
+        if(isFirstTime>0){
+            taSharePersonFrom.setIsFirstTime(false);
+        }else {
+            taSharePersonFrom.setIsFirstTime(true);
+        }
+        taSharePersonFromMapper.insert(taSharePersonFrom);
+        return taSharePersonFrom;
+    }
 }

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

@@ -62,7 +62,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
             taBuildingDynamicQuery.eq("dynamic_id",id);
             TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQuery);
             taBuildingDynamicMapper.updateById( taBuildingDynamic.setShareNum(taBuildingDynamic.getShareNum() == null ? 1:taBuildingDynamic.getShareNum()+1));
-            return ResponseBean.success("成功");
+//            return ResponseBean.success("成功");
         }
 
         QueryWrapper<TaShare> queryWrapper = new QueryWrapper<>();
@@ -71,6 +71,10 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         queryWrapper.eq("tagert_type", typeOf);
         List<TaShare> uvs = taShareMapper.selectList(queryWrapper);
         if (null != uvs && uvs.size() > 0) {
+            //更新分享为最新时间
+            TaShare taShare = new TaShare();
+            taShare.setCreateDate(LocalDateTime.now());
+            taShareMapper.update(taShare, queryWrapper);
             return ResponseBean.success("");
         }
 

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

@@ -45,7 +45,11 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
      * @return
      */
     @Override
-    public TdCity getLocationCity(String location) {
+    public TdCity getLocationCity(String location, Integer orgId) {
+        if (null == location) {
+            return tdCityMapper.getOrgDefaultCity(orgId);
+        }
+
         //获取高德地图的坐标
         String amapString = CommConstant.AMAP_HTTP + "?location="+location+"&key=" + CommConstant.AMAP_KEY;
         RestTemplate restTemplate = new RestTemplate();
@@ -60,11 +64,19 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
             queryWrapper.eq("leveltype",2);
             List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
             if (tdCities.size() > 0){
-                return tdCities.get(0);
+                List<TdCity> cityList = selectWxCity(null, orgId);
+                Integer cityId = tdCities.get(0).getId();
+                for (TdCity tdCity : cityList){
+                    if (tdCity.getId().equals(cityId)){
+                        return tdCity;
+                    }
+                }
             }
-            return null;
+//            return null;
         }
-        return null;
+
+        // 没有匹配到则返回默认城市
+        return tdCityMapper.getOrgDefaultCity(orgId);
     }
     
 }

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TdWxDict;
+import com.huiju.estateagents.mapper.TdWxDictMapper;
+import com.huiju.estateagents.service.ITdWxDictService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 微信字典表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-06
+ */
+@Service
+public class TdWxDictServiceImpl extends ServiceImpl<TdWxDictMapper, TdWxDict> implements ITdWxDictService {
+
+}

src/main/java/com/huiju/estateagents/statistic/controller/TsPersonFromStatisticController.java

@@ -0,0 +1,143 @@
+package com.huiju.estateagents.statistic.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.service.ITsPersonFromStatisticService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 用户来源统计表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@RestController
+@RequestMapping("/")
+public class TsPersonFromStatisticController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TsPersonFromStatisticController.class);
+
+    @Autowired
+    public ITsPersonFromStatisticService iTsPersonFromStatisticService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tsPersonFromStatistic",method= RequestMethod.GET)
+    public ResponseBean tsPersonFromStatisticList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TsPersonFromStatistic> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsPersonFromStatistic> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TsPersonFromStatistic> result = iTsPersonFromStatisticService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tsPersonFromStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsPersonFromStatistic",method= RequestMethod.POST)
+    public ResponseBean tsPersonFromStatisticAdd(@RequestBody TsPersonFromStatistic tsPersonFromStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsPersonFromStatisticService.save(tsPersonFromStatistic)){
+                responseBean.addSuccess(tsPersonFromStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tsPersonFromStatistic/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tsPersonFromStatisticDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTsPersonFromStatisticService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tsPersonFromStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsPersonFromStatistic/{id}",method= RequestMethod.PUT)
+    public ResponseBean tsPersonFromStatisticUpdate(@PathVariable Integer id,
+                                        @RequestBody TsPersonFromStatistic tsPersonFromStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsPersonFromStatisticService.updateById(tsPersonFromStatistic)){
+                responseBean.addSuccess(tsPersonFromStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tsPersonFromStatistic/{id}",method= RequestMethod.GET)
+    public ResponseBean tsPersonFromStatisticGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTsPersonFromStatisticService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsPersonFromStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

src/main/java/com/huiju/estateagents/statistic/controller/TsUserBehaviorStatisticController.java

@@ -0,0 +1,160 @@
+package com.huiju.estateagents.statistic.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+
+/**
+ * <p>
+    * 用户行为统计表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@RestController
+@RequestMapping("/api")
+public class TsUserBehaviorStatisticController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TsUserBehaviorStatisticController.class);
+
+    @Autowired
+    public ITsUserBehaviorStatisticService iTsUserBehaviorStatisticService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic",method= RequestMethod.GET)
+    public ResponseBean tsUserBehaviorStatisticList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TsUserBehaviorStatistic> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsUserBehaviorStatistic> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TsUserBehaviorStatistic> result = iTsUserBehaviorStatisticService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param tsUserBehaviorStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic",method= RequestMethod.POST)
+    public ResponseBean tsUserBehaviorStatisticAdd(@RequestBody TsUserBehaviorStatistic tsUserBehaviorStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsUserBehaviorStatisticService.save(tsUserBehaviorStatistic)){
+                responseBean.addSuccess(tsUserBehaviorStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/tsUserBehaviorStatistic/{id}", method= RequestMethod.DELETE)
+    public ResponseBean tsUserBehaviorStatisticDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTsUserBehaviorStatisticService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param tsUserBehaviorStatistic 实体对象
+     * @return
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic/{id}",method= RequestMethod.PUT)
+    public ResponseBean tsUserBehaviorStatisticUpdate(@PathVariable Integer id,
+                                        @RequestBody TsUserBehaviorStatistic tsUserBehaviorStatistic){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTsUserBehaviorStatisticService.updateById(tsUserBehaviorStatistic)){
+                responseBean.addSuccess(tsUserBehaviorStatistic);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/tsUserBehaviorStatistic/{id}",method= RequestMethod.GET)
+    public ResponseBean tsUserBehaviorStatisticGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTsUserBehaviorStatisticService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("tsUserBehaviorStatisticDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 用户行为
+     * @return
+     */
+    @GetMapping(value = "/admin/tsUserBehavior")
+    public ResponseBean selectUserBehavior(
+                                           @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                           @RequestParam(value = "buildingId", required = false) String buildingId,
+                                           HttpServletRequest request) {
+        return iTsUserBehaviorStatisticService.selectUserBehavior(getOrgId(request), startDate, endDate, buildingId);
+    }
+}

src/main/java/com/huiju/estateagents/statistic/entity/TsPersonFromStatistic.java

@@ -0,0 +1,69 @@
+package com.huiju.estateagents.statistic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户来源统计表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TsPersonFromStatistic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "person_from_statistic_id", type = IdType.AUTO)
+    private Integer personFromStatisticId;
+
+    /**
+     * 场景类型
+     */
+    private String sceneType;
+
+    /**
+     * 事件类型
+     */
+    private String eventType;
+
+    /**
+     * 来源数量
+     */
+    private Integer fromNum;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 注册数量
+     */
+    private Integer registeredNum;
+
+    /**
+     * 时间
+     */
+    @TableField(exist = false)
+    private String createTime;
+}

src/main/java/com/huiju/estateagents/statistic/entity/TsUserBehaviorStatistic.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.statistic.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户行为统计表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TsUserBehaviorStatistic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户行为统计主键
+     */
+    @TableId(value = "behavior_id", type = IdType.AUTO)
+    private Integer behaviorId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 事件名称
+     */
+    private String eventName;
+
+    /**
+     * 事件类型
+     */
+    private String eventType;
+
+    /**
+     * 行为数量统计
+     */
+    private Integer behaviorNum;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/huiju/estateagents/statistic/mapper/TsPersonFromStatisticMapper.java

@@ -0,0 +1,30 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户来源统计表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Mapper
+public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStatistic> {
+
+    void insertStatisticList(List<TsPersonFromStatistic> list);
+
+    List<TsPersonFromStatistic> selectPersonFrom(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    List<TsPersonFromStatistic> selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    List<TsPersonFromStatistic> selectPersonFromGroupByData(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    void deleteByData();
+}

src/main/java/com/huiju/estateagents/statistic/mapper/TsUserBehaviorStatisticMapper.java

@@ -0,0 +1,28 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.po.PersonPO;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户行为统计表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@Mapper
+public interface TsUserBehaviorStatisticMapper extends BaseMapper<TsUserBehaviorStatistic> {
+
+    List<TsUserBehaviorStatistic> seleUserBehaviorList();
+
+    int deleteByDate();
+
+    List<PersonPO>  seleBehaviorListByDate(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId);
+}

src/main/java/com/huiju/estateagents/statistic/service/ITsPersonFromStatisticService.java

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+
+/**
+ * <p>
+ * 用户来源统计表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+public interface ITsPersonFromStatisticService extends IService<TsPersonFromStatistic> {
+
+}

src/main/java/com/huiju/estateagents/statistic/service/ITsUserBehaviorStatisticService.java

@@ -0,0 +1,30 @@
+package com.huiju.estateagents.statistic.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 用户行为统计表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+public interface ITsUserBehaviorStatisticService extends IService<TsUserBehaviorStatistic> {
+
+    void userBehaviorStatustic();
+
+    /**
+     * 按日期获取统计列表
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @return
+     */
+    ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId);
+}

src/main/java/com/huiju/estateagents/statistic/service/impl/TsPersonFromStatisticServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
+import com.huiju.estateagents.statistic.mapper.TsPersonFromStatisticMapper;
+import com.huiju.estateagents.statistic.service.ITsPersonFromStatisticService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户来源统计表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-04
+ */
+@Service
+public class TsPersonFromStatisticServiceImpl extends ServiceImpl<TsPersonFromStatisticMapper, TsPersonFromStatistic> implements ITsPersonFromStatisticService {
+
+}

src/main/java/com/huiju/estateagents/statistic/service/impl/TsUserBehaviorStatisticServiceImpl.java

@@ -0,0 +1,66 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdBizEvent;
+import com.huiju.estateagents.entity.TdBizEventType;
+import com.huiju.estateagents.mapper.TdBizEventTypeMapper;
+import com.huiju.estateagents.po.PersonPO;
+import com.huiju.estateagents.statistic.entity.TsUserBehaviorStatistic;
+import com.huiju.estateagents.statistic.mapper.TsUserBehaviorStatisticMapper;
+import com.huiju.estateagents.statistic.service.ITsUserBehaviorStatisticService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 用户行为统计表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-01-13
+ */
+@Service
+public class TsUserBehaviorStatisticServiceImpl extends ServiceImpl<TsUserBehaviorStatisticMapper, TsUserBehaviorStatistic> implements ITsUserBehaviorStatisticService {
+
+    @Autowired
+    private TsUserBehaviorStatisticMapper tsUserBehaviorStatisticMapper;
+
+    @Autowired
+    private TdBizEventTypeMapper tdBizEventTypeMapper;
+
+    @Override
+    public void userBehaviorStatustic() {
+        //查询当天信息
+        List<TsUserBehaviorStatistic> list = tsUserBehaviorStatisticMapper.seleUserBehaviorList();
+        //删除当天信息
+        tsUserBehaviorStatisticMapper.deleteByDate();
+        //批量插入信息
+        this.saveBatch(list);
+    }
+
+    /**
+     * 按日期获取统计列表
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @return
+     */
+    @Override
+    public ResponseBean selectUserBehavior(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId) {
+        ResponseBean responseBean = new ResponseBean();
+        List<PersonPO> tsUserBehaviorStatistics = tsUserBehaviorStatisticMapper.seleBehaviorListByDate(orgId, startDate, endDate, buildingId);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectUserBehavior", tsUserBehaviorStatistics);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+}

src/main/resources/application-test.yml → src/main/resources/application-blue.yml

@@ -4,9 +4,9 @@ spring:
   application:
     name: estateagents
   datasource:
-    username: estateagents
-    password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: LUfZGvh7j1^qA*2c
+    url: jdbc:mysql://123.57.65.31:3306/estateagents_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数
@@ -41,12 +41,12 @@ wx:
     id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
     keywords: 6
 ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
 
 # 手机短信服务
 sms:

src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: estateagents
     password: estateagents
-    url: jdbc:mysql://47.101.36.130:3306/estateagents?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数
@@ -41,12 +41,12 @@ wx:
       id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
       keywords: 6
 ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
 
 # 手机短信服务
 sms:

src/main/resources/application-green.yml

@@ -0,0 +1,74 @@
+server:
+  port: 9090
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: root
+    password: LUfZGvh7j1^qA*2c
+    url: jdbc:mysql://123.57.65.31:3306/estateagents_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 50MB
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/**/*.xml
+wx:
+  miniapp:
+    appid: wxd6f47a9bb3052175
+    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+  - name: notice
+    id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+    keywords: 4
+  - name: newCustomer
+    id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+    keywords: 4
+  - name: mainbiz
+    id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
+    keywords: 6
+ali:
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
+
+# 手机短信服务
+sms:
+  url: http://101.200.84.17:8081/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
+
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: 营销云
+
+  visitor:
+    code: "0501"

src/main/resources/application-gzysd.yml

@@ -118,12 +118,12 @@ wx:
 
       keywords: 6
 ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
 
 
 >>>>>>> ac499f2ddc4d4469098e59fff8bbe310779f7be3

src/main/resources/application-hj.yml

@@ -42,11 +42,11 @@ wx:
 
       keywords: 6
 ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
 
 

src/main/resources/application-jj.yml

@@ -42,11 +42,11 @@ wx:
 
       keywords: 6
 ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
 
 

src/main/resources/application-nj.yml

@@ -42,12 +42,12 @@ wx:
 
       keywords: 6
 ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
 
 # 手机短信服务
 sms:

src/main/resources/application-prod.yml → src/main/resources/application-prod-blue.yml

@@ -4,9 +4,9 @@ spring:
   application:
     name: estateagents
   datasource:
-    username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents3.5?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    username: root
+    password: HZjVK5O%zTdP0#8AhGcF@03!eZsGbqdO
+    url: jdbc:mysql://rm-2zez52se79qgg9649po.mysql.rds.aliyuncs.com:3306/estateagents?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数
@@ -40,12 +40,12 @@ wx:
       id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
       keywords: 6
 ali:
-  accessKeyId: LTAIkc75dpkJw8Lb
-  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
   oss:
     endpoint: oss-cn-shanghai.aliyuncs.com
-    bucketName: estateagents
-    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
 
 # 手机短信服务
 sms:

src/main/resources/application-prod-green.yml

@@ -0,0 +1,79 @@
+server:
+  port: 9567
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: root
+    password: HZjVK5O%zTdP0#8AhGcF@03!eZsGbqdO
+    url: jdbc:mysql://rm-2zez52se79qgg9649po.mysql.rds.aliyuncs.com:3306/estateagents?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 50MB
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/**/*.xml
+wx:
+  miniapp:
+    appid: wxd6f47a9bb3052175
+    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
+      keywords: 6
+ali:
+  accessKeyId: LTAI4FdMQNh1xUoiqqbKJ15J
+  accessKeySecret: F7vmuXBu8IrhouQYYhFMLRhIRivIzb
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: njcj
+    bucketURL: https://njcj.oss-cn-shanghai.aliyuncs.com
+
+# 手机短信服务
+sms:
+  # 先使用外网地址, 后期使用内网地址
+  url: http://101.200.84.17:8081/sms
+  method: POST
+  contentType: "application/json;charset=UTF-8"
+  template:
+    code:
+    tel:
+    params:
+
+  # 以下为各模板 code
+  # 验证码
+  captcha:
+    # 模板 code
+    code: "0301"
+    # 有效时间 秒
+    expire: 120
+    # 验证码长度
+    size: 4
+    # 短信签名
+    sign: AI智慧案场
+
+  visitor:
+    code: "0501"
+
+#日志配置
+logging:
+  config: classpath:log/logback-spring.xml
+  debug: true