Merge branch 'dev'

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.2.2</version>
+	<version>v3.5.5</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>com.github.binarywang</groupId>
 			<artifactId>weixin-java-miniapp</artifactId>
-			<version>3.3.0</version>
+			<version>3.6.0</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>
@@ -205,6 +205,7 @@
 					<include>application.yml</include>
 					<include>application-${profiles.active}.yml</include>
 					<include>mapper/**/*.xml</include>
+					<include>log/*.xml</include>
 				</includes>
 			</resource>
 		</resources>

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

@@ -1,8 +1,16 @@
 package com.huiju.estateagents.base;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.service.ITaPersonBuildingService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -10,7 +18,12 @@ import java.util.Map;
  * @date 2018-12-18
  */
 public class BaseController {
-	
+	@Autowired
+	private ITaUserService taUserService;
+
+	@Autowired
+	private ITaPersonBuildingService taPersonBuildingService;
+
 	/**
 	 * 获取orgId
 	 * @param request
@@ -59,4 +72,15 @@ public class BaseController {
 		
 		return null;
 	}
+
+	public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
+		TaUser taUser = taUserService.getById(getUserId(request));
+		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
+		List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+		if (null != taUser.getIsAdmin() && taUser.getIsAdmin()){
+			taPersonBuildingList = new ArrayList<>();
+		}
+		return taPersonBuildingList;
+	}
 }

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

@@ -367,19 +367,18 @@ public class TaUserController extends BaseController {
         try {
             //使用分页插件
             IPage pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-            taUserQueryWrapper.eq("org_id",getOrgId(request));
-            taUserQueryWrapper.like(!StringUtils.isEmpty(userName),"user_name",userName);
-            taUserQueryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
-            taUserQueryWrapper.eq(null != status,"status",status);
-//            taUserQueryWrapper.ne("status", 9);
+            TaUser taUser = new TaUser();
+            taUser.setOrgId(getOrgId(request));
+            taUser.setUserName(userName);
+            taUser.setPhone(phone);
+            taUser.setStatus(status);
             if(null != isConsultant && isConsultant == 1){
-                taUserQueryWrapper.eq("is_consultant",true);
+                taUser.setIsConsultant(true);
             }else if (null != isConsultant && isConsultant == 0){
-                taUserQueryWrapper.eq("is_consultant",false);
+                taUser.setIsConsultant(false);
             }
-//            taUserQueryWrapper.ne("IFNULL(is_admin,0)",CommConstant.STATUS_NORMAL);
-            IPage<TaUser> result = iTaUserService.page(pg,taUserQueryWrapper);
+
+            IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
             List<TaUser> taUserList = result.getRecords();
             taUserList.forEach(e -> {
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
@@ -427,9 +426,18 @@ public class TaUserController extends BaseController {
             taUser.setLoginPassword("");
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
             taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
-            TaPersonBuilding taPersonBuilding = taPersonBuildingService.getOne(taPersonBuildingQueryWrapper);
-            if (null != taPersonBuilding){
-                taUser.setBuildingId(taPersonBuilding.getBuildingId());
+            List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+            //非置业顾问可以授权多个项目
+            if (taPersonBuildingList.size() > 0){
+                if (taUser.getIsConsultant()){
+                    taUser.setBuildingId(taPersonBuildingList.get(0).getBuildingId());
+                }else {
+                    List<String> buildings = new ArrayList<>();
+                    taPersonBuildingList.forEach(e -> {
+                        buildings.add(e.getBuildingId());
+                    });
+                    taUser.setBuildingIds(buildings);
+                }
             }
             responseBean.addSuccess(taUser);
         }catch (Exception e){

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -198,4 +198,7 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private Integer miniStatus;
+
+    @TableField(exist = false)
+    private List<String> buildingIds = new ArrayList<String>();
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,4 +27,6 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
 	
 	List<TaUser> getUserList(@Param("phone") String phone,@Param("loginName") String loginName,@Param("orgId") Integer orgId);
+
+    IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.util.List;
 import java.util.Map;
@@ -51,4 +52,13 @@ public interface ITaUserService extends IService<TaUser> {
      * @return
      */
     ResponseBean departureUser(Integer userId, List<String> customerIdList, Integer consultantUserId);
+
+    /**
+     * 分页查询用户列表
+     * @param pg
+     * @param taUser
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

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

@@ -19,10 +19,7 @@ import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.service.ITaBuildingReportService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
-import com.huiju.estateagents.service.ITdReportService;
+import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -88,6 +85,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 	@Autowired
     private ITaRecommendCustomerService iTaRecommendCustomerService;
+
+	@Autowired
+	private ISysOrgParamsService iSysOrgParamsService;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -172,6 +172,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			throw new Exception("生成用户信息失败");
 		}
 
+		// 导入系统参数
+		iSysOrgParamsService.importParamsFromTemplate(taOrg.getOrgId());
+
 		return taUser;
 	}
 
@@ -200,6 +203,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
                        QueryWrapper<TaOrgCity> taOrgCityParent = new QueryWrapper<>();
                         taOrgCityParent.eq("city_id",tdCity.getParentid());
                         taOrgCityParent.eq("org_id",orgid);
+						taOrgCityParent.last("limit 1");
 						TaOrgCity taOrgParent = taOrgCityMapper.selectOne(taOrgCityParent);
 						// 如果为空，查询行政表
 						if (null == taOrgParent){
@@ -239,6 +243,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
 		wrapper.eq("org_id", taOrg.getOrgId());
+		wrapper.last("limit 1");
 
 		TaMiniapp taMiniapp = taMiniappMapper.selectOne(wrapper);
 		if (null != taMiniapp) {
@@ -364,11 +369,25 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		});
 		
 		//保存项目
-		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-		taPersonBuilding.setBuildingId(taUser.getBuildingId());
-		taPersonBuilding.setUserId(taUser.getUserId());
-		taPersonBuilding.setCreateDate(LocalDateTime.now());
-		taPersonBuildingMapper.insert(taPersonBuilding);
+		if (taUser.getIsConsultant()){
+			TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+			taPersonBuilding.setBuildingId(taUser.getBuildingId());
+			taPersonBuilding.setUserId(taUser.getUserId());
+			taPersonBuilding.setCreateDate(LocalDateTime.now());
+			taPersonBuildingMapper.insert(taPersonBuilding);
+		}else{
+			//非置业顾问可授权多个项目
+			List<String> buildingIdList = taUser.getBuildingIds();
+			LocalDateTime nowTime = LocalDateTime.now();
+			buildingIdList.forEach(e -> {
+				TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+				taPersonBuilding.setBuildingId(e);
+				taPersonBuilding.setUserId(taUser.getUserId());
+				taPersonBuilding.setCreateDate(nowTime);
+				taPersonBuildingMapper.insert(taPersonBuilding);
+			});
+		}
+
 		return taUser;
 	}
 	
@@ -424,11 +443,24 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
 		taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);
 		//保存项目
-		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-		taPersonBuilding.setBuildingId(taUser.getBuildingId());
-		taPersonBuilding.setUserId(taUser.getUserId());
-		taPersonBuilding.setCreateDate(LocalDateTime.now());
-		taPersonBuildingMapper.insert(taPersonBuilding);
+		if (taUser.getIsConsultant()){
+			TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+			taPersonBuilding.setBuildingId(taUser.getBuildingId());
+			taPersonBuilding.setUserId(taUser.getUserId());
+			taPersonBuilding.setCreateDate(LocalDateTime.now());
+			taPersonBuildingMapper.insert(taPersonBuilding);
+		}else {
+			//非置业顾问可授权多个项目
+			List<String> buildingIdList = taUser.getBuildingIds();
+			LocalDateTime nowTime = LocalDateTime.now();
+			buildingIdList.forEach(e -> {
+				TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+				taPersonBuilding.setBuildingId(e);
+				taPersonBuilding.setUserId(taUser.getUserId());
+				taPersonBuilding.setCreateDate(nowTime);
+				taPersonBuildingMapper.insert(taPersonBuilding);
+			});
+		}
 		
 		//更新person
 		TaPerson taPerson = new TaPerson();
@@ -512,6 +544,19 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		return ResponseBean.success("操作成功!");
 	}
 
+	/**
+	 * 分页查询用户列表
+	 *
+	 * @param pg
+	 * @param taUser
+	 * @param personBuildingList
+	 * @return
+	 */
+	@Override
+	public IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> personBuildingList) {
+		return taUserMapper.seleUserList(pg,taUser,personBuildingList);
+	}
+
 	private boolean updateUserStatus(TaUser user) {
 		UpdateWrapper<TaUser> updateWrapper = new UpdateWrapper<>();
 		updateWrapper.eq("user_id", user.getUserId());
@@ -519,6 +564,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
         QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
         taPersonQueryWrapper.eq("user_id", user.getUserId());
+		taPersonQueryWrapper.last("limit 1");
         TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
         // 可能存在没有绑定小程序端
         if (null != taPerson) {

src/main/java/com/huiju/estateagents/cleancode/CleanCode.java

@@ -0,0 +1,70 @@
+package com.huiju.estateagents.cleancode;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class CleanCode {
+
+    @Autowired
+    private ISysMenuService sysMenuService;
+
+    @Autowired
+    private ITaRoleService taRoleService;
+
+    @Autowired
+    private ITaRoleMenuService taRoleMenuService;
+
+    @Autowired
+    private ITaRoleButtonService taRoleButtonService;
+
+    @Autowired
+    private ISysButtonInMenuService sysButtonInMenuService;
+
+    @RequestMapping(value = "/admin/clean/menurole", method = RequestMethod.GET)
+    public void cleanMenu() {
+        List<SysMenu> sysMenuList = sysMenuService.list();
+
+        QueryWrapper<TaRole> roleQueryWrapper = new QueryWrapper<>();
+        roleQueryWrapper.eq("is_admin",1);
+        List<TaRole> roleList = taRoleService.list(roleQueryWrapper);
+
+        roleList.forEach(e -> {
+            sysMenuList.forEach(s -> {
+                TaRoleMenu taRoleMenu = new TaRoleMenu();
+                taRoleMenu.setRoleId(e.getRoleId());
+                taRoleMenu.setMenuId(s.getMenuId());
+                taRoleMenuService.save(taRoleMenu);
+            });
+        });
+    }
+
+    @RequestMapping(value = "/admin/clean/buttonrole", method = RequestMethod.GET)
+    public void cleanButton() {
+        List<SysButtonInMenu> buttlist = sysButtonInMenuService.list();
+
+        QueryWrapper<TaRole> roleQueryWrapper = new QueryWrapper<>();
+        roleQueryWrapper.eq("is_admin",1);
+        List<TaRole> roleList = taRoleService.list(roleQueryWrapper);
+
+        roleList.forEach(e -> {
+            buttlist.forEach(s -> {
+                TaRoleButton taRoleButton = new TaRoleButton();
+                taRoleButton.setBtnId(s.getBtnId());
+                taRoleButton.setRoleId(e.getRoleId());
+                taRoleButtonService.save(taRoleButton);
+            });
+        });
+    }
+}

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

@@ -125,7 +125,7 @@ public class CommConstant {
     public final static String POINTS_CHANGE_DOCUMENT_VERIFY = "document_verify";
 
     /**
-     * 资料审核
+     * 活动签到
      */
     public final static String POINTS_CHANGE_ACTIVITY_CHECKIN = "activity_checkin";
 
@@ -445,19 +445,19 @@ public class CommConstant {
      * 消息通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_NOTICE = "notice";
+    public static final String MESSAGE_CONTENT_OF_NOTICE = "notice";
     
     /**
      * 助力通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_HELP = "help-result";
+    public static final String MESSAGE_CONTENT_OF_HELP = "help-result";
     
     /**
      * 拼团通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_GROUP = "group-result";
+    public static final String MESSAGE_CONTENT_OF_GROUP = "group-result";
     
     /**
      * 活动以结束
@@ -515,4 +515,30 @@ public class CommConstant {
      * 埋点类型h5
      */
     public static final String EVENT_H5 = "h5";
+
+    /**
+     * 系统参数  通知消息次时间间隔
+     */
+    public static final String SYSPARAM_NOTICE_MESSAGE_INTERVAL = "notice_message_interval";
+
+    /**
+     * 任一消息, 可以是下面的任意一种
+     */
+    public static final String MESSAGE_TYPE_OF_SOMEWAY = "someway";
+
+    /**
+     * 短信消息
+     */
+    public static final String MESSAGE_TYPE_OF_SMS = "sms";
+
+    /**
+     * 小程序订阅消息
+     */
+    public static final String MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE = "miniapp_subscribe";
+
+    /**
+     * 小程序模板消息
+     */
+    public static final String MESSAGE_TYPE_OF_MINIAPP_TEMPLATE = "miniapp_template";
+
 }

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

@@ -0,0 +1,4 @@
+package com.huiju.estateagents.common;
+
+public class NumberUtils {
+}

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

@@ -94,7 +94,7 @@ public class SMSUtils {
         return String.join("", nums);
     }
 
-    private boolean sendMessage(String code, String tel, String[] params) {
+    public boolean sendMessage(String code, String tel, String[] params) {
         // 发送内容
         SMSProperties.Template message = new SMSProperties.Template();
         message.setCode(code);
@@ -118,7 +118,7 @@ public class SMSUtils {
         );
 
         if (((ResponseEntity<String>) response).getStatusCodeValue() != HttpStatus.OK.value()) {
-            log.error("请求发送短信验证码失败: {}", response.toString());
+            log.error("请求发送短信失败: {}", response.toString());
             return false;
         }
 

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

@@ -2,7 +2,7 @@ package com.huiju.estateagents.common;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-import cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.service.IMiniAppService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,7 +39,7 @@ public class WxUtils {
     }
 
     public WxMaService newService(TaMiniapp taMiniapp, boolean ...changeServices) {
-        WxMaInMemoryConfig config = new WxMaInMemoryConfig();
+        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
         config.setAppid(taMiniapp.getMiniappId());
         config.setSecret(taMiniapp.getSecret());
         config.setToken(taMiniapp.getToken());

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

@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -97,7 +98,9 @@ public class ExtendContentController extends BaseController {
                                           @RequestParam(value = "showType", required = false) String showType,HttpServletRequest request){
             ResponseBean responseBean = new ResponseBean();
             IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
+
+        List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
+        QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(cityId != null, "city_id", cityId);
             queryWrapper.eq(StringUtils.isNotBlank(buildingId), "building_id", buildingId);
             queryWrapper.eq(StringUtils.isNotBlank(showType), "show_type", showType);
@@ -106,6 +109,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
 

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

@@ -109,7 +109,7 @@ public class HelpActivityController extends BaseController {
                                          @RequestParam(value = "activityStatus", required = false) Integer activityStatus,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityList(pageNum, pageSize, cityId, buildingId, title, startDate, endDate, activityStatus, orgId,getTaPersonBuildingListByUserId(request));
         return helpActivityList;
     }
 
@@ -135,7 +135,7 @@ public class HelpActivityController extends BaseController {
                                          @RequestParam(value = "name", required = false) String name,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status,name);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId,status,name,getTaPersonBuildingListByUserId(request));
         return helpActivityList;
     }
 
@@ -553,8 +553,15 @@ public class HelpActivityController extends BaseController {
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
                                                @RequestParam(value = "buildingId",required = false) String buildingId,
                                                @RequestParam(value = "cityId",required = false) String cityId) {
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId,cityId);
-                return lsit;
+            String openid = getOpenId(request);
+            ResponseBean  responseBean = new ResponseBean();
+            List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+            if (null == taPersons || taPersons.size() != 1) {
+                return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaPerson person = taPersons.get(0);
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId,cityId, person);
+            return lsit;
         }
 
 }

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

@@ -112,11 +112,12 @@ public class MiniAppController extends BaseController {
             TaMiniapp miniapp = taMiniappService.getById(appid);
             WxMaJscode2SessionResult session = miniAppService.getSessionInfo(code, appid);
             Integer orgId =miniapp.getOrgId();
-            Map<String, String> miniResp = new HashMap<>();
+            Map<String, Object> miniResp = new HashMap<>();
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
             miniResp.put("unionid", session.getUnionid());
             miniResp.put("name",miniapp.getName());
+            miniResp.put("tpls", miniAppService.getTpls(appid));
 
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
@@ -219,7 +220,7 @@ public class MiniAppController extends BaseController {
             result.put("extraInfo", extraInfo);
             result.put("miniAuthorized", null != taPerson.getAvatarurl() && taPerson.getAvatarurl().indexOf("wx.qlogo.cn") > 0);
 
-            String token = miniResp.get("token");
+            String token = (String) miniResp.get("token");
             sysTokenService.saveToken(token);
 
             return ResponseBean.success(result);
@@ -408,7 +409,6 @@ public class MiniAppController extends BaseController {
         }
     }
 
-
     public Integer getOrgId(HttpServletRequest request){
 
         Map map = JWTUtils.getUserIdAndOrgId(request);

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

@@ -107,7 +107,7 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
                                      @RequestParam(value = "isMain",required = false)Integer isMain,
                                      HttpServletRequest request){
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request));
+        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request),getTaPersonBuildingListByUserId(request));
     }
 
     /**
@@ -141,7 +141,7 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
                                      @RequestParam(value = "isMain",required = false)Integer isMain,
                                            HttpServletRequest request){
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request));
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request),getTaPersonBuildingListByUserId(request));
     }
 
     /**

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

@@ -130,7 +130,7 @@ public class TaBuildingDynamicController extends BaseController {
                                              @RequestParam(required = false)String isEnlist,
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,
                                              @RequestParam(required = false)String activityStatus,HttpServletRequest request){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus,getTaPersonBuildingListByUserId(request));
         return responseBean;
     }
 
@@ -155,7 +155,7 @@ public class TaBuildingDynamicController extends BaseController {
                                              @RequestParam(required = false)String isEnlist,
                                              @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime time,
                                              @RequestParam(required = false)String activityStatus,HttpServletRequest request){
-        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectedList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus);
+        ResponseBean  responseBean = iBuildingDynamicService.iBuildingDynamicSelectedList(pageNum,pageSize,name,buildingId,cityId,isEnlist,time,title,getOrgId(request),activityStatus,getTaPersonBuildingListByUserId(request));
         return responseBean;
     }
 
@@ -537,6 +537,27 @@ public class TaBuildingDynamicController extends BaseController {
         }
         return responseBean;
     }
+
+    @ApiOperation(value = "活动推首页", notes = "活动推首页")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataType = "String", name = "dynamicId", paramType = "query",value = "活动ID"),
+            @ApiImplicitParam(dataType = "Integer", name = "home", paramType = "query",value = "首页标志")
+    })
+    @RequestMapping(value = "/admin/buildingDynamic/home" ,method =RequestMethod.PUT)
+    public  ResponseBean buildingDynamicHome(@RequestParam String dynamicId,@RequestParam Integer home,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        TaBuildingDynamic dynamic = iBuildingDynamicService.getById(dynamicId);
+        dynamic.setHome(home);
+        dynamic.setOrgId(getOrgId(request));
+        QueryWrapper<TaBuildingDynamic> dynamicQueryWrapper = new QueryWrapper<>();
+        dynamicQueryWrapper.eq("dynamic_id",dynamic);
+        if (iBuildingDynamicService.updateById(dynamic)){
+            responseBean.addSuccess("成功");
+        }else {
+            responseBean.addError("失败");
+        }
+        return responseBean;
+    }
     
     
     @ApiOperation(value = "后端删除", notes = "后端删除")

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

@@ -0,0 +1,183 @@
+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.TaCustomImg;
+import com.huiju.estateagents.service.ITaCustomImgService;
+import org.apache.commons.codec.language.DaitchMokotoffSoundex;
+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;
+
+/**
+ * <p>
+    *  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2019-12-17
+ */
+@RestController
+@RequestMapping("/api")
+public class TaCustomImgController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomImgController.class);
+
+    @Autowired
+    public ITaCustomImgService iTaCustomImgService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.GET)
+    public ResponseBean taCustomImgList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaCustomImg> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.orderByDesc("create_time");
+
+            IPage<TaCustomImg> result = iTaCustomImgService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomImgList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCustomImg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.POST)
+    public ResponseBean taCustomImgAdd(@RequestBody TaCustomImg taCustomImg, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        taCustomImg.setImgDesc(CommConstant.BANNER_INDEX.equals(taCustomImg.getImgType()) ? "小程序首页分享配图" : "小程序首页推荐客户入口配图");
+        try {
+            taCustomImg.setCreateTime(LocalDateTime.now());
+            taCustomImg.setUpdateTime(LocalDateTime.now());
+            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg, getOrgId(request));
+            if (!countFlag){
+                responseBean.addError("您已新增首页分享或推荐客户图，请勿重复添加");
+                return responseBean;
+            }
+
+            taCustomImg.setOrgId(getOrgId(request));
+            if (iTaCustomImgService.save(taCustomImg)){
+                responseBean.addSuccess(taCustomImg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomImgAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/admin/taCustomImg/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomImgDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomImgService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomImgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param taCustomImg 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/taCustomImg",method= RequestMethod.PUT)
+    public ResponseBean taCustomImgUpdate(@RequestBody TaCustomImg taCustomImg, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taCustomImg.setUpdateTime(LocalDateTime.now());
+            boolean countFlag = iTaCustomImgService.countCustomImg(taCustomImg, getOrgId(request));
+            if (!countFlag){
+                responseBean.addError("您已新增首页分享或推荐客户图，请勿重复添加");
+                return responseBean;
+            }
+
+            if (iTaCustomImgService.updateById(taCustomImg)){
+                responseBean.addSuccess(taCustomImg);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomImgUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/taCustomImg/{id}",method= RequestMethod.GET)
+    public ResponseBean taCustomImgGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomImgService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomImgDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信接口获取首页分享或推荐客户图
+     */
+    @RequestMapping(value="/wx/taCustomImg",method= RequestMethod.GET)
+    public ResponseBean taCustomImgGet(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", getOrgId(request));
+            TaCustomImg taCustomImg = iTaCustomImgService.getOne(queryWrapper);
+            responseBean.addSuccess(taCustomImg);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error(" taCustomImgGet-=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -10,6 +10,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaGoods;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaGoodsService;
 import com.huiju.estateagents.service.ITaPersonService;
@@ -27,6 +28,7 @@ import java.lang.invoke.ConstantCallSite;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -78,6 +80,8 @@ public class TaGoodsController extends BaseController {
                                     @RequestParam(value ="status",required = false) Integer status,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            List<TaPersonBuilding> taPersonBuildingListByUserId = getTaPersonBuildingListByUserId(request);
+
             //使用分页插件
 		    IPage<TaGoods> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
@@ -87,6 +91,7 @@ public class TaGoodsController extends BaseController {
             queryWrapper.eq(null != status,"status",status);
             queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
+            queryWrapper.in(taPersonBuildingListByUserId.size()>0,"building_id",taPersonBuildingListByUserId.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaGoods> result = iTaGoodsService.page(pg, queryWrapper);

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

@@ -5,6 +5,7 @@ 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.StringUtils;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import com.huiju.estateagents.service.ITaMiniappTemplateService;
 import org.slf4j.Logger;
@@ -12,6 +13,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 小程序消息模板  前端控制器
@@ -143,4 +146,16 @@ public class TaMiniappTemplateController extends BaseController {
         }
         return responseBean;
     }
+
+    @GetMapping("/wx/template/of/{type}")
+    public ResponseBean getTemplateByType(@PathVariable String type, HttpServletRequest request) {
+        String appid = request.getHeader("appid");
+
+        if (StringUtils.isEmpty(type) || StringUtils.isEmpty(appid)) {
+            return ResponseBean.error("参数非法", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaMiniappTemplate tpl = iTaMiniappTemplateService.getTplByType(type, appid);
+        return ResponseBean.success(tpl);
+    }
 }

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

@@ -84,7 +84,7 @@ public class TaNewsController extends BaseController {
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
                                    @RequestParam(value = "title", required = false) String title,
                                    @RequestParam(value = "cityId", required = false) Integer cityId){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId);
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId,getTaPersonBuildingListByUserId(request));
         return responseBean;
     }
 

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

@@ -60,7 +60,7 @@ public class TaNewsTypeController extends BaseController {
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
                                        HttpServletRequest request){
-        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request));
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request),getTaPersonBuildingListByUserId(request));
         return responseBean;
     }
 

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

@@ -11,15 +11,18 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
+import org.apache.commons.collections.map.HashedMap;
 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.lang.reflect.Method;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -48,6 +51,9 @@ public class TaPersonVisitRecordController extends BaseController {
     public ITaPersonIntentionRecordService personIntentionRecordService;
     @Autowired
     public ITaBuildingService buildingService;
+    @Autowired
+    private ITaRecommendCustomerService taRecommendCustomerService;
+
 
 
     /**
@@ -231,15 +237,17 @@ public class TaPersonVisitRecordController extends BaseController {
     public ResponseBean drainageVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                 @RequestParam(value ="activityName",required = false) String activityName,
-                                                @RequestParam(value ="drainageId",required = false) Integer drainageId,
+                                                @RequestParam(value ="buildingId",required = false) String buildingId,
                                                 @RequestParam(value ="shareName",required = false) String shareName,
                                                 @RequestParam(value ="shareTel",required = false) String shareTel,
+                                                @RequestParam(value ="eventType",required = false) String eventType,
+                                                @RequestParam(value ="personType",required = false) String personType,
                                                 HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, drainageId, shareName, shareTel);
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getDrainageVisitRecord(pg, getOrgId(request), activityName, eventType, shareName, shareTel, buildingId, personType, getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
             return responseBean;
         } catch (Exception e) {
@@ -255,13 +263,16 @@ public class TaPersonVisitRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/visitRecord",method= RequestMethod.GET)
-    public ResponseBean wxVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value = "userId") Integer userId,HttpServletRequest request){
+                                                @RequestParam(value = "userId") Integer userId,
+                                                @RequestParam(value = "targetId")String targetId,
+                                                @RequestParam(value = "eventType")String eventType,
+                                                HttpServletRequest request){
         try {
             //使用分页插件
             IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
-            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request));
+            IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getWxVisitRecordList(pg, userId,getOrgId(request),targetId, eventType);
             return ResponseBean.success(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -291,4 +302,53 @@ public class TaPersonVisitRecordController extends BaseController {
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }
     }
+
+    /**
+     * 置业顾问分享项目、活动、资讯、助力、拼团信息
+     * @param pageNumber
+     * @param pageSize
+     * @param userId
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/wx/shareRecords",method= RequestMethod.GET)
+    public ResponseBean wxShareRecordsByUserId(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
+                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                              @RequestParam(value = "userId") Integer userId,
+                                              HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        if (userId == null){
+            return responseBean;
+        }
+        //使用分页插件
+        IPage<TaConsultantInfo> pg = new Page<>(pageNumber, pageSize);
+        IPage<TaConsultantInfo> result = iTaPersonVisitRecordService.getConsultantShareInfoList(pg, userId, getOrgId(request));
+
+        List<TaConsultantInfo> taConsultantInfos = result.getRecords();
+        taConsultantInfos.forEach(e ->{
+            Integer shareNum = iTaPersonVisitRecordService.countShareNumByEventType(e.getTargetId(), getOrgId(request), userId, e.getEventType());
+            switch (e.getEventType()){
+                case CommConstant.POSTER_CONTENT_TYPE_ACTIVITY:
+                    e.setActivityShareNum(shareNum);
+                    break;
+                case CommConstant.POINTS_CHANGE_HELP:
+                    e.setHelpActivityShareNum(shareNum);
+                    break;
+                case CommConstant.POINTS_CHANGE_GROUP:
+                    e.setGroupActivityShareNum(shareNum);
+                    break;
+                case CommConstant.CAROUSEL_NEWS:
+                    e.setNewsNum(shareNum);
+                    break;
+                case CommConstant.POSTER_CONTENT_TYPE_BUILDING:
+                    e.setBuildingNum(shareNum);
+                    break;
+                case CommConstant.EVENT_H5:
+                    e.setDrainageShareNum(shareNum);
+                    break;
+            }
+        });
+        result.setRecords(taConsultantInfos);
+        return ResponseBean.success(result);
+    }
 }

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

@@ -80,7 +80,7 @@ public class TaPointsExchangeController extends BaseController {
             taPointsExchange.setTel(tel);
             taPointsExchange.setOrgId(getOrgId(request));
             
-            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange);
+            responseBean = iTaPointsExchangeService.selectList(pageNum,pageSize,taPointsExchange,getTaPersonBuildingListByUserId(request));
 
         }catch (Exception e){
             e.printStackTrace();

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

@@ -320,7 +320,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)));
+            return ResponseBean.success(taRecommendCustomerService.getCustomerList(status,pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, customerType, getOrgId(request),getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -342,7 +342,7 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
                                          @RequestParam(value = "sex",required = false)Integer sex){
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request),getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -363,7 +363,7 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value = "sex",required = false)Integer sex, HttpServletRequest request){
         Integer orgid = getOrgId(request);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgid));
+            return ResponseBean.success(taRecommendCustomerService.getRepCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgid,getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -398,7 +398,7 @@ public class TaRecommendCustomerController extends BaseController {
     public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize, @PathVariable String customerId,HttpServletRequest request){
         Integer orgId = getOrgId(request);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,orgId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,orgId,getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -415,7 +415,7 @@ public class TaRecommendCustomerController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         try{
-            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,person.getPersonId(),orgId));
+            return ResponseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,person.getPersonId(),orgId,null));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -521,10 +521,10 @@ 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) {
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize));
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -535,10 +535,10 @@ 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) {
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize));
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id,pageNumber,pageSize,getTaPersonBuildingListByUserId(request)));
         }catch (Exception e){
             e.printStackTrace();
             responseBean.addError(e.getMessage());
@@ -618,7 +618,7 @@ public class TaRecommendCustomerController extends BaseController {
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=推荐客户.xlsx");
 
-        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request));
+        Integer count = taRecommendCustomerService.getRecCustomerExportCount(getOrgId(request),getTaPersonBuildingListByUserId(request));
 
         Integer pageCode = 0;
         Integer pageSize = 100;
@@ -629,7 +629,7 @@ public class TaRecommendCustomerController extends BaseController {
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("推荐客户").build();
         do {
-            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize);
+            List<ExcelRecommendCustomer> recCustomerExport = taRecommendCustomerService.getRecCustomerExport(getOrgId(request), pageCode * pageSize, pageSize,getTaPersonBuildingListByUserId(request));
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -660,7 +660,7 @@ public class TaRecommendCustomerController extends BaseController {
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=报备客户.xlsx");
 
-        Integer count = taRecommendCustomerService.getRepCustomerReportCount(buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,getOrgId(request));
+        Integer count = taRecommendCustomerService.getRepCustomerReportCount(buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,getOrgId(request),getTaPersonBuildingListByUserId(request));
 
         Integer pageCode = 0;
         Integer pageSize = 100;
@@ -672,7 +672,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
         List<ReporRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), pageCode * pageSize, pageSize);
+            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), pageCode * pageSize, pageSize,getTaPersonBuildingListByUserId(request));
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;
@@ -794,11 +794,11 @@ public class TaRecommendCustomerController extends BaseController {
             // 设置 sheet, 同一个sheet只需要设置一次
             WriteSheet writeSheet = EasyExcel.writerSheet("客户列表-私客").build();
 
-            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+            Integer count = taRecommendCustomerMapper.getCustomerExportListCount(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
             pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
             List<PrivateCustomerExport> privateList = null;
             do {
-                privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+                privateList = taRecommendCustomerMapper.getCustomerExportList(pageCode *  pageSize, pageSize, buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,getTaPersonBuildingListByUserId(request));
                 excelWriter.write(privateList, writeSheet);
 
                 pageCode ++;

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

@@ -5,6 +5,7 @@ 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.TaRole;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.slf4j.Logger;
@@ -49,6 +50,7 @@ public class TaRoleController extends BaseController {
 		    IPage<TaRole> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaRole> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",orgId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaRole> result = iTaRoleService.page(pg, queryWrapper);
@@ -141,7 +143,7 @@ public class TaRoleController extends BaseController {
     }
 
     /**
-     * 修改角色状态--停用
+     * 修改角色状态--删除
      * @param id
      * @return
      */
@@ -150,8 +152,9 @@ public class TaRoleController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         TaRole taRole = new TaRole();
         taRole = iTaRoleService.getById(id);
-        taRole.setStatus(taRole.getStatus().equals(0)?1:0);
-        iTaRoleService.updateById(taRole);
+        if (null != taRole){
+            iTaRoleService.removeById(id);
+        }
         return responseBean;
     }
 

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

@@ -88,7 +88,7 @@ public class TaShareActivityController extends BaseController {
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, activityStatus, null, null, cityId, getOrgId(request));
+            responseBean = iTaShareActivityService.getList(pageNum, pageSize, buildingId, activityName, activityStatus, null, null, cityId, getOrgId(request),getTaPersonBuildingListByUserId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());
@@ -114,7 +114,7 @@ public class TaShareActivityController extends BaseController {
                                             HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status,name);
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request),status,name,getTaPersonBuildingListByUserId(request));
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareActivityList -=- {}",e.toString());

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

@@ -154,12 +154,12 @@ public class HelpActivity implements Serializable {
      * activityId
      */
     @TableField(exist = false)
-    private Integer activityId;
+    private String activityId;
 
     /**
      * 助力拼团2表和1
      * type(1助力，2拼团)
      */
     @TableField(exist = false)
-    private Integer type;
+    private String type;
 }

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

@@ -0,0 +1,56 @@
+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;
+
+/**
+ * <p>
+ * 短信消息模板
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysSmsSetting implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 模板名称
+     */
+    private String smsName;
+
+    /**
+     * 模板类型
+     */
+    private String smsType;
+
+    /**
+     * 模板编号
+     */
+    private String tplCode;
+
+    /**
+     * 模板签名
+     */
+    private String tplSign;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+}

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

@@ -117,6 +117,11 @@ public class TaBuildingDynamic implements Serializable {
      */
     private  LocalDateTime enlistEnd;
 
+    /**
+     * 活动推首页标志
+     */
+    private Integer home;
+
     /**
      * 活动的当前状态1:进行中，2:未开始,3:结束
      */

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

@@ -0,0 +1,34 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+
+@Data
+public class TaConsultantInfo {
+    private String activityImg;
+
+    private String activityName;
+
+    private String buildingName;
+
+    private String address;
+
+    private String price;
+
+    private String eventType;
+
+    private String targetId;
+
+    private String buildingUrl;
+
+    private Integer buildingNum;
+
+    private Integer activityShareNum;
+
+    private Integer helpActivityShareNum;
+
+    private Integer groupActivityShareNum;
+
+    private Integer newsNum;
+
+    private Integer drainageShareNum;
+}

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

@@ -0,0 +1,47 @@
+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 2019-12-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCustomImg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "img_id", type = IdType.AUTO)
+    private Integer imgId;
+
+    private String imgUrl;
+
+    private String imgType;
+
+    private String imgDesc;
+
+    private String imgDocument;
+
+    private Integer orgId;
+
+    private Integer status;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+
+
+}

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

@@ -54,5 +54,13 @@ public class TaMiniappTemplate implements Serializable {
      */
     private Integer fieldNum;
 
+    /**
+     * 是否订阅消息
+     */
+    private Boolean isSubscribe;
 
+    /**
+     * 模板字段列表 | 分隔
+     */
+    private String tplFields;
 }

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

@@ -281,4 +281,10 @@ public class TaPerson implements Serializable {
 
     @TableField(exist = false)
     private Integer duration;
+
+    /**
+     * 来源类型
+     */
+    @TableField(exist = false)
+    private String personFrom;
 }

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

@@ -0,0 +1,78 @@
+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 2019-09-04
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaPersonMessageRule implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 人员ID
+     */
+    private String personId;
+
+    /**
+     * 消息类型
+     */
+    private String messageType;
+
+    /**
+     * 内容类型
+     */
+    private String contentType;
+
+    /**
+     * 限制条数
+     */
+    private Integer limitNum;
+
+    /**
+     * 当前使用
+     */
+    private Integer leftNum;
+
+    /**
+     * 上次发送时间
+     */
+    private LocalDateTime lastSendTime;
+
+    /**
+     * 上次消息ID
+     */
+    private String lastMessageId;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+}

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

@@ -130,6 +130,30 @@ public class TaPersonVisitRecord implements Serializable {
     @TableField(exist = false)
     private String activityName;
 
+    /**
+     * 资讯名称
+     */
+    @TableField(exist = false)
+    private String newsName;
+
+    /**
+     * 助力名称
+     */
+    @TableField(exist = false)
+    private String helpActivityName;
+
+    /**
+     * 拼团名称
+     */
+    @TableField(exist = false)
+    private String groupActivityName;
+
+    /**
+     * H5名称
+     */
+    @TableField(exist = false)
+    private String drainageName;
+
     /**
      * 分享者名称
      */
@@ -164,4 +188,10 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String nickname;
+
+    /**
+     * 客户id
+     */
+    @TableField(exist = false)
+    private String customerId;
 }

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

@@ -198,4 +198,10 @@ public class TaRecommendCustomer implements Serializable {
 
     @TableField(exist = false)
     private String avatarurl;
+
+    /**
+     * 来源类型
+     */
+    @TableField(exist = false)
+    private String personFrom;
 }

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

@@ -50,7 +50,7 @@ public class AccessInterceptor implements HandlerInterceptor {
     
     private String[] whiteList = {
             "/wx/chat", // 聊天暂时不鉴权
-            "/api/wx/login",
+            "/api/wx/",
             "/api/wx/tdCity",
             "/api/admin/signin",
             "/api/taCheckin/activity",
@@ -64,7 +64,9 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/swagger-ui.html",
             "/webjars",
             "/webjars/springfox-swagger-ui",
-            "/webjars/springfox-swagger-ui/css/typography.css"
+            "/webjars/springfox-swagger-ui/css/typography.css",
+            "/clean/menurole",
+            "/clean/buttonrole"
     };
 
     /*
@@ -102,7 +104,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             response.getOutputStream().write(JSONObject.toJSONBytes(resp));
             return false;
         }
-        
+
         // 白名单跳过
         if (inWhiteList(request)) {
             return true;

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -31,7 +32,7 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId);
+    IPage<HelpActivity> helpActivityListPage(IPage<HelpActivity> pg, @Param("cityId")Integer cityId, @Param("buildingId")String buildingId, @Param("title")String title, @Param("startDate")String startDate, @Param("endDate") String endDate, @Param("activityStatus")Integer activityStatus, @Param("orgId")Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     void updateActivityToUnStart();
 
@@ -54,5 +55,5 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId,Integer status,String name,List<TaPersonBuilding> personBuildingList);
 }

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

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.SysSmsSetting;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 项目参数配置表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Mapper
+public interface SysSmsSettingMapper extends BaseMapper<SysSmsSetting> {
+
+}

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

@@ -4,11 +4,13 @@ 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.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -28,7 +30,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * @param selected
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId, @Param("cityId") Integer cityId, @Param("isEnlist") String isEnlist, @Param("time") LocalDateTime time, @Param("title") String title, @Param("orgId") Integer orgId,@Param("activityStatus") String activityStatus);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId, @Param("cityId") Integer cityId, @Param("isEnlist") String isEnlist, @Param("time") LocalDateTime time, @Param("title") String title, @Param("orgId") Integer orgId, @Param("activityStatus") String activityStatus,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 详情
@@ -87,5 +89,5 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      */
     void updateProcessingActivity();
 
-    IPage<TaBuildingDynamic> iBuildingDynamicSelectedList(Page<TaBuildingDynamic> page, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus);
+    IPage<TaBuildingDynamic> iBuildingDynamicSelectedList(Page<TaBuildingDynamic> page, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList);
 }

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

@@ -1,12 +1,11 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
@@ -28,14 +27,15 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @param page
      * @return
      */
-    List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain, @Param("orgId") Integer orgId);
+    List<TaBuilding> buildingList(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 楼盘列表
      * @param page
+     * @param
      * @return
      */
-    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain,@Param("orgId") Integer orgId);
+    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code") String code, @Param("startDate") LocalDateTime startDate, @Param("buildingStatus") String buildingStatus, @Param("marketStatus") String marketStatus, @Param("cityId") Integer cityId, @Param("isMain") Integer isMain, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

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

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

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

@@ -0,0 +1,28 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonMessageRule;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Mapper
+public interface TaPersonMessageRuleMapper extends BaseMapper<TaPersonMessageRule> {
+
+    /**
+     * 依据人员ID, 消息类型, 内容类型, 等获取人员消息规则
+     * @param personId
+     * @param messageType
+     * @param contentType
+     * @param orgId
+     * @return
+     */
+    TaPersonMessageRule getByPersonAndType(@Param("personId") String personId, @Param("messageType") String messageType, @Param("contentType") String contentType, @Param("orgId") Integer orgId);
+}

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

@@ -3,6 +3,9 @@ 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;
 import org.apache.ibatis.annotations.Param;
@@ -69,8 +72,13 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      * @param orgId
      * @return
      */
-	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("drainageId") Integer drainageId, @Param("shareName") String shareName, @Param("shareTel") String shareTel);
-    IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("eventType") String eventType,@Param("personId") String personId);
+	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, @Param("orgId") Integer orgId, @Param("activityName") String activityName, @Param("eventType") String eventType, @Param("shareName") String shareName, @Param("shareTel") String shareTel, @Param("buildingId") String buildingId, @Param("personType") String personType, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, @Param("userId") Integer userId, @Param("orgId") Integer orgId, @Param("targetId") String targetId,@Param("personId") String personId, @Param("eventType")String eventType);
 
     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);
+
+    Integer countShareNumByEventType(@Param("targetId") String targetId, @Param("orgId")Integer orgId, @Param("userId")Integer userId, @Param("eventType")String eventType);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,5 +20,5 @@ import java.util.List;
 @Mapper
 public interface TaPointsExchangeMapper extends BaseMapper<TaPointsExchange> {
 	
-	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange);
+	List<TaPointsExchange> selectListByParams(Page page,@Param("taPointsExchange") TaPointsExchange taPointsExchange, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.PersonIntention;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.excel.*;
@@ -32,9 +33,9 @@ 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);
-    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);
-    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);
+    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> 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);
 
     /**
@@ -54,28 +55,28 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<ExcelRecommendCustomer> getRecCustomerExport(@Param("orgId") Integer orgId, @Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取推荐用户数据 总数
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId);
+    Integer getRecCustomerExportCount(@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取报备客户数据 总数
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(@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);
+    Integer getRepCustomerReportCount(@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);
 
     /**
      * 导出数据 获取报备客户数据
      * @param orgId
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(@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("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(@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("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 获取经纪人数据 总数
@@ -133,7 +134,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    Integer getCustomerExportListCount(@Param("building") String buildingId, @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);
+    Integer getCustomerExportListCount(@Param("building") String buildingId, @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);
 
     /**
      * 导出数据 私客
@@ -151,7 +152,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param status
      * @return
      */
-    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @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);
+    List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @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);
     
     /**
      * 获取我的客户的人数统计
@@ -186,7 +187,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      */
     TaRecommendCustomer getMyCustDetailById(String customerId);
 
-    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId);
+    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId);
+    IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

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

@@ -3,6 +3,8 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
@@ -32,7 +34,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId);
+    ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId,List<TaPersonBuilding> personBuildingList);
 
     /**
      * 活动助力添加
@@ -135,7 +137,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId,String cityID);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId, String buildingId, String cityID, TaPerson person);
 
     /**
      * 列表  已开始 和 未开始
@@ -145,5 +147,5 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name);
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name,List<TaPersonBuilding> personBuildingList);
 }

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

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMiniappQrcode;
+import com.huiju.estateagents.entity.TaMiniappTemplate;
 import com.huiju.estateagents.entity.TaPerson;
 import me.chanjar.weixin.common.error.WxErrorException;
 
@@ -29,10 +30,6 @@ public interface IMiniAppService {
     
     void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt);
 
-    void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content);
-
-    void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName);
-
     ResponseBean getQrCode(String paramsStr, String appid);
 
     String createQrCode(WxMaService service, String path) throws Exception;
@@ -40,4 +37,8 @@ public interface IMiniAppService {
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
 
     List<TaMiniapp> getAllAvaliableMiniapps();
+
+    TaMiniappTemplate getTplByType(String type, String appid);
+
+    List<TaMiniappTemplate> getTpls(String appid);
 }

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

@@ -13,5 +13,7 @@ import com.huiju.estateagents.entity.SysOrgParams;
  * @since 2019-08-01
  */
 public interface ISysOrgParamsService extends IService<SysOrgParams> {
+    SysOrgParams getParamByCode(String paramCode, Integer orgId);
 
+    boolean importParamsFromTemplate(Integer orgId);
 }

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

@@ -7,11 +7,11 @@ import com.huiju.estateagents.entity.SysProjectParams;
 /**
  * <p>
  * 项目参数配置表  服务类
- * </p>
- *
- * @author jobob
- * @since 2019-08-01
- */
+         * </p>
+        *
+        * @author jobob
+        * @since 2019-08-01
+        */
 public interface ISysProjectParamsService extends IService<SysProjectParams> {
 
 }

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.SysSmsSetting;
+
+/**
+ * <p>
+ * 短信消息配置表  服务类
+         * </p>
+        *
+        * @author jobob
+        * @since 2019-08-01
+        */
+public interface ISysSmsSettingService extends IService<SysSmsSetting> {
+
+}

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 
 import java.time.LocalDateTime;
@@ -27,7 +28,7 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus,List<TaPersonBuilding> personBuildingList);
 
     /**
      * 项目详情
@@ -138,5 +139,5 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      * @param activityStatus
      * @return
      */
-    ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus);
+    ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList);
 }

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

@@ -24,4 +24,11 @@ public interface ITaBuildingIntentionService extends IService<TaBuildingIntentio
      * @return
      */
     ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent> tdBizEventsList, String buildingId, Integer orgId);
+
+    /**
+     * 保存楼盘默认值
+     * @param orgId
+     * @param buildingId
+     */
+    void saveDefaultIntention(Integer orgId, String buildingId);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -23,7 +24,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @return
      */
-    ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId);
+    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);
 
     /**
      * 楼盘列表
@@ -31,7 +32,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @return
      */
-    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId);
+    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 楼盘详情

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaCustomImg;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-12-17
+ */
+public interface ITaCustomImgService extends IService<TaCustomImg> {
+    boolean countCustomImg(TaCustomImg taCustomImg, Integer orgId);
+}

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

@@ -12,5 +12,5 @@ import com.huiju.estateagents.entity.TaMiniappTemplate;
  * @since 2019-09-11
  */
 public interface ITaMiniappTemplateService extends IService<TaMiniappTemplate> {
-
+    TaMiniappTemplate getTplByType(String type, String appid);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNews;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.util.List;
 
@@ -26,7 +27,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsTypeId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId,List<TaPersonBuilding> personBuildingList);
 
     /**
      * 根据Id查询资讯数据

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

@@ -3,6 +3,9 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaNewsType;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+
+import java.util.List;
 
 /**
  * <p>
@@ -22,7 +25,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
      * @param orgId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList);
 
     /**
      * 根据Id查询资讯类型数据

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

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonMessageRule;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 人员消息规则 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+public interface ITaPersonMessageRuleService extends IService<TaPersonMessageRule> {
+    /**
+     * 依据 人员ID, 消息类型等查询人员消息规则
+     * @param personId
+     * @param messageType
+     * @param contentType
+     * @param orgId
+     * @return
+     */
+    TaPersonMessageRule getByPersonAndType(String personId, String messageType, String contentType, Integer orgId);
+
+    /**
+     * 依据 人员ID, 消息类型等更新或者插入人员消息规则
+     * @param personId
+     * @param messageType
+     * @param contentType
+     * @param orgId
+     * @return
+     */
+    TaPersonMessageRule saveOrUpdateByPersonAndMessage(String personId, String messageType, String contentType, Integer orgId);
+}

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

@@ -3,8 +3,11 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+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 io.swagger.models.auth.In;
 
 import java.util.List;
 
@@ -32,7 +35,7 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 	 * @param orgId
 	 * @return
 	 */
-	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId);
+	IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType);
 
 	/**
 	 * 获取这个人的活动数据列表
@@ -46,5 +49,9 @@ public interface ITaPersonVisitRecordService extends IService<TaPersonVisitRecor
 //    IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 //    TaPerson customerInfo(String personId);
 
-	IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel);
+	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);
+
+	Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType);
 }

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

@@ -3,8 +3,11 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPointsExchange;
 
+import java.util.List;
+
 /**
  * <p>
  * 积分兑换记录  服务类
@@ -15,5 +18,5 @@ import com.huiju.estateagents.entity.TaPointsExchange;
  */
 public interface ITaPointsExchangeService extends IService<TaPointsExchange> {
 	
-	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange);
+	ResponseBean selectList(Integer pageNum, Integer pageSize, TaPointsExchange taPointsExchange, List<TaPersonBuilding> taPersonBuildingList);
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
@@ -34,22 +35,22 @@ 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);
+    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<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId);
+    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);
 
-    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId);
+    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
 
 
-    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize);
+    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
 
-    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize);
+    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList);
 
     TaRecommendCustomer getCustomerById(String customerId);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId);
+    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     TaRecommendCustomer newByPerson(TaPerson person);
 
@@ -58,21 +59,21 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize);
+    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(推荐客户) 总数
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(Integer orgId);
+    Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(报备客户) 总数
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId);
+    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(报备客户)
@@ -81,7 +82,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param pageSize
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(经纪人) 总数
@@ -147,4 +148,5 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
+
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaShareActivity;
 
 import java.time.LocalDateTime;
@@ -17,7 +18,7 @@ import java.util.List;
  */
 public interface ITaShareActivityService extends IService<TaShareActivity> {
 
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String status, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId,List<TaPersonBuilding> personBuildingList);
 
     /**
      * 判断活动是否开始
@@ -42,7 +43,7 @@ public interface ITaShareActivityService extends IService<TaShareActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name);
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name,List<TaPersonBuilding> personBuildingList);
 
     Integer countGroupBuyPeople(TaShareActivity taShareActivity);
 }

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

@@ -5,19 +5,14 @@ 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.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.HelpActivity;
-import com.huiju.estateagents.entity.HelpInitiateRecord;
-import com.huiju.estateagents.entity.HelpRecord;
-import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
 import com.huiju.estateagents.excel.HelpProceedAndFinish;
 import com.huiju.estateagents.excel.HelpRecordExport;
-import com.huiju.estateagents.mapper.HelpActivityMapper;
-import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
-import com.huiju.estateagents.mapper.HelpRecordMapper;
-import com.huiju.estateagents.mapper.TaShareActivityMapper;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IHelpActivityService;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,6 +41,12 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     @Autowired
     HelpInitiateRecordMapper helpInitiateRecordMapper;
 
+    @Autowired
+    private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
+
+    @Autowired
+    private TaShareRecordMapper taShareRecordMapper;
+
     @Autowired
     HelpRecordMapper helpRecordMapper;
 
@@ -56,10 +57,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     TaShareActivityMapper taShareActivityMapper;
 
     @Override
-    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId) {
+    public ResponseBean helpActivityList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, String title, String startDate, String endDate, Integer activityStatus, Integer orgId, List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListPage(pg, cityId, buildingId, title, startDate, endDate, activityStatus, orgId, personBuildingList);
         responseBean.addSuccess(result);
         return responseBean;
     }
@@ -68,7 +69,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     public int helpActivityAdd(HelpActivity helpActivity, Integer orgId) {
         helpActivity.setOrgId(orgId)
                 .setCreateDate(LocalDateTime.now());
-                taHelpActivityMapper.insert(helpActivity);
+        taHelpActivityMapper.insert(helpActivity);
         return helpActivity.getHelpActivityId();
     }
 
@@ -78,7 +79,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpRecord(Integer helpActivityId, String status,Integer pageNum,Integer pageSize,String tel) {
+    public ResponseBean helpRecord(Integer helpActivityId, String status, Integer pageNum, Integer pageSize, String tel) {
         ResponseBean responseBean = new ResponseBean<>();
         //  status: helpSucceed助力成功，helpUnderway进行中，helpUnfinished助力失败
 
@@ -87,9 +88,9 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
         // 得到活动限制助力的总数
         int persionNumCount = helpActivity.getPersonNum();
         IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg,helpActivityId,status,tel);
+        IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg, helpActivityId, status, tel);
 
-        List<HelpInitiateRecord>  helpInitiateRecordList= list.getRecords();
+        List<HelpInitiateRecord> helpInitiateRecordList = list.getRecords();
         for (HelpInitiateRecord helpInitiateRecord : helpInitiateRecordList) {
             helpInitiateRecord.setPersionNumCount(persionNumCount);
             // 统计助力成功的总数(发起人得到助力数满了即可)
@@ -130,7 +131,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     public ResponseBean taHelpRecordDetails(Integer helpRecordInitiateId, Integer pageNum, Integer pageSize) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpRecord> helpRecordList= helpRecordMapper.taHelpRecordDetails(pg,helpRecordInitiateId);
+        IPage<HelpRecord> helpRecordList = helpRecordMapper.taHelpRecordDetails(pg, helpRecordInitiateId);
         responseBean.addSuccess(helpRecordList);
         return responseBean;
     }
@@ -139,26 +140,26 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, String verifyCode) {
         ResponseBean responseBean = new ResponseBean<>();
         HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecordInitiateId);
-        if (null ==verifyCode || "".equals(verifyCode)){
+        if (null == verifyCode || "".equals(verifyCode)) {
             responseBean.addError("请输入核销码");
             return responseBean;
         }
 
         // 判断是否已核销
-        if ("1".equals(helpInitiateRecord.getVerificationStatus())){
+        if ("1".equals(helpInitiateRecord.getVerificationStatus())) {
             responseBean.addSuccess("已核销");
             return responseBean;
         }
 
-        if (verifyCode.equals(String.valueOf(helpInitiateRecord.getVerification()))){
+        if (verifyCode.equals(String.valueOf(helpInitiateRecord.getVerification()))) {
             helpInitiateRecord.setVerificationStatus(1);
             helpInitiateRecordMapper.updateById(helpInitiateRecord);
 
             // 活动核销加积分
-            applicationContext.publishEvent(new EventBus(helpInitiateRecord, EventBus.EventType.ActivityVerificationSign,helpInitiateRecord.getOrgId()));
+            applicationContext.publishEvent(new EventBus(helpInitiateRecord, EventBus.EventType.ActivityVerificationSign, helpInitiateRecord.getOrgId()));
 
             responseBean.addSuccess("成功");
-        }else {
+        } else {
             responseBean.addError("核销码错误,请重新输入");
         }
         return responseBean;
@@ -166,34 +167,34 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
 
     @Override
     public Integer getHelpInitiateRecordSucceed(String tel, Integer helpActivityId) {
-        QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery= new QueryWrapper<>();
-        helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
-        helpInitiateRecordQuery.eq(!StringUtils.isEmpty(tel), "phone",tel);
+        QueryWrapper<HelpInitiateRecord> helpInitiateRecordQuery = new QueryWrapper<>();
+        helpInitiateRecordQuery.eq("help_activity_id", helpActivityId);
+        helpInitiateRecordQuery.eq(!StringUtils.isEmpty(tel), "phone", tel);
         return helpInitiateRecordMapper.selectCount(helpInitiateRecordQuery);
     }
 
     @Override
     public List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(int i, Integer pageSize, String tel, Integer helpActivityId) {
-         List<HelpInitiateRecordSucceed> lsit= helpInitiateRecordMapper.getHelpInitiateRecordSucceedExportList(i,pageSize,tel,helpActivityId);
+        List<HelpInitiateRecordSucceed> lsit = helpInitiateRecordMapper.getHelpInitiateRecordSucceedExportList(i, pageSize, tel, helpActivityId);
         return lsit;
     }
 
     @Override
-    public List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId,String condition) {
-        List<HelpProceedAndFinish> lsit= helpInitiateRecordMapper.getHelpProceedAndFinishExportList(i,pageSize,tel,helpActivityId,condition);
+    public List<HelpProceedAndFinish> getHelpProceedAndFinishExportList(int i, Integer pageSize, String tel, Integer helpActivityId, String condition) {
+        List<HelpProceedAndFinish> lsit = helpInitiateRecordMapper.getHelpProceedAndFinishExportList(i, pageSize, tel, helpActivityId, condition);
         return lsit;
     }
 
     @Override
     public Integer getHelpRecord(Integer helpRecordInitiateId) {
-        QueryWrapper<HelpRecord> helpInitiateRecordQuery= new QueryWrapper<>();
-        helpInitiateRecordQuery.eq("help_record_initiate_id",helpRecordInitiateId);
+        QueryWrapper<HelpRecord> helpInitiateRecordQuery = new QueryWrapper<>();
+        helpInitiateRecordQuery.eq("help_record_initiate_id", helpRecordInitiateId);
         return helpRecordMapper.selectCount(helpInitiateRecordQuery);
     }
 
     @Override
     public List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId) {
-        List<HelpRecordExport> lsit= helpRecordMapper.getHelpRecordExportList(i,pageSize,helpRecordInitiateId);
+        List<HelpRecordExport> lsit = helpRecordMapper.getHelpRecordExportList(i, pageSize, helpRecordInitiateId);
         return lsit;
     }
 
@@ -213,19 +214,56 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId,String cityID) {
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId, String buildingId, String cityID, TaPerson person) {
         ResponseBean responseBean = new ResponseBean<>();
+        //查询是否报名了普通活动
+        QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("person_id", person.getPersonId());
+        List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+        //查询是否报名了拼团活动
+        QueryWrapper<TaShareRecord> taShareRecordQueryWrapper = new QueryWrapper<>();
+        taShareRecordQueryWrapper.eq("org_id", orgId);
+        taShareRecordQueryWrapper.eq("person_id", person.getPersonId());
+        List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
+        //判断是否发起了助力活动
+        QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
+        helpInitiateRecordListQueryWrapper.eq("org_id", orgId);
+        helpInitiateRecordListQueryWrapper.eq("person_id", person.getPersonId());
+        List<HelpInitiateRecord> helpInitiateRecords = helpInitiateRecordMapper.selectList(helpInitiateRecordListQueryWrapper);
+
         // buildingId 楼盘ID为空时首页只查置顶的活动，楼盘ID不为空查所有拼团和助力
-        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId,buildingId,cityID);
-        responseBean.addSuccess(HelpActivity);
+        List<HelpActivity> helpActivities = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId, buildingId, cityID);
+        for (HelpActivity helpActivity : helpActivities) {
+            if ("activity".equals(helpActivity.getType())) {
+                taActivityDynamicEnlists.forEach(dynamic -> {
+                    if (helpActivity.getActivityId().equals(dynamic.getDynamicId())) {
+                        helpActivity.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                    }
+                });
+            } else if ("group".equals(helpActivity.getType())) {
+                taShareRecords.forEach(share -> {
+                    if (helpActivity.getActivityId().equals(share.getGroupActivityId().toString())) {
+                        helpActivity.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                    }
+                });
+            } else if ("help".equals(helpActivity.getType())) {
+                helpInitiateRecords.forEach(help -> {
+                    if (helpActivity.getActivityId().equals(help.getHelpActivityId().toString())) {
+                        helpActivity.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                    }
+                });
+            }
+        }
+        responseBean.addSuccess(helpActivities);
         return responseBean;
     }
 
     @Override
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId,Integer status,String name) {
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId, Integer status, String name, List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId,status,name);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId, status, name, personBuildingList);
         responseBean.addSuccess(result);
         return responseBean;
     }

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

@@ -6,22 +6,19 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.*;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaMiniappQrcode;
-import com.huiju.estateagents.entity.TaMiniappTemplate;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.mapper.TaMiniFormidsMapper;
-import com.huiju.estateagents.mapper.TaMiniappMapper;
-import com.huiju.estateagents.mapper.TaMiniappQrcodeMapper;
-import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.service.ISysOrgParamsService;
 import com.huiju.estateagents.service.ITaMiniFormidsService;
+import com.huiju.estateagents.service.ITaPersonMessageRuleService;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -45,9 +42,21 @@ public class MiniAppServiceImpl implements IMiniAppService {
     @Autowired
     TaMiniappTemplateMapper taMiniappTemplateMapper;
 
+    @Autowired
+    SysSmsSettingMapper sysSmsSettingMapper;
+
+    @Autowired
+    ITaPersonMessageRuleService iTaPersonMessageRuleService;
+
+    @Autowired
+    ISysOrgParamsService iSysOrgParamsService;
+
     @Autowired
     WxUtils wxUtils;
 
+    @Autowired
+    SMSUtils smsUtils;
+
     @Override
     public WxMaJscode2SessionResult getSessionInfo(String code, String appid) throws WxErrorException {
         WxMaService wxService = wxUtils.getMiniApp(appid);
@@ -76,57 +85,185 @@ public class MiniAppServiceImpl implements IMiniAppService {
 
     @Override
     public void sendNoticeMessage(TaPerson toUser, String link, String name, String phone, String content, LocalDateTime dt) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", name, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", phone, "#fffff"));
-        data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
-        data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return ;
+        }
+
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_NOTICE;
+
+        // 查询消息类型, 优先选择订阅消息发送
+        TaMiniappTemplate tpl = getTplByType(contentType, toUser.getMiniappId());
+
+        boolean isSubscribe = null != tpl && (null == tpl.getIsSubscribe() ? false : tpl.getIsSubscribe());
+
+        // 入库的消息类型使用的是 MESSAGE_TYPE_OF_SOMEWAY, 不能使用真正的类型
+        // 因为 通知消息 只注重内容, 不在乎 发送方式
+        String messageType = CommConstant.MESSAGE_TYPE_OF_SOMEWAY;
 
-        sendMessage(CommConstant.MINIAPP_TPL_NOTICE, toUser, link, data);
+        // 消息发送间隔, -1 代表不限制
+        float interval = -1f;
+
+        // 获取系统设置, 单位分钟
+        SysOrgParams sysOrgParams = iSysOrgParamsService.getParamByCode(CommConstant.SYSPARAM_NOTICE_MESSAGE_INTERVAL, toUser.getOrgId());
+        if (null != sysOrgParams && !StringUtils.isEmpty(sysOrgParams.getParamValue())) {
+            interval = Float.parseFloat(sysOrgParams.getParamValue());
+        }
+
+        // 获取用户消息发送记录
+        TaPersonMessageRule taPersonMessageRule = iTaPersonMessageRuleService.getByPersonAndType(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
+        if (null == taPersonMessageRule) {
+            interval = -1f;
+        }
+
+        // 如果需要判断间隔
+        if (interval > 0 && null != taPersonMessageRule.getLastSendTime()) {
+            LocalDateTime now = LocalDateTime.now();
+            // 间隔时间
+            Duration diff = Duration.between(taPersonMessageRule.getLastSendTime(), now);
+
+            // 统一转换为 秒 比较
+            // 如果间隔时间小于设定时间, 就不发送消息
+            if ((diff.toMillis() / 1000) < (interval * 60)) {
+                log.info("通知消息间隔小于设定值, 不变发送消息");
+                return;
+            }
+        }
+
+        String[] smsParams = { name, miniapp.getName() + "小程序" };
+        if (null == tpl) {
+            log.error("小程序 {} 不存在 或者 无通知消息模板 {}", toUser.getMiniappId(), contentType);
+
+            // 短信发送
+            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
+        } else {
+
+            if (isSubscribe) {
+                String[] data = new String[] { name, phone, content, DateUtils.cutSecond(dt) };
+                ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+                if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                    // 使用短信发送
+                    sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
+                }
+            } else {
+                List<WxMaTemplateData> data = new ArrayList<>();
+                data.add(new WxMaTemplateData("keyword1", name, "#fffff"));
+                data.add(new WxMaTemplateData("keyword2", phone, "#fffff"));
+                data.add(new WxMaTemplateData("keyword3", content, "#fffff"));
+                data.add(new WxMaTemplateData("keyword4", DateUtils.cutSecond(dt), "#fffff"));
+
+                sendMessage(contentType, toUser, link, data);
+            }
+        }
+
+        // 更新消息发送时间
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
     
     @Override
     public void sendHelpMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
-        
-        sendMessage(CommConstant.MINIAPP_TPL_HELP, toUser, link, data);
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return ;
+        }
+
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_HELP;
+
+        TaMiniappTemplate tpl = getTplByType(contentType, toUser.getMiniappId());
+
+        boolean isSubscribe = null != tpl && (null == tpl.getIsSubscribe() ? false : tpl.getIsSubscribe());
+
+        // 消息发送类型
+        String messageType = null == tpl ? CommConstant.MESSAGE_TYPE_OF_SMS :
+                isSubscribe ? CommConstant.MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE : CommConstant.MESSAGE_TYPE_OF_MINIAPP_TEMPLATE;
+
+        String[] smsParams = { miniapp.getName() + "小程序-" + activityName };
+
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
+
+            // 短信发送
+            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
+        } else {
+
+            if (isSubscribe) {
+                String[] data = new String[] { activityName, result, DateUtils.cutSecond(dt)};
+                ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+                if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                    // 使用短信发送
+                    sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
+
+                    messageType = CommConstant.MESSAGE_TYPE_OF_SMS;
+                }
+            } else {
+                List<WxMaTemplateData> data = new ArrayList<>();
+                data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+                data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+                data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+                sendMessage(contentType, toUser, link, data);
+            }
+        }
+
+        // TODO 写消息发送日志
+
+        // 更新消息发送时间
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
-    
+
     @Override
     public void sendGroupMessage(TaPerson toUser, String link, String result, String activityName, LocalDateTime dt) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
-        
-        sendMessage(CommConstant.MINIAPP_TPL_GROUP, toUser, link, data);
-    }
+        TaMiniapp miniapp = taMiniappMapper.selectById(toUser.getMiniappId());
+        if (null == miniapp) {
+            log.error("小程序 {} 不存在", toUser.getMiniappId());
+            return ;
+        }
 
-    @Override
-    public void sendMainBizMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName, String bizType, String content) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
-        data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
-        data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword5", bizType, "#fffff"));
-        data.add(new WxMaTemplateData("keyword6", content, "#fffff"));
-
-        sendMessage("mainbiz", toUser, link, data);
-    }
+        // 消息内容类型
+        String contentType = CommConstant.MESSAGE_CONTENT_OF_GROUP;
 
-    @Override
-    public void sendNewCustomerMessage(TaPerson toUser, String link, String custName, String phone, String sex, String fromName) {
-        List<WxMaTemplateData> data = new ArrayList<>();
-        data.add(new WxMaTemplateData("keyword1", custName, "#fffff"));
-        data.add(new WxMaTemplateData("keyword2", StringUtils.ifNull(phone, "未知"), "#fffff"));
-        data.add(new WxMaTemplateData("keyword3",StringUtils.ifNull(sex, "未知"), "#fffff"));
-        data.add(new WxMaTemplateData("keyword4", fromName, "#fffff"));
-
-        sendMessage("newCustomer", toUser, link, data);
+        TaMiniappTemplate tpl = getTplByType(contentType, toUser.getMiniappId());
+
+        boolean isSubscribe = null != tpl && (null == tpl.getIsSubscribe() ? false : tpl.getIsSubscribe());
+
+        // 消息发送类型
+        String messageType = null == tpl ? CommConstant.MESSAGE_TYPE_OF_SMS :
+                isSubscribe ? CommConstant.MESSAGE_TYPE_OF_MINIAPP_SUBSCRIBE : CommConstant.MESSAGE_TYPE_OF_MINIAPP_TEMPLATE;
+
+        String[] smsParams = { miniapp.getName() + "小程序-" + activityName };
+
+        if (null == tpl) {
+            log.error("小程序 {} 无通知消息模板 {}", toUser.getMiniappId(), contentType);
+
+            // 短信发送
+            sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
+        } else {
+
+            if (isSubscribe) {
+                String[] data = new String[] { activityName, result, DateUtils.cutSecond(dt) };
+                ResponseBean res = sendSubscribeMessage(tpl, toUser, link, data);
+                if (res.getCode() != ResponseBean.CODE_SUCCESS) {
+                    // 使用短信发送
+                    sendSmsMessage(StringUtils.ifNull(toUser.getTel(), toUser.getPhone()), contentType, smsParams);
+
+                    messageType = CommConstant.MESSAGE_TYPE_OF_SMS;
+                }
+            } else {
+                List<WxMaTemplateData> data = new ArrayList<>();
+                data.add(new WxMaTemplateData("keyword1", result, "#fffff"));
+                data.add(new WxMaTemplateData("keyword2", activityName, "#fffff"));
+                data.add(new WxMaTemplateData("keyword3", DateUtils.cutSecond(dt), "#fffff"));
+                sendMessage(contentType, toUser, link, data);
+            }
+        }
+
+        // TODO 写消息发送日志
+
+        // 更新消息发送时间
+        iTaPersonMessageRuleService.saveOrUpdateByPersonAndMessage(toUser.getPersonId(), messageType, contentType, toUser.getOrgId());
     }
 
     @Override
@@ -220,6 +357,7 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return taMiniappList;
     }
 
+    @Deprecated
     private void sendMessage(String tplName, TaPerson toUser, String link, List<WxMaTemplateData> data) {
         String appid = toUser.getMiniappId();
         if (StringUtils.isEmpty(appid)) {
@@ -248,13 +386,103 @@ public class MiniAppServiceImpl implements IMiniAppService {
         } catch (WxErrorException e) {
             e.printStackTrace();
         }
+
+        // TODO 写消息发送日志
+    }
+
+    private ResponseBean sendSubscribeMessage(TaMiniappTemplate tpl, TaPerson toUser, String link, String[] data) {
+        String appid = toUser.getMiniappId();
+        if (StringUtils.isEmpty(appid)) {
+            log.error("人员 {} 无对应来源小程序信息", toUser);
+            return ResponseBean.error("消息接收人无 appid 信息", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (null == tpl) {
+            return ResponseBean.error("小程序未设置消息模板", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(tpl.getTplFields())) {
+            return ResponseBean.error("小程序消息模板未设置字段内容", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        List<WxMaSubscribeData> sendData = createMessageData(data, tpl.getTplFields());
+
+        WxMaSubscribeMessage message = WxMaSubscribeMessage.builder()
+                .templateId(tpl.getTplId())
+                .data(sendData)
+                .page(StringUtils.ifNull(link, CommConstant.MINIAPP_INDEX))
+                .toUser(toUser.getMiniOpenid())
+                .build();
+
+        try {
+            WxMaService wxService = wxUtils.getMiniApp(appid);
+            wxService.getMsgService().sendSubscribeMsg(message);
+
+            // TODO 写消息发送日志
+
+            return ResponseBean.success("消息发送成功");
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+
+            // TODO 写消息发送日志
+
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    private String sendSmsMessage(String tel, String type, String[] params) {
+        if (StringUtils.isEmpty(tel) || StringUtils.isEmpty(type)) {
+            return "短信发送失败: 没有手机号或者短信模板";
+        }
+
+        QueryWrapper<SysSmsSetting> query = new QueryWrapper<>();
+        query.eq("sms_type", type);
+        query.eq("status", CommConstant.STATUS_NORMAL);
+        query.last("limit 1");
+
+        SysSmsSetting smsSetting = sysSmsSettingMapper.selectOne(query);
+        if (null == smsSetting) {
+
+            // TODO 写消息发送日志
+
+            return "没有设置有效的【" + type + "】短信模板";
+        }
+
+        boolean success = smsUtils.sendMessage(smsSetting.getTplCode(), tel, params);
+
+        // TODO 写消息发送日志
+
+        return success ? null : "短信发送失败";
     }
 
-    private TaMiniappTemplate getTplByType(String type, String appid) {
+    private List<WxMaSubscribeData> createMessageData(String[] list, String fieldsStr) {
+        List<WxMaSubscribeData> data = new ArrayList<>();
+        if (list == null || list.length == 0 || StringUtils.isEmpty(fieldsStr)) return data;
+
+        String[] fileds = fieldsStr.split("\\|");
+
+        int length = Math.min(fileds.length, list.length);
+        for (int i = 0; i < length; i++) {
+            data.add(new WxMaSubscribeData(fileds[i], list[i], "#fffff"));
+        }
+        return data;
+    }
+
+    @Override
+    public TaMiniappTemplate getTplByType(String type, String appid) {
         TaMiniappTemplate tpl = taMiniappTemplateMapper.selectTplByType(type, appid);
         return tpl;
     }
 
+    @Override
+    public List<TaMiniappTemplate> getTpls(String appid) {
+        QueryWrapper<TaMiniappTemplate> query = new QueryWrapper<>();
+        query.eq("miniapp_id", appid);
+        query.orderByAsc("serial_no");
+
+        return taMiniappTemplateMapper.selectList(query);
+    }
+
     public TaMiniapp getMinappByOrg(Integer org) {
         QueryWrapper<TaMiniapp> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id", org);

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

@@ -1,11 +1,16 @@
 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.SysOrgParams;
 import com.huiju.estateagents.mapper.SysOrgParamsMapper;
 import com.huiju.estateagents.service.ISysOrgParamsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 组织参数配置表  服务实现类
@@ -16,5 +21,54 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysOrgParamsServiceImpl extends ServiceImpl<SysOrgParamsMapper, SysOrgParams> implements ISysOrgParamsService {
+    @Autowired
+    SysOrgParamsMapper sysOrgParamsMapper;
+
+    @Override
+    public SysOrgParams getParamByCode(String paramCode, Integer orgId) {
+        QueryWrapper<SysOrgParams> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", orgId);
+        queryWrapper.eq("param_code", paramCode);
+        queryWrapper.last("limit 1");
+
+        return sysOrgParamsMapper.selectOne(queryWrapper);
+    }
+
+    /**
+     * 从模板中导入系统参数, 支持多次导入
+     * 已经导入的不会再次导入
+     * @param orgId
+     * @return
+     */
+    @Override
+    public boolean importParamsFromTemplate(Integer orgId) {
+        // 查询模板列表, org 为 0 代表为模板数据
+        QueryWrapper<SysOrgParams> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", 0);
+
+        List<SysOrgParams> tpls = sysOrgParamsMapper.selectList(queryWrapper);
+        List<SysOrgParams> willSave = new ArrayList<>();
+
+        for(SysOrgParams param: tpls) {
+            QueryWrapper<SysOrgParams> query = new QueryWrapper<>();
+            query.eq("org_id", orgId);
+            query.eq("param_code", param.getParamCode());
+
+            // 使用 count 查询是否该参数已经存在
+            // 如果存在, 则不处理
+            int count = this.count(query);
+
+            if (count == 0) {
+                param.setParamId(null);
+                param.setOrgId(orgId);
+                willSave.add(param);
+            }
+        }
+
+        if (willSave.size() > 0) {
+            return this.saveBatch(willSave);
+        }
 
+        return true;
+    }
 }

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

@@ -0,0 +1,24 @@
+package com.huiju.estateagents.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.SysProjectParams;
+import com.huiju.estateagents.entity.SysSmsSetting;
+import com.huiju.estateagents.mapper.SysProjectParamsMapper;
+import com.huiju.estateagents.mapper.SysSmsSettingMapper;
+import com.huiju.estateagents.service.ISysProjectParamsService;
+import com.huiju.estateagents.service.ISysSmsSettingService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 项目参数配置表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-08-01
+ */
+@Service
+public class SysSmsSettingImpl extends ServiceImpl<SysSmsSettingMapper, SysSmsSetting> implements ISysSmsSettingService {
+
+}

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

@@ -74,12 +74,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId,String isEnlist, LocalDateTime time,String title,Integer orgId,String activityStatus,List<TaPersonBuilding> personBuildingList) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.buildingDynamicList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus,personBuildingList);
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingDynamic.getRecords());
@@ -383,12 +383,12 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
      * @return
      */
     @Override
-    public ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus) {
+    public ResponseBean iBuildingDynamicSelectedList(Integer pageNum, Integer pageSize, String name, String buildingId, Integer cityId, String isEnlist, LocalDateTime time, String title, Integer orgId, String activityStatus,List<TaPersonBuilding> personBuildingList) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.iBuildingDynamicSelectedList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus);
+        IPage<TaBuildingDynamic> buildingDynamic = buildingDynamicMapper.iBuildingDynamicSelectedList(page, name, buildingId,cityId,isEnlist,time,title,orgId,activityStatus,personBuildingList);
 
         HashMap hashMap= new HashMap<>();
         hashMap.put("list",buildingDynamic.getRecords());

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

@@ -1,14 +1,18 @@
 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.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingIntention;
 import com.huiju.estateagents.entity.TdBizEvent;
 import com.huiju.estateagents.mapper.TaBuildingIntentionMapper;
+import com.huiju.estateagents.mapper.TdBizEventMapper;
 import com.huiju.estateagents.service.ITaBuildingIntentionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -26,6 +30,9 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
     @Autowired
     private TaBuildingIntentionMapper taBuildingIntentionMapper;
 
+    @Autowired
+    private TdBizEventMapper tdBizEventMapper;
+
     @Override
     public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
@@ -53,4 +60,32 @@ public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntent
         responseBean.addSuccess("操作成功！");
         return responseBean;
     }
+
+    /**
+     * 保存楼盘默认值
+     *
+     * @param orgId
+     * @param buildingId
+     */
+    @Override
+    public void saveDefaultIntention(Integer orgId, String buildingId) {
+        //获取所有的意向值类型
+        List<TdBizEvent> tdBizEventList = tdBizEventMapper.selectList(new QueryWrapper<>());
+        //构造意向值
+        List<TaBuildingIntention> taBuildingIntentions = new ArrayList<>();
+        tdBizEventList.forEach(e -> {
+            TaBuildingIntention taBuildingIntention = new TaBuildingIntention();
+            taBuildingIntention.setIntentionId(e.getIntentionId());
+            taBuildingIntention.setEventId(e.getEventId());
+            taBuildingIntention.setEventCode(e.getEventCode());
+            taBuildingIntention.setEventName(e.getEventName());
+            taBuildingIntention.setIntention(1);
+            taBuildingIntention.setCreateDate(LocalDateTime.now());
+            taBuildingIntention.setBuildingId(buildingId);
+            taBuildingIntention.setStatus(1);
+            taBuildingIntention.setOrgId(orgId);
+            taBuildingIntentions.add(taBuildingIntention);
+        });
+        this.saveBatch(taBuildingIntentions);
+    }
 }

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

@@ -8,16 +8,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.service.ITaBuildingMapRelationService;
-import com.huiju.estateagents.service.ITaBuildingService;
+import com.huiju.estateagents.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.service.TaPosterService;
-import com.huiju.estateagents.service.TaShareContentService;
 import javafx.scene.control.Tab;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,13 +67,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     TdCityMapper tdCityMapper;
 
     @Autowired
-    private TaBuildingProjectTypeMapper taBuildingProjectTypeMapper;
+    private TaGoodsMapper taGoodsMapper;
 
     @Autowired
-    private TaPosterService taPosterService;
+    private TaNewsMapper taNewsMapper;
 
     @Autowired
-    private TaShareContentService taShareContentService;
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
     @Autowired
     private HelpActivityMapper helpActivityMapper;
@@ -82,19 +81,34 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaShareActivityMapper taShareActivityMapper;
 
+    @Autowired
+    private TaExtendContentMapper taExtendContentMapper;
+
+    @Autowired
+    private TaBuildingProjectTypeMapper taBuildingProjectTypeMapper;
+
+    @Autowired
+    private TaPosterService taPosterService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
+
     @Autowired
     private  TaOrgMapper  taOrgMapper;
 
     @Autowired
     private ITaBuildingMapRelationService iTaBuildingMapRelationService;
 
+    @Autowired
+    public ITaBuildingIntentionService iTaBuildingIntentionService;
+
     @Override
-    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
+    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<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
+        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId,taPersonBuildingList);
 
         if (null != buildings) {
             for(TaBuilding taBuilding: buildings) {
@@ -123,13 +137,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return ResponseBean.success(page);
     }
     @Override
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId) {
+    public ResponseBean buildingListSelect(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<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId);
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId,taPersonBuildingList);
         page.setRecords(building);
-
         return ResponseBean.success(page);
     }
 
@@ -289,7 +302,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building);
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
         if (!isMainMoreThanTenFlag){
             responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
             return responseBean;
@@ -354,6 +367,48 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             TdCity city = tdCityMapper.selectById(building.getCityId());
             city.setStatus("1");
             tdCityMapper.updateById(city);
+
+            //更新商品城市
+            TaGoods taGoods = new TaGoods();
+            taGoods.setCityId(building.getCityId());
+            QueryWrapper<TaGoods> goodsQueryWrapper = new QueryWrapper<>();
+            goodsQueryWrapper.eq("building_id", building.getBuildingId());
+            taGoodsMapper.update(taGoods, goodsQueryWrapper);
+
+            //更新资讯城市
+            TaNews taNews = new TaNews();
+            taNews.setCityId(building.getCityId());
+            QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
+            newsQueryWrapper.eq("building_id", building.getBuildingId());
+            taNewsMapper.update(taNews, newsQueryWrapper);
+
+            //更新活动城市
+            TaBuildingDynamic taBuildingDynamic = new TaBuildingDynamic();
+            taBuildingDynamic.setCityId(building.getCityId());
+            QueryWrapper<TaBuildingDynamic> taBuildingDynamicQueryWrapper = new QueryWrapper<>();
+            taBuildingDynamicQueryWrapper.eq("building_id", building.getBuildingId());
+            taBuildingDynamicMapper.update(taBuildingDynamic, taBuildingDynamicQueryWrapper);
+
+            //更新助力城市
+            HelpActivity helpActivity = new HelpActivity();
+            helpActivity.setCityId(building.getCityId());
+            QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
+            helpActivityQueryWrapper.eq("building_id", building.getBuildingId());
+            helpActivityMapper.update(helpActivity, helpActivityQueryWrapper);
+
+            //更新拼团城市
+            TaShareActivity taShareActivity = new TaShareActivity();
+            taShareActivity.setCityId(building.getCityId());
+            QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
+            taShareActivityQueryWrapper.eq("building_id", building.getBuildingId());
+            taShareActivityMapper.update(taShareActivity, taShareActivityQueryWrapper);
+
+            //更新首页轮播、开屏广告、宣传位
+            TaExtendContent taExtendContent = new TaExtendContent();
+            taExtendContent.setCityId(building.getCityId());
+            QueryWrapper<TaExtendContent> taExtendContentQueryWrapper = new QueryWrapper<>();
+            taExtendContentQueryWrapper.eq("building_id", building.getBuildingId());
+            taExtendContentMapper.update(taExtendContent, taExtendContentQueryWrapper);
         }
 
         // 项目类型
@@ -403,12 +458,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
-        boolean isMainMoreThanTenFlag = countIsMainBuilding(building);
-        if (!isMainMoreThanTenFlag){
-            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
-            return responseBean;
-        }
-
         if(null!= object.getDate("openingDate")){
             building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
         }
@@ -466,6 +515,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             insertBuildingMapRelationBeach(taBuildingMapRelations, building.getBuildingId(), orgId);
         }
 
+        //添加默认意向值
+        iTaBuildingIntentionService.saveDefaultIntention(building.getOrgId(),building.getBuildingId());
 
         return ResponseBean.success(building);
     }
@@ -492,6 +543,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
     @Override
     public ResponseBean buildingUpdateStatus(String parameter, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
         TaBuilding  building = new TaBuilding();
         JSONObject jsonobject = JSONObject.parseObject(parameter);
         Integer  status= jsonobject.getInteger("status");
@@ -501,6 +553,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingIdQueryWrapper.eq("org_id", orgId);
         building.setBuildingId(id);
         building.setStatus(status);
+
+        boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(taBuildingMapper.selectOne(buildingIdQueryWrapper), orgId, status, "updateStatus");
+        if (!isMainMoreThanTenFlag){
+            responseBean.addError("每个城市只能推荐10个楼盘到首页，请先将已推荐楼盘取消推荐后再推荐当前楼盘。");
+            return responseBean;
+        }
+
         taBuildingMapper.update(building,buildingIdQueryWrapper);
         return ResponseBean.success("");
     }
@@ -564,6 +623,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("apartment_id", building.getApartmentId());
         building.setInsideArea(building.getInsideArea() == null ? 0d : building.getInsideArea());
+        building.setBuildingArea(building.getBuildingArea() == null ? 0d : building.getBuildingArea());
         taBuildingApartmentMapper.update(building,buildingApartmentQueryWrapper);
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
@@ -837,25 +897,36 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
      * @param taBuilding
      * @return
      */
-    public boolean countIsMainBuilding(TaBuilding taBuilding) {
-        if (taBuilding.getIsMain() != 1){
+    public boolean publishCountIsMainBuilding(TaBuilding taBuilding, Integer orgId, Integer status, String operte) {
+        QueryWrapper<TaBuilding> queryWrapper = new QueryWrapper<>();
+        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)){
+            return true;
+        }
+        if (operte.equals("updateStatus") && status == 2){
             return true;
         }
         QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
         taBuildingQueryWrapper.eq("city_id", taBuilding.getCityId());
         taBuildingQueryWrapper.eq("is_main", 1);
-        taBuildingQueryWrapper.eq("status", 1);
+        taBuildingQueryWrapper.eq("org_id", orgId);
+        taBuildingQueryWrapper.ne("status", "-1");
+        taBuildingQueryWrapper.ne("status", "2");
         if (taBuilding.getBuildingId() != null){
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
         }
         List<TaBuilding> taBuildings = taBuildingMapper.selectList(taBuildingQueryWrapper);
-        if (taBuildings != null && taBuildings.size() > 10){
+        if (taBuildings != null && taBuildings.size() >= 10){
             return false;
         }
         return true;
     }
 
 
+
+
     private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
         return imgs.stream().map(img -> {
             TaBuildingImg Images = new TaBuildingImg();

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

@@ -0,0 +1,43 @@
+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.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaCustomImg;
+import com.huiju.estateagents.mapper.TaCustomImgMapper;
+import com.huiju.estateagents.service.ITaCustomImgService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-12-17
+ */
+@Service
+public class TaCustomImgServiceImpl extends ServiceImpl<TaCustomImgMapper, TaCustomImg> implements ITaCustomImgService {
+
+    @Autowired
+    private TaCustomImgMapper taCustomImgMapper;
+
+    @Override
+    public boolean countCustomImg(TaCustomImg taCustomImg, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        QueryWrapper<TaCustomImg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("img_type", taCustomImg.getImgType());
+        queryWrapper.eq("org_id", orgId);
+        if (taCustomImg.getImgId() != null){
+            queryWrapper.ne("img_id", taCustomImg.getImgId());
+        }
+        TaCustomImg indexTacustomImg = taCustomImgMapper.selectOne(queryWrapper);
+        if (indexTacustomImg != null){
+            responseBean.addError("您已新增了推荐图，请勿重新添加");
+            return false;
+        }
+        return true;
+    }
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.entity.TaMiniappTemplate;
 import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
 import com.huiju.estateagents.service.ITaMiniappTemplateService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -16,5 +17,12 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaMiniappTemplateServiceImpl extends ServiceImpl<TaMiniappTemplateMapper, TaMiniappTemplate> implements ITaMiniappTemplateService {
+    @Autowired
+    TaMiniappTemplateMapper taMiniappTemplateMapper;
 
+    @Override
+    public TaMiniappTemplate getTplByType(String type, String appid) {
+        TaMiniappTemplate tpl = taMiniappTemplateMapper.selectTplByType(type, appid);
+        return tpl;
+    }
 }

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

@@ -8,10 +8,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.BeanTools;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaBuilding;
-import com.huiju.estateagents.entity.TaNews;
-import com.huiju.estateagents.entity.TaNewsType;
-import com.huiju.estateagents.entity.TaSave;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaFavorMapper;
 import com.huiju.estateagents.mapper.TaNewsMapper;
@@ -23,6 +20,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -58,7 +56,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus,String title, Integer cityId,List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -73,6 +71,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
+        taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         taNewsQueryWrapper.orderByAsc("news_status");
         taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.common.BeanTools;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaNewsType;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaNewsTypeMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
@@ -19,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -39,7 +42,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaNewsType> page = new Page<>();
         page.setCurrent(pageNum);
@@ -49,6 +52,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
         taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id", personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNewsType> typeIPage = this.page(page, taNewsQueryWrapper);
 

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

@@ -0,0 +1,67 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaPersonMessageRule;
+import com.huiju.estateagents.mapper.TaPersonMessageRuleMapper;
+import com.huiju.estateagents.service.ITaPersonMessageRuleService;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 楼盘户型对应图片表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Service
+public class TaPersonMessageRuleImpl extends ServiceImpl<TaPersonMessageRuleMapper, TaPersonMessageRule> implements ITaPersonMessageRuleService {
+    @Autowired
+    private TaPersonMessageRuleMapper taPersonMessageRuleMapper;
+
+    @Override
+    public TaPersonMessageRule getByPersonAndType(String personId, String messageType, String contentType, Integer orgId) {
+        return taPersonMessageRuleMapper.getByPersonAndType(personId, messageType, contentType, orgId);
+    }
+
+    @Override
+    public TaPersonMessageRule saveOrUpdateByPersonAndMessage(String personId, String messageType, String contentType, Integer orgId) {
+        boolean success = false;
+        LocalDateTime now = LocalDateTime.now();
+        TaPersonMessageRule rule = getByPersonAndType(personId, messageType, contentType, orgId);
+
+        if (null == rule) {
+            // 没有信息则插入新记录
+            TaPersonMessageRule data = new TaPersonMessageRule();
+            data.setPersonId(personId);
+            data.setMessageType(messageType);
+            data.setContentType(contentType);
+            data.setOrgId(orgId);
+            data.setLimitNum(-1);   // 暂定 -1 是不限制
+            data.setLastSendTime(now);
+
+            success = save(data);
+            return success ? data : null;
+        } else {
+            // 有的话则更新记录
+            rule.setLastSendTime(now);
+
+            if (rule.getLimitNum() > -1) {
+                Integer left = rule.getLeftNum();
+                if (null == left || left <= 0) {
+                    left = 0;
+                } else {
+                    left -= 1;
+                }
+                rule.setLeftNum(left);
+            }
+
+            success = updateById(rule);
+            return success ? rule : null;
+        }
+    }
+}

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

@@ -132,10 +132,30 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             person.setAvatarurl(userInfo.getAvatarUrl());
             person.setNickname(userInfo.getNickName());
 
+            //获取推荐客户表中此人的信息并更新头像和姓名
+            updateTaRecommendCustomer(person);
+
             return person;
         }
     }
 
+    //获取推荐客户表中此人的信息并更新头像和姓名
+    private void updateTaRecommendCustomer(TaPerson person) {
+        //获取客户列表
+        QueryWrapper<TaRecommendCustomer> taRecommendCustomerQueryWrapper = new QueryWrapper<>();
+        taRecommendCustomerQueryWrapper.eq("person_id",person.getPersonId());
+        taRecommendCustomerQueryWrapper.eq("org_id",person.getOrgId());
+        List<TaRecommendCustomer> taRecommendCustomerList = taRecommendCustomerMapper.selectList(taRecommendCustomerQueryWrapper);
+        taRecommendCustomerList.forEach(e -> {
+            //没有姓名和头像的情况下更新
+            if (StringUtils.isEmpty(e.getName()) || "匿名用户".equals(e.getName())){
+                e.setName(person.getNickname());
+                e.setPicture(person.getAvatarurl());
+                taRecommendCustomerMapper.updateById(e);
+            }
+        });
+    }
+
     @Override
     public TaPerson updatePersonPhone(String miniOpenid, String phone,Integer orgId) {
         // 先查询是否存在用户
@@ -262,6 +282,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("unReadNum", 0);
         result.put("projects", buildings);
         result.put("address", taBuilding.getAddress());
+        result.put("buildingName", taBuilding.getBuildingName());
         result.put("coordinate", taBuilding.getCoordinate());
         result.put("personTags",person.getPersonTags());
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));

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

@@ -10,15 +10,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.mapper.TaDrainageMapper;
-import com.huiju.estateagents.entity.HelpActivity;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaNews;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonVisitRecord;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.HelpActivityMapper;
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
 import com.huiju.estateagents.mapper.TaNewsMapper;
@@ -30,6 +25,7 @@ import com.huiju.estateagents.service.ITaPersonVisitRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -125,25 +121,59 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	}
 
 	@Override
-	public IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, Integer drainageId, String shareName, String shareTel) {
-		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, drainageId, shareName, shareTel);
+	public IPage<TaPersonVisitRecord> getDrainageVisitRecord(IPage<TaPersonVisitRecord> pg, Integer orgId, String activityName, String eventType, String shareName, String shareTel, String buildingId, String personType, List<TaPersonBuilding> taPersonBuildingList) {
+		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, eventType, shareName, shareTel, buildingId, personType, taPersonBuildingList);
 		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
-		taPersonVisitRecords.forEach(e -> {
+		for (TaPersonVisitRecord e : taPersonVisitRecords) {
+
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());
-			if (personInfo != null){
+			if (personInfo != null) {
 				e.setUserName(personInfo.getNickname());
 				e.setUserTel(personInfo.getPhone());
 			}
 
 			TaPerson userShareInfo = taPersonMapper.selectById(e.getSharePersonId());
-			if (userShareInfo != null){
+			if (userShareInfo != null) {
 				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());
 			}
-		});
+
+			if (CommConstant.EVENT_H5.equals(e.getEventType())) {
+				e.setActivityName(e.getDrainageName());
+				continue;
+			}
+			if (CommConstant.POSTER_CONTENT_TYPE_BUILDING.equals(e.getEventType())) {
+				e.setActivityName(e.getBuildingName());
+				continue;
+			}
+			if (CommConstant.POSTER_CONTENT_TYPE_NEWS.equals(e.getEventType())) {
+				e.setActivityName(e.getNewsName());
+				continue;
+			}
+			if (CommConstant.POINTS_CHANGE_HELP.equals(e.getEventType())) {
+				e.setActivityName(e.getHelpActivityName());
+				continue;
+			}
+			if (CommConstant.POINTS_CHANGE_GROUP.equals(e.getEventType())) {
+				e.setActivityName(e.getGroupActivityName());
+				continue;
+			}
+		}
 		taPersonVisitRecordIPage.setRecords(taPersonVisitRecords);
 		return taPersonVisitRecordIPage;
 	}
+
+	@Override
+	public IPage<TaConsultantInfo> getConsultantShareInfoList(IPage<TaConsultantInfo> pg, Integer userId, Integer orgId) {
+		IPage<TaConsultantInfo> result = personVisitRecordMapper.getConsultantShareInfoList(pg,userId,orgId);
+		return result;
+	}
+
+	@Override
+	public Integer countShareNumByEventType(String targetId, Integer orgId, Integer userId, String eventType) {
+		return personVisitRecordMapper.countShareNumByEventType(targetId, orgId, userId, eventType);
+	}
+
 	/**
 	 * 分页获取个人中心访客记录
 	 *
@@ -153,24 +183,26 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	 * @return
 	 */
 	@Override
-	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId) {
+	public IPage<TaPersonVisitRecord> getWxVisitRecordList(IPage<TaPersonVisitRecord> pg, Integer userId, Integer orgId, String targetId, String eventType) {
 		//根据userId获取用户信息
 		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
 		taPersonQueryWrapper.eq("user_id",userId);
 		taPersonQueryWrapper.eq("org_id",orgId);
 		TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
 		//获取我的访问客户列表
-		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, CommConstant.EVENT_H5,taPerson.getPersonId());
+		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getWxVisitRecordList(pg,userId,orgId, targetId,taPerson.getPersonId(), eventType);
 		List<TaPersonVisitRecord> records = result.getRecords();
 		//判断是否我的客户状态
 		records.forEach(e -> {
 			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> taRecommendCustomers = taRecommendCustomerMapper.selectList(queryWrapper);
+			if (taRecommendCustomers.size() > 0){
 				//1是我的客户
 				e.setMyCustomer(CommConstant.STATUS_NORMAL);
+				//返回customer_id给微信端
+				e.setCustomerId(taRecommendCustomers.get(0).getCustomerId());
 			}
 		});
 		return result;

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

@@ -4,6 +4,7 @@ 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.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPointsExchange;
 import com.huiju.estateagents.mapper.TaPointsExchangeMapper;
 import com.huiju.estateagents.service.ITaPointsExchangeService;
@@ -34,10 +35,10 @@ public class TaPointsExchangeServiceImpl extends ServiceImpl<TaPointsExchangeMap
 	 * @return
 	 */
 	@Override
-	public ResponseBean selectList(Integer pageNum, Integer pageSize,TaPointsExchange taPointsExchange) {
+	public ResponseBean selectList(Integer pageNum, Integer pageSize,TaPointsExchange taPointsExchange,List<TaPersonBuilding> taPersonBuildingList) {
 		Page page = new Page(pageNum,pageSize);
 		// 分页查询
-		List<TaPointsExchange> list = taPointsExchangeMapper.selectListByParams(page,taPointsExchange);
+		List<TaPointsExchange> list = taPointsExchangeMapper.selectListByParams(page,taPointsExchange,taPersonBuildingList);
 		page.setRecords(list);
 		return ResponseBean.success(page);
 	}

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

@@ -242,7 +242,7 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 		// 发放积分
 		TaPerson taPerson = taPersonMapper.getById(taRecommendCustomer.getRecommendPerson());
-		if (savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
+		if (null != taPerson && savePoints(taPerson, changeType, changeParams, pointsAmount, orgId)) {
 			taPersonMapper.setFieldIncrement(taPerson.getPersonId(), "points", pointsAmount);
 		}
 	}
@@ -286,6 +286,9 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 	}
 
 	private boolean savePoints(TaPerson person, String changeType, String changeParams, Integer pointsAmount, Integer orgId) {
+		if (null == person){
+			return true;
+		}
 		TaPointsRecords taPointsRecords = new TaPointsRecords();
 		taPointsRecords.setPersonId(person.getPersonId());
 		taPointsRecords.setPersonName(StringUtils.ifNull(person.getName(),person.getNickname()));

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

@@ -7,6 +7,7 @@ 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.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
@@ -84,6 +85,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaDrainageMapper taDrainageMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TdPersonFromMapper tdPersonFromMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -309,6 +316,35 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //            return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
 //        }
 
+        if (StringUtils.isEmpty(params.getString("realtyConsultant"))) {
+            return ResponseBean.error("置业顾问不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 查找置业顾问对应的 TaPerson 及 TaUser
+        TaPerson consultantPerson = taPersonMapper.selectById(params.getString("realtyConsultant"));
+        TaUser consultantUser = null;
+        if (null == consultantPerson) {
+            consultantUser = taUserMapper.selectById(params.getString("realtyConsultant"));
+            if (null != consultantUser && null != consultantUser.getUserId() && consultantUser.getUserId() > 0) {
+                QueryWrapper<TaPerson> query = new QueryWrapper<>();
+                query.eq("org_id", consultantUser.getOrgId());
+                query.eq("user_id", consultantUser.getUserId());
+                query.last("limit 1");
+                consultantPerson = taPersonMapper.selectOne(query);
+            }
+        } else {
+            consultantUser = taUserMapper.selectById(consultantPerson.getUserId());
+        }
+
+        if (null == consultantUser || consultantUser.getStatus() != CommConstant.STATUS_NORMAL) {
+            return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 如果置业顾问还没有绑定小程序
+        if (null == consultantPerson) {
+            consultantPerson = new TaPerson();
+        }
+
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
         taRecommendCustomer.setOrgId(orgId);
         taRecommendCustomer.setName(taPerson.getNickname());
@@ -316,11 +352,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setPhone(params.getString("phone"));
         taRecommendCustomer.setSex(null == taPerson.getGender() ? null : ("1".equals(taPerson.getGender()) ? 1 : 2));
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
-        taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
+        taRecommendCustomer.setRealtyConsultant(consultantUser.getUserId().toString());
         //如果没有传building_id的情况构造building_id
         if (StringUtils.isEmpty(params.getString("buildingId")) && !StringUtils.isEmpty(params.getString("realtyConsultant"))){
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
-            taPersonBuildingQueryWrapper.eq("person_id",params.getString("realtyConsultant")).or().eq("user_id",params.getString("realtyConsultant"));
+            taPersonBuildingQueryWrapper.eq("person_id", consultantPerson.getPersonId()).or().eq("user_id", consultantUser.getUserId());
             List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingMapper.selectList(taPersonBuildingQueryWrapper);
             if (taPersonBuildingList.size() > 0){
                 params.put("buildingId",taPersonBuildingList.get(0).getBuildingId());
@@ -377,14 +413,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             String conName = "";
             TaPerson conPerson = taPersonMapper.selectById(result.get(0).getRealtyConsultant());
             if (null != conPerson){
-                if(params.getString("realtyConsultant").equals(conPerson.getPersonId())){
+                if(null != consultantPerson && consultantPerson.getPersonId().equals(conPerson.getPersonId())){
                    return  ResponseBean.success("bound");
                 }
                 conName = conPerson.getName();
             }else {
                 TaUser conUser = userService.getById(result.get(0).getRealtyConsultant());
                 if(null != conUser){
-                    if(params.getString("realtyConsultant").equals(conUser.getUserId().toString())){
+                    if(consultantUser.getUserId().equals(conUser.getUserId())){
                         return ResponseBean.success("bound");
                     }
                     conName = conUser.getUserName();
@@ -400,11 +436,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
 
         // 找到销售经理，并推送消息
-        TaPerson saleMan = taPersonMapper.getSalesExecutive();
-        if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
-            // 发送消息
-            iMiniAppService.sendNewCustomerMessage(saleMan, CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
-        }
+//        TaPerson saleMan = taPersonMapper.getSalesExecutive();
+//        if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
+//            // 发送消息
+//            iMiniAppService.sendNewCustomerMessage(saleMan, CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
+//        }
 
         return ResponseBean.success(taRecommendCustomer);
     }
@@ -444,7 +480,7 @@ 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){
+    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){
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
 
@@ -492,7 +528,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList);
         }
 
     }
@@ -504,16 +540,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public 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){
+    public 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){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId);
+        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId,taPersonBuildingList);
     }
 
 
     @Override
-    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId){
+    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId);
+        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId,taPersonBuildingList);
     }
 
     @Override
@@ -523,7 +559,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize){
+    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
         TaPerson person = taPersonMapper.selectById(personId);
@@ -572,7 +608,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taPersonVisitRecordIPage.setRecords(records);
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
             Map<String,String>geoInfo = new HashMap<>();
             geoInfo.put("provience",person.getProvince());
             geoInfo.put("country",person.getCountry());
@@ -600,11 +636,20 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
                 taRecommendCustomer.setConsultant(user);
             }
         }
+        //构造来源类型
+        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() : "");
+        }
+
         return taRecommendCustomer;
     }
 
     @Override
-    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize){
+    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList){
         TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
         if(!StringUtils.isEmpty(personId)){
             IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
@@ -651,19 +696,28 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taPersonVisitRecordIPage.setRecords(records);
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
             taRecommendCustomer.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
             taRecommendCustomer.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
             TdCity city = cityMapper.selectById(taRecommendCustomer.getCity());
             if(null != city){
                 taRecommendCustomer.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() : "");
+            }
         }
         return taRecommendCustomer;
     }
 
     @Override
-    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId){
+    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
 
         QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
         // todo
@@ -673,7 +727,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 ////        queryWrapper.eq("building_id",building);
 //        queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
 //        queryWrapper.eq("org_id", orgId);
-        return taRecommendCustomerMapper.getCustomersIRecommended(page,customerId,CommConstant.STATUS_NORMAL,orgId);
+        return taRecommendCustomerMapper.getCustomersIRecommended(page,customerId,CommConstant.STATUS_NORMAL,orgId,taPersonBuildingList);
     }
 
     @Override
@@ -737,24 +791,24 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize);
+    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize,taPersonBuildingList);
     }
 
     @Override
-    public Integer getRecCustomerExportCount(Integer orgId) {
-        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId);
+    public Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId,taPersonBuildingList);
     }
 
 
     @Override
-    public Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex,Integer orgId) {
-        return taRecommendCustomerMapper.getRepCustomerReportCount(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId);
+    public Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex,Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRepCustomerReportCount(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,taPersonBuildingList);
     }
 
     @Override
-    public List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType,verifyStatus,sex, orgId, pageCode, pageSize);
+    public List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType,verifyStatus,sex, orgId, pageCode, pageSize,taPersonBuildingList);
     }
 
 

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaShareActivity;
 import com.huiju.estateagents.entity.TaShareRecord;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
@@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -35,7 +37,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     private TaShareRecordMapper taShareRecordMapper;
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, String activityName, String activityStatus, LocalDateTime startTime, LocalDateTime endTime, Integer cityId, Integer orgId,List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -49,6 +51,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.eq(endTime != null, "end_time", endTime);
         queryWrapper.eq(orgId != null, "org_id", orgId);
         queryWrapper.eq(cityId != null, "city_id", cityId);
+        queryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         queryWrapper.orderByDesc("heavy");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);
 
@@ -83,7 +86,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
     }
 
     @Override
-    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name) {
+    public ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId,Integer status,String name,List<TaPersonBuilding> personBuildingList) {
         ResponseBean responseBean = new ResponseBean();
         Page<TaShareActivity> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
@@ -96,6 +99,7 @@ public class TaShareActivityServiceImpl extends ServiceImpl<TaShareActivityMappe
         queryWrapper.eq(cityId != null, "city_id", cityId);
         queryWrapper.eq(buildingId != null, "building_id", buildingId);
         queryWrapper.like(!StringUtils.isEmpty(name), "activity_name", name);
+        queryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         queryWrapper.orderByAsc("activity_status");
         queryWrapper.orderByAsc("start_time");
         IPage<TaShareActivity> taNewsIPage = this.page(page, queryWrapper);

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

@@ -214,7 +214,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         //发送给发起者
         TaPerson taPerson = taPersonMapper.selectById(taShareRecord.getPersonId());
         if (null != taPerson){
-            miniAppService.sendHelpMessage(taPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
+            miniAppService.sendGroupMessage(taPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
         }
         
         //批量发送给助力者
@@ -226,7 +226,7 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
         shareChildRecordList.forEach(e -> {
             TaPerson toTaPerson = taPersonMapper.selectById(e.getPersonId());
             if (null != toTaPerson){
-                miniAppService.sendHelpMessage(toTaPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
+                miniAppService.sendGroupMessage(toTaPerson,link,"拼团成功",taShareActivity.getActivityName(),LocalDateTime.now());
             }
         });
     }

src/main/java/com/huiju/estateagents/third/service/impl/TaThirdPartyMiniappConfigServiceImpl.java

@@ -39,9 +39,9 @@ public class TaThirdPartyMiniappConfigServiceImpl extends ServiceImpl<TaThirdPar
 		QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("appid",appidHeader);
 		TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = taThirdPartyMiniappConfigMapper.selectOne(queryWrapper);
-		if (LocalDateTime.now().isAfter(taThirdPartyMiniappConfig.getExpirationDate())){
-			return "秘钥已过期，请重新申请";
-		}
+//		if (LocalDateTime.now().isAfter(taThirdPartyMiniappConfig.getExpirationDate())){
+//			return "秘钥已过期，请重新申请";
+//		}
 		
 		//判断nowHeader是十五分钟之内(15 * 60 * 1000)
 		if (System.currentTimeMillis() - Long.valueOf(nowHeader) > (15 * 60 * 1000)){

src/main/java/com/huiju/estateagents/websocket/ChatServer.java

@@ -48,6 +48,7 @@ public class ChatServer {
      * 连接建立成功调用的方法*/
     @OnOpen
     public void onOpen(Session session,@PathParam("sid") String sid) {
+        removeSameFromSets(sid);
         this.session = session;
         webSocketSet.add(this);
         addOnlineCount();
@@ -60,9 +61,7 @@ public class ChatServer {
      */
     @OnClose
     public void onClose() {
-        webSocketSet.remove(this);
-        subOnlineCount();
-        log.info("有一连接关闭！当前在线人数为" + getOnlineCount());
+        removeFromSets();
     }
 
     /**
@@ -83,7 +82,7 @@ public class ChatServer {
 
         JSONObject jsnMsg = JSONObject.parseObject(message);
 
-        if ( null == ChatServer.taChatService) {
+        if (null == ChatServer.taChatService) {
             ChatServer.taChatService = applicationContext.getBean(ITaChatService.class);
         }
         System.out.println("收到的聊天消息的信息=========" + jsnMsg.toJSONString());
@@ -106,7 +105,9 @@ public class ChatServer {
     public void onError(Session session, Throwable error) {
         log.error("发生错误");
         error.printStackTrace();
+        removeFromSets();
     }
+
     /**
      * 实现服务器主动推送
      */
@@ -114,6 +115,26 @@ public class ChatServer {
         this.session.getBasicRemote().sendText(message);
     }
 
+    private void removeFromSets() {
+        for(ChatServer c: webSocketSet) {
+            if (sid.equals(c.sid)) {
+                webSocketSet.remove(c);
+                subOnlineCount();
+                log.info("有一连接关闭:"+sid+"！当前在线人数为" + getOnlineCount());
+            }
+        }
+    }
+
+    private void removeSameFromSets(String currentSid) {
+        for(ChatServer c: webSocketSet) {
+            if (currentSid.equals(c.sid)) {
+                webSocketSet.remove(c);
+                subOnlineCount();
+                log.info("有一连接关闭:"+sid+"！当前在线人数为" + getOnlineCount());
+            }
+        }
+    }
+
     /**
      * 发自定义消息
      * */
@@ -128,6 +149,7 @@ public class ChatServer {
                     item.sendMessage(message);
                 }
             } catch (IOException e) {
+                log.error("推送消息错误: " + e.getMessage());
                 continue;
             }
         }

src/main/resources/application-prod.yml

@@ -20,7 +20,6 @@ spring:
 ##mybatis-plus
 mybatis-plus:
   configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     call-setters-on-nulls: true
   mapper-locations: classpath:mapper/**/*.xml
 wx:
@@ -50,7 +49,8 @@ ali:
 
 # 手机短信服务
 sms:
-  url: http://micservice.ycjcjy.com/sms
+  # 先使用外网地址, 后期使用内网地址
+  url: http://101.200.84.17:8081/sms
   method: POST
   contentType: "application/json;charset=UTF-8"
   template:
@@ -71,4 +71,9 @@ sms:
     sign: AI智慧案场
 
   visitor:
-    code: "0501"
+    code: "0501"
+
+#日志配置
+logging:
+  config: classpath:log/logback-spring.xml
+  debug: true

src/main/resources/application-test.yml

@@ -50,7 +50,7 @@ ali:
 
 # 手机短信服务
 sms:
-  url: http://micservice.ycjcjy.com/sms
+  url: http://101.200.84.17:8081/sms
   method: POST
   contentType: "application/json;charset=UTF-8"
   template:

src/main/resources/log/logback-spring.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="/home/estateagents/estateagents-3.5/service/logs" />
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/estateagents-%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+<!--        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">-->
+<!--            <MaxFileSize>10MB</MaxFileSize>-->
+<!--        </triggeringPolicy>-->
+    </appender>
+
+    <!-- 按照每天生成日志文件 -->
+    <appender name="MYSQL"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/estateagents-%d{yyyy-MM-dd}-sql.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>3</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+                <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+                    <MaxFileSize>1024MB</MaxFileSize>
+                </triggeringPolicy>
+    </appender>
+
+    <!--myibatis log configure-->
+    <logger name="com.huiju.estateagents.mapper" level="DEBUG" additivity="false">
+        <appender-ref ref="MYSQL" />
+    </logger>
+
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
+        <appender-ref ref="MYSQL" />
+    </root>
+</configuration>

src/main/resources/mapper/HelpActivityMapper.xml

@@ -29,6 +29,12 @@
             and ha.activity_status = #{activityStatus}
         </if>
             and ha.org_id=#{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND ha.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
         </where>
         GROUP BY ha.help_activity_id
         order by ha.heavy desc
@@ -60,9 +66,14 @@
 			SELECT
                 a.city_id as cityId,
 				a.help_activity_id as activityId,
-				a.img as img,
+				a.list_img as img,
                 a.banner_list_img as bannerListImg,
-				1 AS type
+                a.title as title,
+                a.end_date as endDate,
+                a.`status` as status,
+                a.activity_status as activityStatus,
+				"help" AS type,
+                a.heavy
 			FROM
 				ta_help_activity a
 				WHERE
@@ -82,9 +93,14 @@
 				SELECT
                     s.city_id as cityId,
 					s.group_activity_id as activityId,
-					s.main_img as img,
+					s.list_img as img,
                     s.banner_list_img as bannerListImg,
-					2 AS type
+                    s.activity_name as title,
+                    s.end_time as endDate,
+                    s.status as status,
+                    s.activity_status as activityStatus,
+					"group" AS type,
+                    s.heavy
 				FROM
 					ta_share_activity s
 					WHERE
@@ -99,6 +115,34 @@
                     and s.building_id = #{buildingId}
                 </if>
 			)
+		UNION ALL
+		    (
+                SELECT
+                t.city_id as cityId,
+                t.dynamic_id as activityId,
+                t.list_img_url as img,
+                t.banner_list_img as bannerListImg,
+                t.title as title,
+                t.end_date as endDate,
+                t.status as status,
+                t.activity_status as activityStatus,
+                "activity" AS type,
+                t.heavy
+                FROM
+                ta_building_dynamic t
+                WHERE
+                t.org_id =#{orgId} and t.`status` = 1
+                <if test="buildingId  == null or  buildingId =='' ">
+                    and  t.home = 1
+                </if>
+                <if test="cityID != null and cityID != ''">
+                    and  t.city_id = #{cityID}
+                </if>
+                <if test="buildingId != null and buildingId != ''">
+                    and t.building_id = #{buildingId}
+                </if>
+            )
+            order by heavy desc
     </select>
 
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">
@@ -119,6 +163,12 @@
             <if test="status != null">
                 and status = #{status}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND ha.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
             and ha.org_id=#{orgId}
             and ha.activity_status in (0, 1)
         </where>

src/main/resources/mapper/HelpInitiateRecordMapper.xml

@@ -87,7 +87,7 @@
       SELECT
         t.*,
         a.title,
-        a.img,
+        a.list_img as img,
         a.activity_status,
         a.end_date
     FROM

src/main/resources/mapper/SysSmsSettingMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.SysSmsSettingMapper">
+
+</mapper>

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -45,6 +45,12 @@
         <if test="time != null">
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
         </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND tbd.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
         ORDER BY tbd.heavy DESC
   </select>
 
@@ -77,6 +83,12 @@
         <if test="time != null">
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
         </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND tbd.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
         ORDER BY tbd.heavy DESC
     </select>
 

src/main/resources/mapper/TaBuildingMapper.xml

@@ -29,6 +29,12 @@
             <if test="orgId != null">
                 and  ta_building.org_id = #{orgId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND ta_building.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         ORDER BY status ASC, create_date DESC
     </select>
@@ -59,6 +65,12 @@
             <if test="orgId != null and orgId != ''">
                 and  ta_building.org_id = #{orgId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND ta_building.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         ORDER BY create_date DESC,status asc
     </select>

src/main/resources/mapper/TaCustomImgMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.community.huiju.customImg.mapper.TaCustomImgMapper">
+
+</mapper>

src/main/resources/mapper/TaDrainageMapper.xml

@@ -4,6 +4,6 @@
     <update id="updateDrainageToEnd">
         update ta_drainage
         set status = 0
-        where NOW() > end_date
+        where NOW() > end_date and status != -1
     </update>
 </mapper>

src/main/resources/mapper/TaMiniappTemplateMapper.xml

@@ -10,5 +10,6 @@
         WHERE
             t.miniapp_id = #{appid}
         AND s.tpl_type = #{type}
+        limit 1
     </select>
 </mapper>

src/main/resources/mapper/TaPersonMessageRuleMapper.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaPersonMessageRuleMapper">
+    <select id="getByPersonAndType" resultType="com.huiju.estateagents.entity.TaPersonMessageRule">
+        SELECT
+            *
+        FROM
+            ta_person_message_rule t
+        WHERE t.person_id = #{personId}
+        AND t.message_type = #{messageType}
+        AND t.content_type = #{contentType}
+        AND t.org_id = #{orgId}
+        limit 1
+    </select>
+</mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -6,7 +6,7 @@
         <trim suffixOverrides=",">
             t.record_id,
             t.person_id,
-            t.person_type,
+            c.person_type,
             t.visit_time,
             t.leave_time,
             t.visit_duration,
@@ -95,13 +95,10 @@
             t.* ,
 	        p.`name` as user_name,
 	        p.`nickname` as nickname,
-	        p.avatarurl,
-	        d.name as activity_name,
-	        d.create_date
+	        p.avatarurl
         FROM
-            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and event_type = #{eventType} AND consultant_id = #{userId} and person_id != #{personId} ORDER BY visit_time DESC LIMIT 999) t
+            ( SELECT * FROM ta_person_visit_record WHERE org_id = #{orgId} and target_id = #{targetId} AND consultant_id = #{userId} and person_id != #{personId} and event_type = #{eventType} ORDER BY visit_time DESC LIMIT 999) t
             left JOIN ta_person p on t.person_id = p.person_id
-            LEFT join ta_drainage d on t.target_id = d.drainage_id
         GROUP BY
             t.person_id
         ORDER BY
@@ -125,22 +122,34 @@
         select * from (
             select
             <include refid="columnSql"></include>,
-            b.name as activityName,
+            b.name as drainageName,
+            d.building_name as buildingName,
+            tn.news_name as newsName,
+            tha.title as helpActivityName,
+            tsa.activity_name as groupActivityName,
+            tbd.title as activityName,
             b.drainage_id
             from ta_person_visit_record t
             left join ta_drainage b on t.target_id = b.drainage_id
+            left join ta_building d on t.target_id = d.building_id
+            left join ta_news tn on t.target_id = tn.news_id
+            left join ta_help_activity tha on t.target_id = tha.help_activity_id
+            left join ta_share_activity tsa on t.target_id = tsa.group_activity_id
+            left join ta_building_dynamic tbd on t.target_id = tbd.dynamic_id
             left join ta_person c on t.share_person_id = c.person_id
             where
-            t.event_type = 'h5'
-            and t.share_person_id is not null
+            t.share_person_id != t.person_id and t.share_person_id is not null and t.share_person_id != ''
             <if test="orgId != null and orgId != ''">
                 and t.org_id = #{orgId}
             </if>
-            <if test="drainageId !=null and drainageId != ''">
-                and b.drainage_Id = #{drainageId}
+            <if test="eventType !=null and eventType != ''">
+                and t.event_type = #{eventType}
             </if>
             <if test="activityName !=null and activityName != ''">
-                and b.name like concat('%',#{activityName},'%')
+                and (
+                (b.name like concat('%',#{activityName},'%') and t.event_type = 'h5')or (d.name like concat('%',#{activityName},'%') and t.event_type = 'building') or (tn.news_name like concat('%',#{activityName},'%') and t.event_type = 'news')
+                or (tha.title like concat( '%', #{activityName}, '%' ) and t.event_type = 'help')  or (tsa.activity_name like concat('%',#{activityName},'%') and t.event_type = 'group') or (tbd.title like concat('%',#{activityName},'%') and t.event_type = 'activity')
+                )
             </if>
             <if test="shareName !=null and shareName != ''">
                 and c.nickname like concat('%',#{shareName},'%')
@@ -148,10 +157,165 @@
             <if test="shareTel !=null and shareTel != ''">
                 and c.phone = #{shareTel}
             </if>
+            <if test="personType == 'Realty Consultant'">
+                and t.consultant_id is not null  and t.consultant_id != ''
+            </if>
+            <if test="personType == 'customer'">
+                and t.consultant_id is null
+            </if>
+            <if test="buildingId !=null and buildingId != ''">
+                and t.building_id = #{buildingId}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND t.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
             order by t.visit_time desc
         ) t
-        group by t.person_id, t.share_person_id
+        group by t.person_id, t.share_person_id,t.target_id,t.event_type
+        order by t.visit_time desc
+    </select>
+
+    <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
+        select * From (
+            select * from (
+                select
+                t.target_id,
+                a.url as activity_img,
+                a.building_name as activity_name,
+                a.building_name,
+                a.address,
+                a.price,
+                t.event_type,
+                t.visit_time
+                from ta_person_visit_record t
+                left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.target_id = a.building_id
+                where t.event_type = 'building'
+                and t.consultant_id = #{userId}
+                and t.org_id = #{orgId}
+                and t.`event` = 'share' order by t.visit_time desc
+            ) t
+            group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.target_id,
+        b.list_img_url as activity_img,
+        b.title as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type,
+		t.visit_time
+        from ta_person_visit_record t
+        left join ta_building_dynamic b on t.target_id = b.dynamic_id
+        where t.event_type = 'activity'
+        and t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.`event` = 'share' order by t.visit_time desc
+        ) t
+        group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.target_id,
+        c.list_img as activity_img,
+        c.title as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type,
+		t.visit_time
+        from ta_person_visit_record t
+        left join ta_help_activity c on t.target_id = c.help_activity_id
+        where t.event_type = 'help'
+        and t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.`event` = 'share' order by t.visit_time desc
+        ) t
+        group by t.target_id
+
+        union all
+
+        select * from (
+        select
+        t.target_id,
+        d.list_img as activity_img,
+        d.activity_name as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type,
+		t.visit_time
+        from ta_person_visit_record t
+        left join ta_share_activity d on t.target_id = d.group_activity_id
+        where t.event_type = 'group'
+        and t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.`event` = 'share'
+        group by t.target_id order by t.visit_time desc
+        ) t
+
+        union all
+
+        select * from (
+        select
+        t.target_id,
+        e.news_img as activity_img,
+        e.news_name as activity_name,
+        '1' as price,
+        '2' as building_name,
+        '3' as address,
+        t.event_type,
+		t.visit_time
+        from ta_person_visit_record t
+        left join ta_news e on t.target_id = e.news_id
+        where t.event_type = 'news'
+        and t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.`event` = 'share' order by t.visit_time desc
+        ) t
+        group by t.target_id
+
+        union all
+
+        select * from (
+            select
+            t.target_id,
+            f.share_img as activity_img,
+            f.`name` as activity_name,
+            '1' as price,
+            '2' as building_name,
+            '3' as address,
+            t.event_type,
+            t.visit_time
+            from ta_person_visit_record t
+            left join ta_drainage f on t.target_id = f.drainage_id
+            where t.event_type = 'h5'
+            and t.consultant_id = #{userId}
+            and t.org_id = #{orgId}
+            and t.`event` = 'share' order by t.visit_time desc
+            ) t
+            group by t.target_id
+        ) t
         order by t.visit_time desc
     </select>
 
+    <select id="countShareNumByEventType" resultType="java.lang.Integer">
+        select count(DISTINCT t.person_id)  from ta_person_visit_record t
+        where
+        t.consultant_id = #{userId}
+        and t.org_id = #{orgId}
+        and t.event_type = #{eventType}
+        and t.target_id = #{targetId}
+        and t.person_id != t.share_person_id
+        group by t.event_type
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPointsExchangeMapper.xml

@@ -58,6 +58,12 @@
         <if test="taPointsExchange.endVerifyDate != null and taPointsExchange.endVerifyDate != ''">
             and  date_format(t.verify_date,'%Y-%m-%d') &lt;= date_format(#{taPointsExchange.endVerifyDate},'%Y-%m-%d')
         </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
         order by t.create_date desc
     </select>
 </mapper>