Merge branch 'v3.5' into v3.5.1

# Conflicts:
#	src/main/java/com/huiju/estateagents/common/CommConstant.java
#	src/main/java/com/huiju/estateagents/controller/TaPosterController.java

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.4.2</version>
+	<version>v3.5.1</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -198,7 +198,7 @@
 				<includes>
 					<include>application.yml</include>
 					<include>application-${profiles.active}.yml</include>
-					<include>mapper/*.xml</include>
+					<include>mapper/**/*.xml</include>
 				</includes>
 			</resource>
 		</resources>

src/main/java/com/huiju/estateagents/activity/controller/ActivityController.java

@@ -33,6 +33,7 @@ public class ActivityController extends BaseController {
 	@RequestMapping(value = "/wx/activity/list", method = RequestMethod.GET)
 	public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "pageNumber",defaultValue = "1")Integer pageNumber,
 	                                           @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
+	                                           @RequestParam(value = "cityId",required = false)Integer cityId,
 	                                           HttpServletRequest request){
 		String openid = getOpenId(request);
 		Integer orgId = getOrgId(request);
@@ -42,7 +43,7 @@ public class ActivityController extends BaseController {
 			return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		TaPerson person = taPersons.get(0);
-		responseBean = activityService.getActivityList(pageNumber,pageSize,orgId,person);
+		responseBean = activityService.getActivityList(pageNumber,pageSize,orgId,person,cityId);
 		
 		return responseBean;
 	}

src/main/java/com/huiju/estateagents/activity/mapper/ActivityMapper.java

@@ -9,5 +9,5 @@ import java.util.List;
 
 @Mapper
 public interface ActivityMapper {
-	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status);
+	List<Activity> getActivityList(Page pg, @Param("orgId") Integer orgId,@Param("status") Integer status,@Param("cityId") Integer cityId);
 }

src/main/java/com/huiju/estateagents/activity/service/ActivityServiceI.java

@@ -13,5 +13,5 @@ public interface ActivityServiceI {
 	 * @param person
 	 * @return
 	 */
-	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person);
+	ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person,Integer cityId);
 }

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -16,6 +16,7 @@ import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
 import com.huiju.estateagents.mapper.HelpRecordMapper;
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
+import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -53,26 +54,26 @@ public class ActivityServiceImpl implements ActivityServiceI {
 	 * @return
 	 */
 	@Override
-	public ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person) {
+	public ResponseBean getActivityList(Integer pageNumber, Integer pageSize, Integer orgId, TaPerson person, Integer cityId) {
 		//查询是否报名了普通活动
 		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<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
-		helpRecordQueryWrapper.eq("org_id",orgId);
-		helpRecordQueryWrapper.eq("person_id",person.getPersonId());
-		List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
+		//判断是否发起了助力活动
+		QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
+		helpInitiateRecordListQueryWrapper.eq("org_id",orgId);
+		helpInitiateRecordListQueryWrapper.eq("person_id",person.getPersonId());
+		List<HelpInitiateRecord> HelpInitiateRecords = helpInitiateRecordMapper.selectList(helpInitiateRecordListQueryWrapper);
 		
 		//分页获取全部数据
 		Page pg = new Page(pageNumber,pageSize);
-		List<Activity> list = activityMapper.getActivityList(pg,orgId, CommConstant.STATUS_NORMAL);
+		List<Activity> list = activityMapper.getActivityList(pg,orgId, CommConstant.STATUS_NORMAL,cityId);
 		list.forEach(e -> {
 			if (e.getType().equals("dynamic")){
 				taActivityDynamicEnlists.forEach(dynamic -> {
@@ -83,7 +84,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
 				e.setSuccessNum(null);
 			}else if (e.getType().equals("group")){
 				taShareRecords.forEach(share -> {
-					if (e.getId().equals(share.getGroupActivityId())){
+					if (e.getId().equals(String.valueOf(share.getGroupActivityId()))){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}
 				});
@@ -95,7 +96,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
 				List<TaShareRecord> taShareRecordsList = taShareRecordMapper.selectList(shareRecordQueryWrapper);
 				e.setSuccessNum(taShareRecordsList.size());
 			}else if (e.getType().equals("help")){
-				helpRecords.forEach(help -> {
+				HelpInitiateRecords.forEach(help -> {
 					if (e.getId().equals(help.getHelpActivityId())){
 						e.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 					}

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

@@ -311,7 +311,7 @@ public class TaUserController extends BaseController {
             return ResponseBean.error("用户名或密码错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
     
-        if (taUser.getStatus() != CommConstant.STATUS_NORMAL) {
+        if (!taUser.getStatus().equals(CommConstant.STATUS_NORMAL) ) {
             return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
         }
 
@@ -322,7 +322,11 @@ public class TaUserController extends BaseController {
         map.put("userId",taUser.getUserId().toString());
         map.put("orgId",taUser.getOrgId().toString());
         String token = JWTUtils.newTokenByMap(map);
-    
+
+        // 先尝试删除这个Token
+        // 因为偶尔出现了，Token插入失败，报的错就是主键重复
+        sysTokenService.removeById(token);
+
         //保存token
         sysTokenService.saveToken(token);
     
@@ -469,4 +473,11 @@ public class TaUserController extends BaseController {
         }
         return responseBean;
     }
+
+    // 树形菜单
+    @RequestMapping(value="/center/taUser/city/tree",method= RequestMethod.GET)
+    public ResponseBean cityTree(){
+        ResponseBean taUser = iTaUserService.cityTree();
+        return taUser;
+    }
 }

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

@@ -3,10 +3,7 @@ package com.huiju.estateagents.center.taUser.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.huiju.estateagents.entity.SysButtonInMenu;
-import com.huiju.estateagents.entity.SysMenu;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaRole;
+import com.huiju.estateagents.entity.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -162,4 +159,26 @@ public class TaUser implements Serializable {
     
     @TableField(exist = false)
     private String buildingId;
+
+    /**
+     * ta_org/orgNum楼盘最大数
+     */
+  @TableField(exist = false)
+    private int orgNum;
+
+    // 所有省份城市
+    @TableField(exist = false)
+    List<TdCity> tdCityList;
+
+    /**
+     * 前台传值城市
+     */
+    @TableField(exist = false)
+    private ArrayList<Integer> selectCityTree;
+
+    /**
+     * 城市ID
+     */
+    @TableField(exist = false)
+    private Integer cityId;
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.center.taUser.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.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 
@@ -35,4 +36,10 @@ public interface ITaUserService extends IService<TaUser> {
     TaUser addAdminUser(TaUser taUser) throws Exception;
     
     TaUser updateAdminUser(TaUser taUser) throws Exception;
+
+    /**
+     * 查询所有城市
+     * @return
+     */
+    ResponseBean cityTree();
 }

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

@@ -2,7 +2,9 @@ package com.huiju.estateagents.center.taUser.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
@@ -14,23 +16,19 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaMiniapp;
-import com.huiju.estateagents.entity.TaMiniappTemplate;
-import com.huiju.estateagents.entity.TaOrg;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPersonBuilding;
-import com.huiju.estateagents.mapper.TaMiniappMapper;
-import com.huiju.estateagents.mapper.TaMiniappTemplateMapper;
-import com.huiju.estateagents.mapper.TaOrgMapper;
-import com.huiju.estateagents.mapper.TaPersonBuildingMapper;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import org.checkerframework.checker.units.qual.A;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.ITaBuildingReportService;
+import com.huiju.estateagents.service.ITdReportService;
+import org.apache.commons.collections.CollectionUtils;
 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.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -66,6 +64,21 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	
 	@Autowired
 	private TaUserRoleMapper taUserRoleMapper;
+
+	@Autowired
+	private TdPointsRulesMapper tdPointsRulesMapper;
+
+	@Autowired
+	private ITdReportService iTdReportService;
+
+	@Autowired
+	private ITaBuildingReportService iTaBuildingReportService;
+
+	@Autowired
+    private  TdCityMapper tdCityMapper;
+
+	@Autowired
+	private  TaOrgCityMapper taOrgCityMapper;
 	
 	@Override
 	public IPage<Map<String,Object>> getPageList(IPage pg) {
@@ -99,10 +112,45 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taOrg.setName(taUser.getOrgName());
 		taOrg.setWaterMark(taUser.getWaterMark());
 		taOrg.setCreateDate(LocalDateTime.now());
+		taOrg.setBuildingNum(taUser.getOrgNum());
+		taOrg.setDefaultCityId(taUser.getCityId());
 		if (taOrgMapper.insert(taOrg) < 1) {
 			throw new Exception("生成用户公司信息失败");
 		}
 
+		// 维护当前城市所在城市
+		addAndupdate(taUser.getSelectCityTree(),false,taOrg.getOrgId());
+
+		// 插入积分, 默认全部 1 积分
+		List<TdPointsRules> pointsRules = tdPointsRulesMapper.getTPLRules();
+		if (pointsRules != null) {
+			for (int i = 0; i < pointsRules.size(); i ++) {
+				TdPointsRules rule = pointsRules.get(i);
+				rule.setOrgId(taOrg.getOrgId());
+				rule.setStatus(CommConstant.STATUS_NORMAL);
+				rule.setPointsAmount(1);	// 默认1积分
+				tdPointsRulesMapper.insert(rule);
+			}
+		}
+
+		// 插入统计，默认全部显示
+		QueryWrapper<TdReport> queryWrapper = new QueryWrapper<>();
+		queryWrapper.orderByDesc("create_date");
+		queryWrapper.eq("status", 1);
+		List<TdReport> tdReportList = iTdReportService.list(queryWrapper);
+		if (CollectionUtils.isNotEmpty(tdReportList)) {
+			List<TaBuildingReport> buildingReportList = tdReportList.stream().map(e -> {
+				TaBuildingReport taBuildingReport = new TaBuildingReport();
+				taBuildingReport.setOrgId(taOrg.getOrgId());
+				taBuildingReport.setReportCode(e.getReportCode());
+				taBuildingReport.setCreateDate(LocalDateTime.now());
+
+				return taBuildingReport;
+			}).collect(Collectors.toList());
+
+			iTaBuildingReportService.saveBatch(buildingReportList);
+		}
+
 		taUser.setOrgId(taOrg.getOrgId());
 		taUser.setIsAdmin(true);
 		taUser.setLoginPassword(MD5Utils.md5(taUser.getLoginPassword()));
@@ -115,6 +163,32 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		return taUser;
 	}
 
+	// 维护公司所在城市
+	public void addAndupdate(ArrayList<Integer> selectCityTree,boolean isA,Integer orgid){
+
+			QueryWrapper<TdCity> tdCityQuery= new QueryWrapper<>();
+			tdCityQuery.eq("leveltype",1);
+			 List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQuery);
+
+		// isA=true删除所有城市重新添加
+		if (isA == true){
+			for(Integer city:selectCityTree) {
+				taOrgCityMapper.deleteById(city);
+			}
+		}
+			 // 对比现在的城市ID
+			 for(Integer city:selectCityTree){
+				for (TdCity tdCity : tdCityList){
+					if (city.equals(tdCity.getId())){
+						TaOrgCity  taOrgCity = new TaOrgCity();
+						taOrgCity.setId(city).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+					}
+
+				}
+			 }
+
+	}
+
 	@Override
 	public TaUser getInfoWithOrg(Integer id) {
 		TaUser taUser = this.getById(id);
@@ -126,6 +200,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (null != taOrg) {
 			taUser.setOrgName(taOrg.getName());
 			taUser.setWaterMark(taOrg.getWaterMark());
+			taUser.setOrgNum(taOrg.getBuildingNum());
+			taOrg.setDefaultCityId(taUser.getCityId());
 		}
 
 		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
@@ -149,10 +225,13 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		if (null != taOrg) {
 			taOrg.setName(taUser.getOrgName());
 			taOrg.setWaterMark(taUser.getWaterMark());
+			taOrg.setBuildingNum(taUser.getOrgNum());
 
 			if (taOrgMapper.updateById(taOrg) < 1) {
 				throw new Exception("更新用户公司信息失败");
 			}
+
+			addAndupdate(taUser.getSelectCityTree(),true,taOrg.getOrgId());
 		}
 		
 		taUser.setLoginPassword(null);
@@ -329,4 +408,24 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		
 		return taUser;
 	}
+
+    @Override
+    public ResponseBean cityTree() {
+	   ResponseBean responseBean = new ResponseBean<>();
+	    // 省份
+        TaUser taUser = new TaUser();
+	    QueryWrapper<TdCity> tdCityQueryWrapper= new  QueryWrapper<>();
+        tdCityQueryWrapper.eq("leveltype",1);
+        List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQueryWrapper);
+        taUser.setTdCityList(tdCityList);
+        for (TdCity tdCity: tdCityList){
+            // 根据parentid查询城市
+            QueryWrapper<TdCity> tdCityQuery= new  QueryWrapper<>();
+            tdCityQuery.eq("parentid",tdCity.getId());
+            List<TdCity> city= tdCityMapper.selectList(tdCityQuery);
+            tdCity.setChildren(city);
+        }
+        responseBean.addSuccess(taUser);
+        return responseBean;
+    }
 }

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

@@ -95,9 +95,14 @@ public class CommConstant {
     public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
     
     /**
-     * 注册经纪人
+     * 授权手机号
      */
     public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
+    
+    /**
+     * 拼团
+     */
+    public final static String POINTS_CHANGE_GROUP = "group";
 
     /**
      * 推荐客户
@@ -434,17 +439,37 @@ public class CommConstant {
      * 消息通知
      * 必须存在表   td_miniapp_template_type 中
      */
-	public static final String MINIAPP_TPL_NOTICE = "notice";
+    public static final String MINIAPP_TPL_NOTICE = "notice";
     
     /**
      * 助力通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_HELP = "help.result";
+    public static final String MINIAPP_TPL_HELP = "help-result";
     
     /**
      * 拼团通知
      * 必须存在表   td_miniapp_template_type 中
      */
-    public static final String MINIAPP_TPL_GROUP = "group.result";
+    public static final String MINIAPP_TPL_GROUP = "group-result";
+    
+    /**
+     * 活动以结束
+     */
+    public static final Integer ACTIVITY_STATUS_FINISH = 2;
+    
+    /**
+     * 客户统计类型：跟进客户
+     */
+	public static final String CUSTOMER_TYPE_FOLLOW = "follow";
+    
+    /**
+     * 客户统计类型：新增客户
+     */
+    public static final String CUSTOMER_TYPE_NEW = "new";
+    
+    /**
+     * 客户统计类型：到访客户
+     */
+    public static final String CUSTOMER_TYPE_VISITE = "visite";
 }

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

@@ -6,6 +6,7 @@ import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +24,9 @@ public class CommonController {
     @Autowired
     SMSUtils smsUtils;
 
+    @Autowired
+    ITdMiniappTemplateTypeService iTdMiniappTemplateTypeService;
+
     /**
      * 图片上传
      * @param multipartFile
@@ -74,6 +78,11 @@ public class CommonController {
         }
     }
 
+    @GetMapping("/center/dict/templateType")
+    public ResponseBean getAllTplTypes() {
+        return ResponseBean.success(iTdMiniappTemplateTypeService.getAllTypes());
+    }
+
     @GetMapping("/wx/awesome/dict/{typeFor}")
     public ResponseBean dicts(@PathVariable String typeFor) {
 

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

@@ -110,7 +110,7 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, name = "endDate", paramType = "query", value = "活动结束时间"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "activityStatus", paramType = "query", value = "活动状态")
     })
-    @RequestMapping(value = "admin/helpActivity/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/helpActivity/list", method = RequestMethod.GET)
     public ResponseBean helpActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
@@ -125,11 +125,35 @@ public class HelpActivityController extends BaseController {
         return helpActivityList;
     }
 
+    /**
+     * 活动助力列表
+     *
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @ApiOperation(value = "活动助力列表 已开始 和 未开始", notes = "活动助力列表 已开始 和 未开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "cityId", paramType = "query", value = "城市"),
+    })
+    @RequestMapping(value = "/admin/helpActivityEffective/list", method = RequestMethod.GET)
+    public ResponseBean helpActivityEffectiveList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "cityId", required = false) Integer cityId,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId);
+        return helpActivityList;
+    }
+
     @ApiOperation(value = "活动助力新增", notes = "活动助力新增")
     @ApiImplicitParams({
             @ApiImplicitParam(dataType = "HelpActivity", name = "parameter", paramType = "body", value = "当前对象")
     })
-    @RequestMapping(value = "admin/helpActivity/add", method = RequestMethod.POST)
+    @RequestMapping(value = "/admin/helpActivity/add", method = RequestMethod.POST)
     public ResponseBean helpActivityAdd(@RequestBody String parameter, HttpServletRequest request) {
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
         ResponseBean responseBean = new ResponseBean();
@@ -177,6 +201,8 @@ public class HelpActivityController extends BaseController {
     public ResponseBean helpActivityUpdate(@RequestBody String parameter) {
         ResponseBean responseBean = new ResponseBean();
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
+        Integer cityId = iTaBuildingService.getCityById( helpActivity.getBuildingId());
+        helpActivity.setCityId(cityId);
         helpActivity.setHelpActivityId(helpActivity.getHelpActivityId());
         taHelpActivityService.helpActivityUpdate(helpActivity);
         return responseBean;
@@ -226,8 +252,11 @@ public class HelpActivityController extends BaseController {
             helpInitiateRecordQuery.eq("help_activity_id",helpActivityId);
                 List<HelpInitiateRecord> list= helpInitiateRecordMapper.selectList(helpInitiateRecordQuery);
                 for (HelpInitiateRecord helpInitiateRecord:list){
-                    helpInitiateRecord.setStatus(2);
-                    helpInitiateRecordMapper.updateById(helpInitiateRecord);
+                    // 助力成功的不更新。
+                    if (!helpInitiateRecord.getStatus().equals(0)) {
+                        helpInitiateRecord.setStatus(2);
+                        helpInitiateRecordMapper.updateById(helpInitiateRecord);
+                    }
                 }
         }
         Boolean isA = taHelpActivityService.updateById(helpActivity);
@@ -348,7 +377,7 @@ public class HelpActivityController extends BaseController {
     }
 
     /**
-     * 助力活动发起人
+     * 助力活动查询当前助力者记录
      *
      * @param request
      * @param response
@@ -441,6 +470,11 @@ public class HelpActivityController extends BaseController {
                 helpRecordQueryWrapper.eq("help_activity_id",helpActivity.getHelpActivityId());
                 helpRecordQueryWrapper.eq("help_record_initiate_id",helpInitiateRecord.getHelpRecordInitiateId());
                 List<HelpRecord> helpRecordList = helpRecordService.list(helpRecordQueryWrapper);
+                helpRecordList.forEach(e -> {
+                    if (e.getPersonId().equals(person.getPersonId())){
+                        map.put("isJoin",true);
+                    }
+                });
         
                 map.put("helpInitiateRecord",helpInitiateRecord);
                 map.put("helpRecordList",helpRecordList);
@@ -455,7 +489,7 @@ public class HelpActivityController extends BaseController {
             map.put("postList",postList);
     
             QueryWrapper<TdPosterTemplate> tdPosterTemplateQueryWrapper = new QueryWrapper<>();
-            tdPosterTemplateQueryWrapper.eq("org_id",orgId);
+            //tdPosterTemplateQueryWrapper.eq("org_id",orgId);
             tdPosterTemplateQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             tdPosterTemplateQueryWrapper.eq("type",CommConstant.HELP_ACTIVITY);
             List<TdPosterTemplate> posterTemplateList = tdPosterTemplateService.list(tdPosterTemplateQueryWrapper);
@@ -480,13 +514,14 @@ public class HelpActivityController extends BaseController {
     @ApiOperation(value = "微信端查询拼团和助力推首页的活动的", notes = "微信端查询拼团和助力推首页的活动的")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "buildingId", paramType = "query", value = "活动状态"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "1助力，2拼团")
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "1助力，2拼团"),
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "type", paramType = "query", value = "cityId首页专用")
     })
     @RequestMapping(value = "/wx/helpActivityAndGroup", method = RequestMethod.GET)
     public ResponseBean wxhelpActivityAndGroup(HttpServletRequest request,
-                                               @RequestParam(value = "buildingId",required = false) Integer buildingId,
-                                               @RequestParam(value = "type",required = false)Integer type) {
-            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),type,buildingId);
+                                               @RequestParam(value = "buildingId",required = false) String buildingId,
+                                               @RequestParam(value = "cityId",required = false) String cityId) {
+            ResponseBean lsit = taHelpActivityService.wxhelpActivityAndGroup(getOrgId(request),buildingId,cityId);
                 return lsit;
         }
 

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

@@ -6,9 +6,13 @@ 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.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
+import com.huiju.estateagents.entity.HelpRecord;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.IHelpActivityService;
 import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
 import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,7 +27,10 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -44,8 +51,13 @@ public class HelpInitiateRecordController extends BaseController {
     
     @Autowired
     private ITaPersonService taPersonService;
-
-
+    
+    @Autowired
+    public IHelpRecordService helpRecordService;
+    
+    @Autowired
+    public IHelpActivityService taHelpActivityService;
+    
     /**
      * 分页查询列表
      * @param pageNum
@@ -164,7 +176,7 @@ public class HelpInitiateRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/helpInitiateRecord",method= RequestMethod.GET)
-    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxhelpInitiateRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         String openid = getOpenId(request);
@@ -202,6 +214,14 @@ public class HelpInitiateRecordController extends BaseController {
             return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
+        Map<String,Object> map = new HashMap<>();
+        HelpActivity helpActivity = taHelpActivityService.getById(helpInitiateRecord.getHelpActivityId());
+        if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+            return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+            return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         try {
  
             //查看是否发起过助力
@@ -212,7 +232,14 @@ public class HelpInitiateRecordController extends BaseController {
             helpInitiateRecordQueryWrapper.ne("status",-1);
             HelpInitiateRecord recordServiceOne = taHelpInitiateRecordService.getOne(helpInitiateRecordQueryWrapper);
             if (null != recordServiceOne){
-                responseBean.addSuccess(recordServiceOne);
+                map.put("helpInitiateRecord",recordServiceOne);
+                QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
+                helpRecordQueryWrapper.eq("help_activity_id",helpInitiateRecord.getHelpActivityId());
+                helpRecordQueryWrapper.eq("org_id",orgId);
+                helpRecordQueryWrapper.eq("help_record_initiate_id",recordServiceOne.getHelpRecordInitiateId());
+                List<HelpRecord> list = helpRecordService.list(helpRecordQueryWrapper);
+                map.put("helpRecordList",list);
+                responseBean.addSuccess(map);
                 return responseBean;
             }
  
@@ -222,7 +249,9 @@ public class HelpInitiateRecordController extends BaseController {
             helpInitiateRecord.setOrgId(orgId);
             helpInitiateRecord.setStatus(1);
             if (taHelpInitiateRecordService.save(helpInitiateRecord)){
-                responseBean.addSuccess(helpInitiateRecord);
+                map.put("helpInitiateRecord",helpInitiateRecord);
+                map.put("helpRecordList",new ArrayList<>());
+                responseBean.addSuccess(map);
             }else {
                 responseBean.addError("fail");
             }

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

@@ -114,6 +114,7 @@ public class MiniAppController extends BaseController {
             miniResp.put("openid", session.getOpenid());
             miniResp.put("sessionKey", session.getSessionKey());
             miniResp.put("unionid", session.getUnionid());
+            miniResp.put("name",miniapp.getName());
 
             //如果是分享进来且没有进入过小程序，给分享人发放积分
             QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
@@ -197,7 +198,6 @@ public class MiniAppController extends BaseController {
                     taSharePersonFrom.setIsFirstTime(true);
                 }
                 taSharePersonFromService.save(taSharePersonFrom);
-
             }
 
             taPerson.setPassword(null);
@@ -248,7 +248,7 @@ public class MiniAppController extends BaseController {
     public ResponseBean info(@RequestBody String paramStr, HttpServletRequest request) {
         String appid = request.getHeader("appid");
         TaPerson person = null;
-
+        TaMiniapp miniapp = taMiniappService.getById(appid);
         if (null == paramStr || "".equals(paramStr.trim()) || "{}".equals(paramStr.trim())) {
             String openid = getOpenId(request);
             List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
@@ -292,6 +292,7 @@ public class MiniAppController extends BaseController {
         Map<String, Object> result = new HashMap<>();
         result.put("person", person);
         result.put("extraInfo", extraInfo);
+        result.put("miniApp",miniapp);
 
         return ResponseBean.success(result);
     }

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

@@ -332,12 +332,13 @@ public class TaBuildingController extends BaseController {
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
     public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,HttpServletRequest request){
         String openid = getOpenId(request);
+        Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
         if (null == persons || persons.size() == 0) {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = persons.get(0);
-        return taBuildingService.buildingAllSelectId(id,person.getPersonId());
+        return taBuildingService.buildingAllSelectId(id,person.getPersonId(), orgId);
     }
     /**
      * 查询当前所有项目

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

@@ -92,6 +92,9 @@ public class TaBuildingDynamicController extends BaseController {
 
     @Autowired
     private TaMiniappQrcodeMapper taMiniappQrcodeMapper;
+    
+    @Autowired
+    private ITaPointsRecordsService taPointsRecordsService;
 
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
@@ -132,7 +135,7 @@ public class TaBuildingDynamicController extends BaseController {
 
     /**
      * 活动列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @param request
      * @return
@@ -161,7 +164,7 @@ public class TaBuildingDynamicController extends BaseController {
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
             TaPerson person = taPersons.get(0);
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
         }else {
             responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
         }
@@ -200,8 +203,23 @@ public class TaBuildingDynamicController extends BaseController {
                 QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
                 buildingDynamicQueryWrapper.in("dynamic_id",ids);
                 IPage<TaBuildingDynamic> buildingDynamicIPage = iBuildingDynamicService.page(page,buildingDynamicQueryWrapper);
+    
+                //查询是否报名了普通活动
+                QueryWrapper<TaActivityDynamicEnlist> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("org_id",getOrgId(request));
+                queryWrapper.eq("person_id",person.getPersonId());
+                List<TaActivityDynamicEnlist> taActivityDynamicEnlists = taActivityDynamicEnlistMapper.selectList(queryWrapper);
+                
                 for(int j=0;j<buildingDynamicIPage.getRecords().size();j++){
                     iBuildingDynamicService.setExtendInfo(buildingDynamicIPage.getRecords().get(j),person);
+                    
+                    //是否已参与状态
+                    TaBuildingDynamic taBuildingDynamic = buildingDynamicIPage.getRecords().get(j);
+                    taActivityDynamicEnlists.forEach(dynamic -> {
+                        if (taBuildingDynamic.getDynamicId().equals(dynamic.getDynamicId())){
+                            taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
+                        }
+                    });
                 }
                 responseBean.addSuccess(buildingDynamicIPage);
             }else {
@@ -260,7 +278,7 @@ public class TaBuildingDynamicController extends BaseController {
         Map<String,Object>data = new HashMap<>();
         TaActivityDynamicEnlist enlist = new TaActivityDynamicEnlist();
         if(enlists.size()>0){
-            enlist=enlists.get(0);
+            enlist = enlists.get(0);
         }
         data.put("enlist",enlist);
         data.put("dynamic",buildingDynamic);
@@ -286,10 +304,14 @@ public class TaBuildingDynamicController extends BaseController {
        TaActivityDynamicEnlist enlist = taActivityDynamicEnlistMapper.selectById(enlistId);
        try{
            if(null != enlist){
+               Integer tempIsCheckin = enlist.getIsCheckin();
                enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
-                   if (enlist.getIsCheckin().equals(CommConstant.STATUS_UNACCALIMED)){
+                   if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
+                       enlist.setEnlistId(Integer.valueOf(enlistId));
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
+                       Integer rulePoints = taPointsRecordsService.getRulePoints(CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN, getOrgId(request));
+                       enlist.setAddPoints(rulePoints);
                        responseBean.addSuccess(enlist);
                    }else {
                        responseBean.addError("您已签到过");
@@ -378,11 +400,13 @@ public class TaBuildingDynamicController extends BaseController {
         dynamic.setOrgId(getOrgId(request));
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
-        //发布状态
-        dynamic.setStatus(0);
-        //活动状态
+        //发布状态 1展示
+        dynamic.setStatus(1);
+        //活动状态，如果不需要报名则直接置为进行中
         dynamic.setActivityStatus(1);
-//        dynamic.setDynamicId(idGen.nextId()+"");
+        if (dynamic.getIsEnlist() == 0){
+            dynamic.setActivityStatus(0);
+        }
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
 
@@ -391,8 +415,9 @@ public class TaBuildingDynamicController extends BaseController {
         taMiniappQuery.eq("org_id",getOrgId(request));
         TaMiniapp taMiniapp = taMiniappMapper.selectOne(taMiniappQuery);
         iBuildingDynamicService.save(dynamic);
-        TaMiniappQrcode taMiniappQrcode = miniAppService.createActivityQrcode(taMiniapp.getMiniappId(),CommConstant.ACTIVITY_QRCODE.replace("#0",dynamic.getDynamicId()).replace("#1","activity"));
-        dynamic.setQrCode(taMiniappQrcode.getQrCode());
+        // 生成二维码
+        ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.ACTIVITY_QRCODE.replace("#0",dynamic.getDynamicId()).replace("#1","activity"),taMiniapp.getMiniappId());
+        dynamic.setQrCode(String.valueOf(taMiniappQrcode.getData()));
         iBuildingDynamicService.updateById(dynamic);
         responseBean.addSuccess(dynamic);
         return responseBean;
@@ -410,6 +435,15 @@ public class TaBuildingDynamicController extends BaseController {
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
+        if (dynamic.getIsEnlist() == 0 || (LocalDateTime.now().isAfter(dynamic.getEnlistStart()) && LocalDateTime.now().isBefore(dynamic.getEnlistEnd()))){
+            dynamic.setActivityStatus(0);
+        }
+        if (dynamic.getEnlistStart() != null && LocalDateTime.now().isBefore(dynamic.getEnlistStart())){
+            dynamic.setActivityStatus(1);
+        }
+        if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
+            dynamic.setActivityStatus(2);
+        }
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamic.getDynamicId());
         iBuildingDynamicService.update(dynamic, buildingDynamicQueryWrapper);
         return responseBean;
@@ -546,7 +580,6 @@ public class TaBuildingDynamicController extends BaseController {
         if ("1".equals(top)) {
             dynamic.setCreateDate(LocalDateTime.now());
         } else {
-            dynamic.setIsEnlist(0);
             dynamic.setActivityStatus(2);
         }
         iBuildingDynamicService.update(dynamic, taBuildingDynamic);

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

@@ -91,7 +91,7 @@ public class TaBuildingReportController extends BaseController {
                 list.add(taBuildingReport);
             });
             //先删除在添加
-            iTaBuildingReportService.deleteAll();
+            iTaBuildingReportService.deleteAll(orgId);
             if (iTaBuildingReportService.saveBatch(list)){
                 responseBean.addSuccess("保存成功");
             }else {

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

@@ -227,9 +227,9 @@ public class TaChannelController extends BaseController {
     }
 
     /**
-     * 渠道邀请经纪人
+     * 渠道邀请经纪人列表
      */
-    @ApiOperation(value = "渠道邀请经纪人", notes = "渠道邀请经纪人")
+    @ApiOperation(value = "渠道邀请经纪人列表", notes = "渠道邀请经纪人列表")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "query",value = "姓名"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "phone", paramType = "query",value = "电话"),

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

@@ -6,18 +6,19 @@ 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.TaApartmentImg;
-import com.huiju.estateagents.entity.TaDocumentImg;
-import com.huiju.estateagents.entity.TaDocumentVerify;
-import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.service.ITaDocumentImgService;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
 import com.huiju.estateagents.service.ITaPersonService;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -65,10 +66,40 @@ public class TaDocumentVerifyController extends BaseController {
                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                            @RequestParam(value ="name",required = false) String name,
                                            @RequestParam(value ="tel",required = false) String tel,
+                                           @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime startDate,
+                                           @RequestParam(value = "endDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime endDate,
                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            IPage<TaDocumentVerify> result = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,name,tel,getOrgId(request));
+            responseBean = iTaDocumentVerifyService.getAdminDocumentList(pageNum,pageSize,name,tel,getOrgId(request),startDate,endDate);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("documentVerifyList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 微信查询我的审核列表
+     * @return
+     */
+    @RequestMapping(value="/wx/documentVerify/list",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyList(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        try {
+            QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("person_id",person.getPersonId());
+            queryWrapper.eq("org_id",orgId);
+            queryWrapper.orderByAsc("verify_status");
+            List<TaDocumentVerify>result = iTaDocumentVerifyService.list(queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -80,11 +111,11 @@ public class TaDocumentVerifyController extends BaseController {
 
     /**
      * 保存对象
-     * @param list List<TaDocumentImg>
+     * @param documentVerify List<TaDocumentImg>
      * @return
      */
     @RequestMapping(value="/wx/documentVerify",method= RequestMethod.POST)
-    public ResponseBean wxDocumentVerifyAdd(@RequestBody List<TaDocumentImg>list, HttpServletRequest request){
+    public ResponseBean wxDocumentVerifyAdd(@RequestBody TaDocumentVerify documentVerify, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         String openid = getOpenId(request);
@@ -93,12 +124,12 @@ public class TaDocumentVerifyController extends BaseController {
             return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        TaDocumentVerify documentVerify = new TaDocumentVerify();
         documentVerify.setCreateDate(LocalDateTime.now());
         documentVerify.setOrgId(orgId);
         documentVerify.setPersonId(person.getPersonId());
         documentVerify.setStatus(CommConstant.STATUS_NORMAL);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        List<TaDocumentImg>list = documentVerify.getImgList();
         try {
             if (iTaDocumentVerifyService.save(documentVerify)){
                 for(int i =0; i<list.size();i++){
@@ -148,15 +179,11 @@ public class TaDocumentVerifyController extends BaseController {
      * 微信查询对象
      * @return
      */
-    @RequestMapping(value="/wx/documentVerify",method= RequestMethod.GET)
-    public ResponseBean wxDocumentVerifyUpdate(HttpServletRequest request){
+    @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.GET)
+    public ResponseBean wxDocumentVerifyGetThis(@PathVariable Integer id,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
-        String personId = getPersonId(request);
         Integer orgId = getOrgId(request);
-        QueryWrapper<TaDocumentVerify> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("person_id", personId);
-        queryWrapper.eq("org_id", orgId);
-        TaDocumentVerify verify = iTaDocumentVerifyService.getOne(queryWrapper);
+        TaDocumentVerify verify = iTaDocumentVerifyService.getById(id);
         if (null != verify) {
             QueryWrapper<TaDocumentImg> documentImgQueryWrapper = new QueryWrapper<>();
             documentImgQueryWrapper.eq("document_verify_id", verify.getDocumentVerifyId());
@@ -173,12 +200,11 @@ public class TaDocumentVerifyController extends BaseController {
     /**
      * 微信修改对象
      * @param id  实体ID
-     * @param list List<TaDocumentImg>
      * @return
      */
     @RequestMapping(value="/wx/documentVerify/{id}",method= RequestMethod.PUT)
     public ResponseBean wxDocumentVerifyUpdate(@PathVariable Integer id,
-                                               @RequestBody List<TaDocumentImg>list,
+                                               @RequestBody TaDocumentVerify documentVerify,
                                                HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
@@ -188,8 +214,9 @@ public class TaDocumentVerifyController extends BaseController {
             return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = taPersons.get(0);
-        TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
+        documentVerify.setDocumentVerifyId(id);
         documentVerify.setVerifyStatus(CommConstant.VERIFY_READY);
+        List<TaDocumentImg>list = documentVerify.getImgList();
         try {
             if (iTaDocumentVerifyService.updateById(documentVerify)){
                 QueryWrapper<TaDocumentImg>queryWrapper = new QueryWrapper<>();
@@ -227,9 +254,8 @@ public class TaDocumentVerifyController extends BaseController {
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         if (documentVerify.getVerifyStatus().equals(CommConstant.STATUS_NORMAL)){
-            String personId = getPersonId(request);
-            TaPerson person = taPersonService.getById(personId);
-            documentVerify.setVerifyUser(person.getUserId().toString());
+            Integer userId = getUserId(request);
+            documentVerify.setVerifyUser(userId.toString());
         }
         try {
             documentVerify.setDocumentVerifyId(id);
@@ -261,15 +287,13 @@ public class TaDocumentVerifyController extends BaseController {
      * @param id  实体ID
      */
     @RequestMapping(value="/admin/documentVerify/{id}",method= RequestMethod.GET)
-    public ResponseBean documentVerifyGet(@PathVariable Integer id){
+    public ResponseBean documentVerifyGet(@PathVariable String id,
+                                          @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "5") Integer pageSize,
+                                          HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            TaDocumentVerify documentVerify = iTaDocumentVerifyService.getById(id);
-            QueryWrapper<TaDocumentImg>imgList = new QueryWrapper<>();
-            imgList.eq("document_verify_id",documentVerify.getDocumentVerifyId());
-            imgList.orderByAsc("sort");
-            List<TaDocumentImg>list = documentImgService.list(imgList);
-            documentVerify.setImgList(list);
+            IPage<TaDocumentVerify> documentVerify = iTaDocumentVerifyService.getDocumentVerifyList(pageNum,pageSize,id,getOrgId(request));
             responseBean.addSuccess(documentVerify);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -56,6 +56,7 @@ public class TaEventPropertiesController extends BaseController {
             QueryWrapper<TaEventProperties> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(!StringUtils.isEmpty(eventType), "event_type", eventType);
             queryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
+            queryWrapper.groupBy("event_type");
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaEventProperties> result = iTaEventPropertiesService.page(pg, queryWrapper);

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

@@ -237,13 +237,13 @@ public class TaGoodsController extends BaseController {
 
     @ApiOperation(value = "微信 查询有商品的项目", notes = "微信 查询有商品的项目")
     @GetMapping(value = "/wx/goodsToBuilding")
-    public ResponseBean wxGoodsToBuilding(HttpServletRequest request) {
-        return iTaBuildingService.getBuildingListById(getOrgId(request));
+    public ResponseBean wxGoodsToBuilding(@RequestParam(value = "cityId", required = false) Integer cityId, HttpServletRequest request) {
+        return iTaBuildingService.getBuildingListById(getOrgId(request),cityId);
     }
 
     /**
      * 分页查询列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
@@ -257,6 +257,7 @@ public class TaGoodsController extends BaseController {
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                     @RequestParam(value = "buildingId",required = false) String buildingId,
+                                    @RequestParam(value = "cityId", required = false) Integer cityId,
                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
@@ -277,6 +278,9 @@ public class TaGoodsController extends BaseController {
             if (null != orgId){
                 queryWrapper.eq("org_id", orgId);
             }
+            if (null != cityId){
+                queryWrapper.eq("city_id", cityId);
+            }
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
             

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

@@ -99,8 +99,9 @@ public class TaPersonController extends BaseController {
     @PutMapping("/wx/registerConsultant")
     public ResponseBean registerConsultant(HttpServletRequest request,@RequestParam String phone,@RequestParam String code) {
         ResponseBean responseBean = new ResponseBean();
-        if(smsUtils.checkCaptcha(phone,code)){
+        if(!smsUtils.checkCaptcha(phone,code)){
             responseBean.addError("验证码错误。");
+            return responseBean;
         }
         Integer orgId =getOrgId(request);
         String openid = getOpenId(request);
@@ -127,10 +128,13 @@ public class TaPersonController extends BaseController {
             person.setDepartment(user.getDepartment());
             person.setPost(user.getPosition());
             person.setPhoto(user.getPhoto());
+            if(StringUtils.isEmpty(person.getPhone())){
+                person.setPhone(user.getPhone());
+            }
             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {
-            responseBean.addError("手机号不存在。");
+            responseBean.addError("此手机号未录入到后台系统，请联系营销云管理员。");
         }
         return responseBean;
     }
@@ -161,7 +165,11 @@ public class TaPersonController extends BaseController {
             person.setPersonType(CommConstant.PERSON_ESTATE_CHANNEL);
             QueryWrapper<TaChannel> queryWrapper = new QueryWrapper();
             queryWrapper.eq("channel_code",channelCode);
+            queryWrapper.eq("org_id",orgId);
             TaChannel channel = taChannelService.getOne(queryWrapper);
+            if (null == channel){
+                return ResponseBean.error("渠道码不存在",ResponseBean.ERROR_UNAVAILABLE);
+            }
             QueryWrapper<TaChannelPerson>taChannelPersonQueryWrapper = new QueryWrapper<>();
             taChannelPersonQueryWrapper.eq("person_id",person.getPersonId());
             taChannelPersonQueryWrapper.eq("channel_id",channel.getChannelId());
@@ -360,38 +368,38 @@ public class TaPersonController extends BaseController {
      * @param paramStr
      * @return
      */
-    @PostMapping("/admin/signin")
-    public ResponseBean signin(@RequestBody String paramStr) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        if (params == null) {
-            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
-        }
-
-        String userPhone = params.getString("phone");
-        String userCaptcha = params.getString("captcha");
-
-        // todo
-        if (!"1234".equals(userCaptcha)) {
-            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        TaPerson taPerson = taPersonService.getPersonByTel(userPhone);
-        if (taPerson == null) {
-            return ResponseBean.error("手机号不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        if (taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
-            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        String token = JWTUtils.newToken(taPerson.getPersonId());
-
-        Map<String, Object> result = new HashMap<>();
-        result.put("token", token);
-        result.put("person", taPerson);
-
-        return ResponseBean.success(result);
-    }
+//    @PostMapping("/admin/signin")
+//    public ResponseBean signin(@RequestBody String paramStr) {
+//        JSONObject params = JSONObject.parseObject(paramStr);
+//        if (params == null) {
+//            return ResponseBean.error("非法参数", ResponseBean.ERROR_MISSING_PARAMS);
+//        }
+//
+//        String userPhone = params.getString("phone");
+//        String userCaptcha = params.getString("captcha");
+//
+//        // todo
+//        if (!"1234".equals(userCaptcha)) {
+//            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//
+//        TaPerson taPerson = taPersonService.getPersonByTel(userPhone);
+//        if (taPerson == null) {
+//            return ResponseBean.error("手机号不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+//
+//        if (taPerson.getStatus() != CommConstant.STATUS_NORMAL) {
+//            return ResponseBean.error("用户状态异常", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//
+//        String token = JWTUtils.newToken(taPerson.getPersonId());
+//
+//        Map<String, Object> result = new HashMap<>();
+//        result.put("token", token);
+//        result.put("person", taPerson);
+//
+//        return ResponseBean.success(result);
+//    }
 
     /**
      * 获取当前用户
@@ -426,6 +434,32 @@ public class TaPersonController extends BaseController {
         return ResponseBean.success(taPersonIPage);
     }
 
+    @GetMapping("/admin/building/consultant")
+    public ResponseBean getBuildingConsultantList(
+            Integer pageNumber,
+            Integer pageSize,
+            String buildingId
+    ) {
+        if (null == pageNumber) pageNumber = 1;
+        if (null == pageSize) pageSize = 10;
+
+        IPage<TaUser> taPersonIPage = taPersonService.getBuildingConsultantList(pageNumber,pageSize,buildingId);
+        return ResponseBean.success(taPersonIPage);
+    }
+
+    @GetMapping("/wx/building/consultant")
+    public ResponseBean getWxBuildingConsultantList(
+            Integer pageNumber,
+            Integer pageSize,
+            String buildingId
+    ) {
+        if (null == pageNumber) pageNumber = 1;
+        if (null == pageSize) pageSize = 10;
+
+        IPage<TaUser> taPersonIPage = taPersonService.getBuildingConsultantList(pageNumber,pageSize,buildingId);
+        return ResponseBean.success(taPersonIPage);
+    }
+
     @GetMapping("/admin/consultant/{id}")
     public ResponseBean getConsultant(@PathVariable String id) {
         TaPerson taPerson = taPersonService.getById(id);
@@ -469,6 +503,12 @@ public class TaPersonController extends BaseController {
         }
         if (!StringUtils.isEmpty(phone)){
             person.setTel(phone);
+            if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
+                TaUser user = taUserService.getById(person.getUserId());
+                user.setPhone(phone);
+                user.setLoginName(phone);
+                taUserService.updateById(user);
+            }
         }
         try{
             if(taPersonService.updateById(person)){
@@ -521,6 +561,12 @@ public class TaPersonController extends BaseController {
     @RequestMapping(value="/wx/customer/recommend/becomeChannel",method= RequestMethod.PUT)
     public ResponseBean taRecommendAgentBecomeChannel(@RequestParam(required = false) String channelCode,HttpServletRequest request,@RequestParam("personType")String personType){
         ResponseBean responseBean = new ResponseBean();
+
+        if (org.apache.commons.lang3.StringUtils.isBlank(personType)) {
+            responseBean.addSuccess("personType为空");
+            return responseBean;
+        }
+
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
@@ -531,6 +577,7 @@ public class TaPersonController extends BaseController {
             if(CommConstant.PERSON_ESTATE_CHANNEL.equals(personType)){
                 QueryWrapper<TaChannel>channelQueryWrapper = new QueryWrapper<>();
                 channelQueryWrapper.eq("channel_code",channelCode);
+                channelQueryWrapper.eq("org_id",getOrgId(request));
                 QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
                 List<TaChannel> channel = taChannelService.list(channelQueryWrapper);
                 if(channel.size()>0){
@@ -548,7 +595,7 @@ public class TaPersonController extends BaseController {
                     channelPerson.setStatus(CommConstant.STATUS_NORMAL);
                     taChannelPersonService.save(channelPerson);
                 }else {
-                    responseBean.addError("渠道码错误");
+                    return ResponseBean.error("渠道码错误", ResponseBean.ERROR_UNAVAILABLE);
                 }
 
             }else {

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

@@ -95,6 +95,7 @@ public class TaPointsExchangeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             if (null != taPointsExchange.getStatus() && !taPointsExchange.getStatus().equals(CommConstant.STATUS_NORMAL)){
+                taPointsExchange.setVerifyDate(LocalDateTime.now());
                 taPointsExchange.setStatus(CommConstant.STATUS_NORMAL);
             }
             if (iTaPointsExchangeService.updateById(taPointsExchange)){

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

@@ -120,7 +120,16 @@ public class TaPointsRecordsController extends BaseController {
                         result.getRecords().get(i).setRecordName("推荐客户");
                         break;
                     case CommConstant.POINTS_CHANGE_SIGNUP_AGENT:
-                        result.getRecords().get(i).setRecordName("注册经纪人");
+                        result.getRecords().get(i).setRecordName("授权手机号");
+                        break;
+                    case CommConstant.POINTS_CHANGE_GROUP:
+                        result.getRecords().get(i).setRecordName("拼团");
+                        break;
+                    case CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN:
+                        result.getRecords().get(i).setRecordName("活动签到");
+                        break;
+                    case CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY:
+                        result.getRecords().get(i).setRecordName("资料审核");
                         break;
                 }
             }

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

@@ -102,7 +102,7 @@ public class TaPolicyController extends BaseController {
     @RequestMapping(value="/wx/taPolicy",method= RequestMethod.GET)
     public ResponseBean taPolicyListCity(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value ="cityId", required = false) Integer cityId){
+                                         @RequestParam(value ="cityId", required = false) Integer cityId,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -110,6 +110,7 @@ public class TaPolicyController extends BaseController {
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("city_id",cityId);
             queryWrapper.eq("publish_status",CommConstant.IS_PUBLISH);
+            queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.orderByDesc("weight", "create_date");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
 
@@ -261,7 +262,12 @@ public class TaPolicyController extends BaseController {
     public ResponseBean taPolicyGetWx(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaPolicyService.getById(id));
+            TaPolicy policy = iTaPolicyService.getById(id);
+            if (null != policy) {
+                policy.setPvNum(policy.getPvNum() + 1);
+                iTaPolicyService.updateById(policy);
+            }
+            responseBean.addSuccess(policy);
         }catch (Exception e){
             logger.error("taPolicyDelete -=- {}",e.toString());
             responseBean.addError(e.getMessage());

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

@@ -1,14 +1,15 @@
 package com.huiju.estateagents.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.TaBuilding;
 import com.huiju.estateagents.entity.TaPoster;
-import com.huiju.estateagents.entity.TaPosterUsed;
-import com.huiju.estateagents.service.ITaPosterUsedService;
+import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.TaPosterService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -23,8 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * <p>
@@ -44,7 +43,8 @@ public class TaPosterController extends BaseController {
     public TaPosterService iPosterService;
 
     @Autowired
-    private ITaPosterUsedService taPosterUsedService;
+    private ITaBuildingService iTaBuildingService;
+
 
     /**
      * 分页查询列表
@@ -87,19 +87,9 @@ public class TaPosterController extends BaseController {
             poster.setOrgId(getOrgId(request));
             poster.setCreateDate(LocalDateTime.now());
             if (iPosterService.save(poster)) {
-                //添加模板和海报映射关系
-                if (poster.getTemplateIds().size() > 0){
-                    List<TaPosterUsed> taPosterUsedList = new ArrayList<>();
-                    poster.getTemplateIds().forEach(e -> {
-                        TaPosterUsed taPosterUsed = new TaPosterUsed();
-                        taPosterUsed.setCreateDate(LocalDateTime.now());
-                        taPosterUsed.setOrgId(getOrgId(request));
-                        taPosterUsed.setPosterId(poster.getPosterId());
-                        taPosterUsed.setTemplateId(e);
-                        taPosterUsedList.add(taPosterUsed);
-                    });
-                    taPosterUsedService.saveBatch(taPosterUsedList);
-                }
+
+                // 为了兼容 小程序3.0 -> v3.4的后端
+                updateBuildingPoster(poster);
                 responseBean.addSuccess(poster);
             } else {
                 responseBean.addError("fail");
@@ -112,6 +102,22 @@ public class TaPosterController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 项目添加海报的时候，往项目的 poster 字段插入一张图片
+     * 为了兼容 小程序3.0 -> v3.4的后端
+     * @param poster
+     */
+    private void updateBuildingPoster(TaPoster poster) {
+        // 项目添加海报的时候，往项目的 poster 字段插入一张图片
+        // 为了兼容 小程序3.0 -> v3.4的后端
+        if ("building".equals(poster.getTargetType())) {
+            UpdateWrapper<TaBuilding> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("building_id", poster.getTargetId());
+            updateWrapper.set("poster", poster.getPosterImg());
+            iTaBuildingService.update(updateWrapper);
+        }
+    }
+
     /**
      * 根据id删除对象
      *
@@ -144,30 +150,14 @@ public class TaPosterController extends BaseController {
      */
     @RequestMapping(value = "/admin/poster/{id}", method = RequestMethod.PUT)
     public ResponseBean posterUpdate(@PathVariable Integer id,
-                                     @RequestBody TaPoster poster, HttpServletRequest request) {
+                                     @RequestBody TaPoster poster) {
         ResponseBean responseBean = new ResponseBean();
         poster.setPosterId(id);
         try {
             if (iPosterService.updateById(poster)) {
-                //修改模板和海报映射关系
-                if (poster.getTemplateIds().size() > 0){
-                    //先删除映射关系
-                    QueryWrapper<TaPosterUsed> queryWrapper = new QueryWrapper<>();
-                    queryWrapper.eq("poster_id",poster.getPosterId());
-                    taPosterUsedService.remove(queryWrapper);
-                    
-                    //在添加映射关系
-                    List<TaPosterUsed> taPosterUsedList = new ArrayList<>();
-                    poster.getTemplateIds().forEach(e -> {
-                        TaPosterUsed taPosterUsed = new TaPosterUsed();
-                        taPosterUsed.setCreateDate(LocalDateTime.now());
-                        taPosterUsed.setOrgId(getOrgId(request));
-                        taPosterUsed.setPosterId(poster.getPosterId());
-                        taPosterUsed.setTemplateId(e);
-                        taPosterUsedList.add(taPosterUsed);
-                    });
-                    taPosterUsedService.saveBatch(taPosterUsedList);
-                }
+
+                // 为了兼容 小程序3.0 -> v3.4的后端
+                updateBuildingPoster(poster);
                 responseBean.addSuccess(poster);
             } else {
                 responseBean.addError("fail");

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

@@ -289,15 +289,15 @@ public class TaRecommendCustomerController extends BaseController {
                                          @RequestParam(value ="name",required = false) String name,
                                          @RequestParam(value ="tel",required = false) String tel,
                                          @RequestParam(value ="buildingId",required = false) String buildingId,
-                                         @RequestParam(value ="recommendName",required = false) String recommendName,
-                                         @RequestParam(value ="recommendTel",required = false) String recommendTel,
+                                         @RequestParam(value ="consultName",required = false) String consultName,
+                                         @RequestParam(value ="consultTel",required = false) String consultTel,
                                          @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                          @RequestParam(value ="entryType",required = false) String entryType,
                                          @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,recommendName,recommendTel,entryType,verifyStatus,sex, getOrgId(request)));
+            return ResponseBean.success(taRecommendCustomerService.getRecCustomerList(pageNumber,pageSize,buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex, getOrgId(request)));
         }catch (Exception e){
             e.printStackTrace();
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
@@ -511,7 +511,7 @@ public class TaRecommendCustomerController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getById(id);
-            if(null == taRecommendCustomer.getVerifyStatus()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
+            if(null == taRecommendCustomer.getVerifyStatus() || 0 == taRecommendCustomer.getVerifyStatus().intValue()){ // taRecommendCustomer.getVerifyStatus().equals(CommConstant.VERIFY_READY)
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
                 if(!StringUtils.isEmpty(verifyRemark)){
                     taRecommendCustomer.setVerifyRemark(verifyRemark);
@@ -519,6 +519,12 @@ public class TaRecommendCustomerController extends BaseController {
                         taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
                     }
                 }
+
+                // 审核不通过的时候，移除置业顾问选择
+                if (CommConstant.VERIFY_DISAGREE == verifyStatus) {
+                    taRecommendCustomer.setRealtyConsultant(null);
+                }
+
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){
 
                     // 审核通过增加积分
@@ -578,13 +584,22 @@ public class TaRecommendCustomerController extends BaseController {
      * 导出数据(报备客户)
      */
     @GetMapping("/admin/customer/recommend/report/export")
-    public void reportExport(HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public void reportExport(HttpServletRequest request,
+                             HttpServletResponse response,
+                             @RequestParam(value ="name",required = false) String name,
+                             @RequestParam(value ="tel",required = false) String tel,
+                             @RequestParam(value ="buildingId",required = false) String buildingId,
+                             @RequestParam(value ="consultName",required = false) String consultName,
+                             @RequestParam(value ="consultTel",required = false) String consultTel,
+                             @RequestParam(value ="entryType",required = false) String entryType,
+                             @RequestParam(value ="verifyStatus",required = false) String verifyStatus,
+                             @RequestParam(value = "sex",required = false)Integer sex) throws IOException {
 //        response.setContentType("application/vnd.ms-excel");
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
         response.setHeader("Content-disposition", "attachment;filename=报备客户.xlsx");
 
-        Integer count = taRecommendCustomerService.getRepCustomerReportCount(getOrgId(request));
+        Integer count = taRecommendCustomerService.getRepCustomerReportCount(buildingId,name,tel,consultName,consultTel,entryType,verifyStatus,sex,getOrgId(request));
 
         Integer pageCode = 0;
         Integer pageSize = 100;
@@ -596,7 +611,7 @@ public class TaRecommendCustomerController extends BaseController {
         WriteSheet writeSheet = EasyExcel.writerSheet("报备客户").build();
         List<ReporRecommendCustomer> recCustomerExport = null;
         do {
-            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(getOrgId(request), pageCode * pageSize, pageSize);
+            recCustomerExport = taRecommendCustomerService.getRepCustomerReportExport(buildingId, name, tel, consultName, consultTel, entryType, verifyStatus, sex, getOrgId(request), pageCode * pageSize, pageSize);
             excelWriter.write(recCustomerExport, writeSheet);
 
             pageCode ++;

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

@@ -70,7 +70,7 @@ public class TaShareActivityController extends BaseController {
     
     @Autowired
     private ITdPosterTemplateService tdPosterTemplateService;
-    
+
 
     /**
      * 分页查询列表
@@ -97,6 +97,30 @@ public class TaShareActivityController extends BaseController {
         return responseBean;
     }
 
+
+    /**
+     * 分页查询列表 已开始 和 未开始
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/taShareActivityEffective/list",method= RequestMethod.GET)
+    public ResponseBean taShareActivityList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="cityId",required = false)Integer cityId,
+                                            @RequestParam(value ="buildingId",required = false)String buildingId,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaShareActivityService.getEffectiveList(pageNum, pageSize, cityId, buildingId, getOrgId(request));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareActivityList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 保存对象
      * @param parameter 实体对象json格式
@@ -163,6 +187,8 @@ public class TaShareActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
+            Integer cityId = iTaBuildingService.getCityById(taShareActivity.getBuildingId());
+            taShareActivity.setCityId(cityId);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -233,6 +259,8 @@ public class TaShareActivityController extends BaseController {
             //0：进行中 1：未开始 2：已结束
             taShareActivity.setActivityStatus(2);
             taShareActivity.setGroupActivityId(id);
+            taShareRecordService.updateActivityProcessToEndByGroupActivityId(id);
+            taShareChildRecordService.updateActivityProcessToEndByGroupActivityId(id);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -323,6 +351,11 @@ public class TaShareActivityController extends BaseController {
                 childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
                 childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
                 List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
+                shareChildRecordList.forEach(e -> {
+                    if (e.getPersonId().equals(person.getPersonId())){
+                        map.put("isJoin",true);
+                    }
+                });
                 map.put("shareChildRecordList",shareChildRecordList);
             }
     
@@ -335,7 +368,7 @@ public class TaShareActivityController extends BaseController {
             map.put("postList",postList);
     
             QueryWrapper<TdPosterTemplate> tdPosterTemplateQueryWrapper = new QueryWrapper<>();
-            tdPosterTemplateQueryWrapper.eq("org_id",orgId);
+            //tdPosterTemplateQueryWrapper.eq("org_id",orgId);
             tdPosterTemplateQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             tdPosterTemplateQueryWrapper.eq("type",CommConstant.GROUP_ACTIVITY);
             List<TdPosterTemplate> posterTemplateList = tdPosterTemplateService.list(tdPosterTemplateQueryWrapper);

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

@@ -285,7 +285,7 @@ public class TaShareRecordController extends BaseController {
      * @return
      */
     @RequestMapping(value="/wx/taShareRecord",method= RequestMethod.GET)
-    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNumber,
+    public ResponseBean wxShareRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                  HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();

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

@@ -130,6 +130,15 @@ public class TdBuildingTypeController extends BaseController {
     public ResponseBean tdBuildingTypeAdd(@RequestBody TdBuildingType tdBuildingType, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            Integer count = iTdBuildingTypeService.count(queryWrapper);
+            if (count != null && count > 0) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
             tdBuildingType.setOrgId(getOrgId(request));
             if (iTdBuildingTypeService.save(tdBuildingType)){
                 responseBean.addSuccess(tdBuildingType);
@@ -186,6 +195,16 @@ public class TdBuildingTypeController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
 
+            QueryWrapper<TdBuildingType> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_type_name", tdBuildingType.getBuildingTypeName());
+            queryWrapper.eq("status", 1);
+            queryWrapper.eq("org_id", getOrgId(request));
+            TdBuildingType buildingType = iTdBuildingTypeService.getOne(queryWrapper);
+            if (buildingType != null && buildingType.getBuildingTypeId().intValue() != id.intValue()) {
+                responseBean.addError("已存在此类型");
+                return responseBean;
+            }
+
             // 如果是删除，状态为 -1
             if ( null != tdBuildingType.getStatus() && -1 == tdBuildingType.getStatus().intValue()) {
                 List<TaBuilding> taBuildings = taBuildingMapper.selectBuildingByBuildingTypeId(tdBuildingType.getBuildingTypeId());

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

@@ -70,7 +70,7 @@ public class TdPointsRulesController extends BaseController {
 		    IPage<TdPointsRules> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
             Integer orgId = getOrgId(request);
-            //queryWrapper.eq("org_id",orgId);
+            queryWrapper.eq("org_id",orgId);
             queryWrapper.orderByDesc("create_date");
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
             if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {

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

@@ -47,7 +47,7 @@ public class TdReportController extends BaseController {
      * @param pageSize
      * @return
      */
-    @ApiOperation(value = "后台客户留言列表", notes = "后台客户留言列表")
+    @ApiOperation(value = "后台报表列表", notes = "后台报表列表")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query",value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行")

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

@@ -8,12 +8,15 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
+import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.json.YamlJsonParser;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,6 +51,9 @@ public class TaDrainageController extends BaseController {
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private ITaDrainageRecordService iTaDrainageRecordService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -141,9 +147,17 @@ public class TaDrainageController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value="/admin/taDrainage/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taDrainageDelete(@PathVariable Integer id){
+    public ResponseBean taDrainageDelete(@PathVariable Integer id, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+
+            // 判断是否产生业务数据
+            TaDrainage drainage = iTaDrainageService.getById(id);
+            if (null != drainage.getEnlistNum() && drainage.getEnlistNum().intValue() > 0) {
+                responseBean.addError("此H5项目已有用户提交数据，删除项目会删除全部数据，且已发布H5页面再提交内容会报错，不建议删除数据。可以点击项目名称修改截止时间为过去时间来禁用项目。");
+                return responseBean;
+            }
+
             if(iTaDrainageService.removeById(id)){
                 responseBean.addSuccess("success");
             }else {

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

@@ -13,8 +13,10 @@ import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
 import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
@@ -34,6 +36,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -60,6 +63,8 @@ public class TaDrainageRecordController extends BaseController {
     @Autowired
     public ITaThirdPartyMiniappConfigService iTaThirdPartyMiniappConfigService;
 
+    @Autowired
+    private ITaDrainageService taDrainageService;
     /**
      * 分页查询列表
      * @param pageNum
@@ -70,8 +75,8 @@ public class TaDrainageRecordController extends BaseController {
     public ResponseBean taDrainageRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                              @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                              @RequestParam(value = "drainageId") Integer drainageId,
-                                             @RequestParam(value = "startTime",required = false) String startTime,
-                                             @RequestParam(value = "endTime",required = false) String endTime,
+                                             @RequestParam(value = "startTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate startTime,
+                                             @RequestParam(value = "endTime",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate endTime,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -80,8 +85,8 @@ public class TaDrainageRecordController extends BaseController {
             QueryWrapper<TaDrainageRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("drainage_id",drainageId);
             queryWrapper.eq("org_id",getOrgId(request));
-            queryWrapper.gt(!StringUtils.isEmpty(startTime),"create_date",startTime);
-            queryWrapper.lt(!StringUtils.isEmpty(endTime),"create_date",endTime);
+            queryWrapper.gt(null != startTime,"create_date",startTime);
+            queryWrapper.lt(null != endTime,"create_date",endTime);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaDrainageRecord> result = iTaDrainageRecordService.page(pg, queryWrapper);
@@ -263,11 +268,30 @@ public class TaDrainageRecordController extends BaseController {
             JSONObject jsonParse = JSONObject.parseObject(jsonString);
             TaDrainageRecord taDrainageRecord = new TaDrainageRecord();
             taDrainageRecord.setContent(jsonParse.getString("content"));
-            taDrainageRecord.setPhone(jsonParse.getString("phone"));
-            taDrainageRecord.setUserName(jsonParse.getString("userName"));
+            JSONArray jsonArray = jsonParse.getJSONArray("content");
+            jsonArray.forEach(e -> {
+                JSONObject jsonObject = (JSONObject)e;
+                if (jsonObject.getString("key").equals("phone")){
+                    taDrainageRecord.setPhone(jsonParse.getString("phone"));
+                }
+                if (jsonObject.getString("key").equals("userName")){
+                    taDrainageRecord.setUserName(jsonParse.getString("userName"));
+                }
+            });
+            
             taDrainageRecord.setCreateDate(LocalDateTime.now());
             taDrainageRecord.setDrainageId(taThirdPartyMiniappConfig.getTargetId());
+            taDrainageRecord.setOrgId(taThirdPartyMiniappConfig.getOrgId());
+            //获取buildingID
+            TaDrainage taDrainage = taDrainageService.getById(taThirdPartyMiniappConfig.getTargetId());
+            taDrainageRecord.setBuildingId(taDrainage.getBuildingId());
             if (iTaDrainageRecordService.save(taDrainageRecord)){
+                //反更新enlist_num字段
+                if (null == taDrainage.getEnlistNum()){
+                    taDrainage.setEnlistNum(0);
+                }
+                taDrainage.setEnlistNum(taDrainage.getEnlistNum() + 1);
+                taDrainageService.updateById(taDrainage);
                 return ResponseBean.success(taDrainageRecord);
             }
         }catch (Exception e){

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

@@ -115,7 +115,12 @@ public class HelpActivity implements Serializable {
      * 活动状态
      */
     private Integer activityStatus;
-    
+
+    /**
+     * 权重，用于排序
+     */
+    private Integer heavy;
+
     /**
      * Initiate 发起者  Booster 助力者
      */

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

@@ -78,5 +78,11 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     @TableField(exist = false)
     private String orgName;
+    
+    /**
+     * 添加的积分
+     */
+    @TableField(exist = false)
+    private Integer addPoints;
 
 }

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

@@ -188,6 +188,16 @@ public class TaBuilding implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 视频url
+     */
+    private String videoUrl;
+
+    /**
+     * 地图范围
+     */
+    private Integer mapScope;
+
 
 
     /**
@@ -249,4 +259,10 @@ public class TaBuilding implements Serializable {
      */
     @TableField(exist = false)
     private List<TaShareActivity> shareActivityList;
+
+    /**
+     * 列表图
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> buildingListImg;
 }

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

@@ -188,6 +188,11 @@ public class TaBuildingDynamic implements Serializable {
      */
     private Integer activityStatus;
 
+    /**
+     * 权重，用于排序
+     */
+    private Integer heavy;
+
     /**
      * 公司Id
      */

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

@@ -64,6 +64,10 @@ public class TaDocumentVerify implements Serializable {
      */
     private Integer verifyStatus;
 
+    private String documentTitle;
+
+    private String rejectReason;
+
     @TableField(exist = false)
     private List<TaDocumentImg> imgList;
 

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

@@ -0,0 +1,35 @@
+package com.huiju.estateagents.entity;
+import lombok.Data;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 资料审核 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-10-23
+ */
+@Data
+
+public class TaDocumentVerifyModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer totalSummit;
+
+    private LocalDateTime summitDate;
+
+    private Integer unverified;
+
+    private String name;
+
+    private String tel;
+
+    private String personId;
+
+
+
+
+}

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

@@ -56,4 +56,14 @@ public class TaOrg implements Serializable {
     private LocalDateTime createDate;
 
     private String waterMark;
+
+    /**
+     * 最大数
+     */
+    private int buildingNum;
+
+    /**
+     * 默认城市
+     */
+    private Integer defaultCityId;
 }

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

@@ -0,0 +1,52 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 菜单表 不同系统,菜单不一致
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaOrgCity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    /**
+     * 省份id
+     * 城市id
+     */
+    private Integer id;
+
+    /**
+     * 省市区名称
+     */
+    private String name;
+
+    /**
+     * 公司ID
+     */
+    private Integer  orgId;
+
+    /**
+     *状态0无效，1有效
+     */
+    private Integer status;
+
+    /**
+     * 上级ID
+     */
+    private Integer parentid;
+}

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

@@ -99,4 +99,9 @@ public class TaPolicy implements Serializable {
      */
     private Integer publishStatus;
 
+    /**
+     * 阅读量
+     */
+    private Integer pvNum;
+
 }

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

@@ -176,9 +176,15 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private String recommendTel;
 
+    @TableField(exist = false)
+    private String intentionName;
+
     /**
      * 推广人
      */
     @TableField(exist = false)
     private String sharePersonName;
+
+    @TableField(exist = false)
+    private Map<String,String> geoInfo;
 }

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

@@ -86,6 +86,11 @@ public class TaShareRecord implements Serializable {
      */
     private Integer verificationStatus;
 
+    /**
+     * 权重，用于排序
+     */
+    private Integer heavy;
+
     /**
      * 核销码
      */

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.entity;
 
 import java.io.Serializable;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -77,5 +78,8 @@ public class TdCity implements Serializable {
     @TableField(exist = false)
     private String initial;
 
+    // 父节点的子类
+    @TableField(exist = false)
+    private List<TdCity> children;
 
 }

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

@@ -0,0 +1,27 @@
+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;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TdMiniappTemplateType  implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @TableId(value = "code", type = IdType.INPUT)
+    private String code;
+
+    private String name;
+    private String remark;
+    private LocalDateTime createDate;
+}

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

@@ -69,4 +69,9 @@ public class TdPointsRules implements Serializable {
      * 积分说明
      */
     private String remark;
+    
+    /**
+     * code
+     */
+    private String code;
 }

src/main/java/com/huiju/estateagents/event/EventBus.java

@@ -42,7 +42,7 @@ public class EventBus extends ApplicationEvent {
 		DocumentVerify(7),
 
 		// 普通活动扫码签到
-		ActivityCheckin(20);
+		ActivityCheckin(8);
 
 		private Integer type;
 

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

@@ -65,7 +65,7 @@ public class ExcelRecommendCustomer {
      * 审核状态名
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "审核状态名", index = 7)
+    @ExcelProperty(value = "审核状态", index = 7)
     private String verifyStatusName;
 
 

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

@@ -29,8 +29,8 @@ public class HelpInitiateRecordSucceed {
     /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(15)
-    @DateTimeFormat("yyyy年MM月dd日")
+    @ColumnWidth(24)
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
     @ExcelProperty(value = "发起时间", index = 2)
     private Date createDate;
 
@@ -53,8 +53,8 @@ public class HelpInitiateRecordSucceed {
      */    /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(15)
-    @DateTimeFormat("yyyy年MM月dd日")
+    @ColumnWidth(24)
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
     @ExcelProperty(value = "助力成功时间", index = 3)
     private Date succeedDate;
 

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

@@ -29,9 +29,9 @@ public class HelpProceedAndFinish {
     /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(15)
+    @ColumnWidth(24)
     @ExcelProperty(value = "发起时间", index = 2)
-    @DateTimeFormat("yyyy年MM月dd日")
+    @DateTimeFormat("yyyy年MM月dd日HH:mm:ss")
     private Date createDate;
 
 

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

@@ -21,9 +21,9 @@ public class HelpRecordExport {
     /**
      * 创建时间 也是助力发起时间
      */
-    @ColumnWidth(15)
+    @ColumnWidth(36)
     @ExcelProperty(value = "助力时间", index = 2)
-    @DateTimeFormat("yyyy年MM月dd日")
+    @DateTimeFormat("yyyy年MM月dd日 HH时mm分ss秒")
     private Date createDate;
 
 

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

@@ -39,7 +39,7 @@ public class ReporRecommendCustomer {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "意向项目", index = 3)
-    private String intention;
+    private String intentionName;
 
     /**
      * 置业顾问

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

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.job;
+
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.service.IHelpActivityService;
+import com.huiju.estateagents.service.IHelpInitiateRecordService;
+import com.huiju.estateagents.service.IHelpRecordService;
+import com.huiju.estateagents.service.ITaBuildingDynamicService;
+import com.huiju.estateagents.service.ITaShareActivityService;
+import com.huiju.estateagents.service.ITaShareChildRecordService;
+import com.huiju.estateagents.service.ITaShareRecordService;
+import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author fxf
+ * @Title: CustomerStatisticTimeJob
+ * @Description: 盘客数据分析统计
+ * @date 2019/11/08
+ */
+@Component
+@Configuration
+@EnableScheduling
+public class CustomerStatisticTimeJob extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(CustomerStatisticTimeJob.class);
+
+    @Autowired
+    private ITaCustomerStatisticDailyService customerStatisticDailyService;
+    
+    @Autowired
+    private ITaCustomerGenderStatisticService taCustomerGenderStatisticService;
+
+    /**
+     *
+     * 盘客工具数据统计
+     *
+     * 开启定时任务，每天23:50执行
+     */
+    @Scheduled(cron = "* 50 23 * * ?")
+    private void configureTasks() {
+        LocalDateTime nowDate = LocalDateTime.now();
+    
+        //每天的新增客户统计并入表
+        customerStatisticDailyService.newCustomerStatisticDaily(nowDate);
+        
+        //每天的跟进客户统计并入表
+        customerStatisticDailyService.followUpStatisticDaily(nowDate);
+        
+        //每天的到访客户统计并入表
+        customerStatisticDailyService.visiteStatisticDaily(nowDate);
+    
+        //每天的新增客户性别统计并入表
+        taCustomerGenderStatisticService.newCustomerSexStatisticDaily(nowDate);
+    
+        //每天的跟进客户性别统计并入表
+        taCustomerGenderStatisticService.followUpSexStatisticDaily(nowDate);
+    
+        //每天的到访客户性别统计并入表
+        taCustomerGenderStatisticService.visiteSexStatisticDaily(nowDate);
+    }
+
+}

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

@@ -1,15 +1,11 @@
 package com.huiju.estateagents.job;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.BaseController;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.HelpActivity;
-import com.huiju.estateagents.entity.TaBuildingDynamic;
-import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.center.sysUser.controller.SysUserController;
+import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.service.*;
-import io.swagger.models.auth.In;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -17,8 +13,6 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
  * @author admin
@@ -31,6 +25,8 @@ import java.util.List;
 @EnableScheduling
 public class JudglActivityTimeJob extends BaseController {
 
+    private final Logger logger = LoggerFactory.getLogger(JudglActivityTimeJob.class);
+
     @Autowired
     private ITaBuildingDynamicService iTaBuildingDynamicService;
 
@@ -55,75 +51,37 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 0/5 ** * * ?")
-//    @Scheduled(cron = "0/5 * * * * ?")
+    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
-
-        //活动列表
-        QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
-        buildingDynamicQueryWrapper.ne("activity_status", "2");
-        List<TaBuildingDynamic> taBuildingDynamics = iTaBuildingDynamicService.list(buildingDynamicQueryWrapper);
-
-        //拼团活动列表
-        QueryWrapper<TaShareActivity> shareActivityQueryWrapper = new QueryWrapper<>();
-        shareActivityQueryWrapper.ne("activity_status", "2");
-        List<TaShareActivity> taShareActivities = iTaShareActivityService.list(shareActivityQueryWrapper);
-
-        //助力活动列表
-        QueryWrapper<HelpActivity> activityQueryWrapper = new QueryWrapper<>();
-        activityQueryWrapper.ne("activity_status", "2");
-        List<HelpActivity> helpActivities = iHelpActivityService.list(activityQueryWrapper);
-
-        LocalDateTime nowTime = LocalDateTime.now();
-
-        List<String> startActivityIds = new ArrayList<>();
-        List<String> endActivityIds = new ArrayList<>();
-        for (TaBuildingDynamic taBuildingDynamic : taBuildingDynamics){
-            LocalDateTime startTime = taBuildingDynamic.getStartDate();
-            LocalDateTime endTime = taBuildingDynamic.getEndDate();
-            if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
-                startActivityIds.add(taBuildingDynamic.getDynamicId());
-            }
-            if (nowTime.isAfter(endTime)){
-                endActivityIds.add(taBuildingDynamic.getDynamicId());
-            }
-        }
-        iTaBuildingDynamicService.updateUnStartActivity(startActivityIds);
-        iTaBuildingDynamicService.updateEndActivity(endActivityIds);
-
-
-        List<Integer> startGroupActivityIds = new ArrayList<>();
-        List<Integer> endGroupActivityIds = new ArrayList<>();
-        for (TaShareActivity taShareActivity : taShareActivities){
-            LocalDateTime startTime = taShareActivity.getStartTime();
-            LocalDateTime endTime = taShareActivity.getEndTime();
-            if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
-                startGroupActivityIds.add(taShareActivity.getGroupActivityId());
-            }
-            if (nowTime.isAfter(endTime)){
-                endGroupActivityIds.add(taShareActivity.getGroupActivityId());
-            }
-        }
-        iTaShareActivityService.updateUnStartActivity(startGroupActivityIds);
-        iTaShareActivityService.updateEndActivity(endGroupActivityIds);
-        iTaShareRecordService.updateEndActivity(endGroupActivityIds);
-        iTaShareChildRecordService.updateEndActivity(endGroupActivityIds);
-
-        List<Integer> startHelpActivityIds = new ArrayList<>();
-        List<Integer> endHelpActivityIds = new ArrayList<>();
-        for (HelpActivity helpActivity : helpActivities){
-            LocalDateTime startTime = helpActivity.getStartDate();
-            LocalDateTime endTime = helpActivity.getEndDate();
-            if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
-                startHelpActivityIds.add(helpActivity.getHelpActivityId());
-            }
-            if (nowTime.isAfter(endTime)){
-                endHelpActivityIds.add(helpActivity.getHelpActivityId());
-            }
-        }
-        iHelpActivityService.updateUnStartActivity(startHelpActivityIds);
-        iHelpActivityService.updateEndActivity(endHelpActivityIds);
-        iHelpInitiateRecordService.updateEndActivity(endHelpActivityIds);
+        String time = DateUtils.cutSecond(LocalDateTime.now());
+
+        //判断活动是否开始
+        iTaBuildingDynamicService.updateActivityToUnStart(time);
+        //未开始活动更新为已开始
+        iTaBuildingDynamicService.updateUnStartActivity(time);
+        //进行中活动更新为已结束
+        iTaBuildingDynamicService.updateProcessingActivity();
+
+        //判断拼团活动是否开始
+        iTaShareActivityService.updateActivityToUnStart();
+        //未开始拼团活动更新为已开始
+        iTaShareActivityService.updateUnStartGroupActivity();
+        //进行中拼团活动更新为已结束
+        iTaShareActivityService.updateProcessingGroupActivity();
+
+        //更新拼团者和参团者数据为已结束
+        iTaShareRecordService.updateActivityProcessToEnd();
+        iTaShareChildRecordService.updateActivityProcessToEnd();
+
+        //判断助力活动是否开始
+        iHelpActivityService.updateActivityToUnStart();
+        //未开始助力活动更新为已开始
+        iHelpActivityService.updateUnStartHelpActivity();
+        //进行中助力活动更新为已结束
+        iHelpActivityService.updateProcessingHelpActivity();
+
+        //更新助力者和发起者数据为已结束
+        iHelpInitiateRecordService.updateHelpActivityProcessToEnd();
     }
 
 }

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

@@ -33,14 +33,26 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      */
     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);
 
-    void updateUnStartHelpActivity(@Param("list") List<Integer> startHelpActivityId);
+    void updateActivityToUnStart();
 
-    void updateEndHelpActivity(@Param("list")List<Integer> endHelpActivityId);
+    void updateUnStartHelpActivity();
+
+    void updateProcessingHelpActivity();
 
     /**
      * 微信端查询拼团和助力推首页的活动的
      * @param orgId
+     * @param buildingId
+     * @return
+     */
+    List<HelpActivity> selectWxhelpActivityAndGroup(@Param("orgId")Integer orgId,@Param("buildingId") String buildingId,@Param("cityID") String cityID);
+
+    /**
+     * 列表 已开始 和 未开始
+     * @param pg
+     * @param cityId
+     * @param orgId
      * @return
      */
-    List<HelpActivity> selectWxhelpActivityAndGroup(Integer orgId);
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId);
 }

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

@@ -56,7 +56,7 @@ public interface HelpInitiateRecordMapper extends BaseMapper<HelpInitiateRecord>
 
     List<HelpInitiateRecordSucceed> getHelpInitiateRecordSucceedExportList(@Param("pageCode") int i, @Param("pageSize") Integer pageSize, @Param("tel") Integer tel, @Param("helpActivityId") Integer helpActivityId);
 
-    void updateEndGroupActivity(List<Integer> endHelpActivityIds);
+    void updateHelpActivityProcessToEnd();
 	/**
 	 * 获取我的助力列表
 	 * @param pg

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

@@ -74,13 +74,16 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
 
     /**
      * 更新未开始的活动
-     * @param startActivityIds
      */
-    void updateUnStartActivity(@Param("list") List<String> startActivityIds);
+    Integer updateActivityToUnStart(@Param("curTime") String curTime);
+
+    /**
+     * 更新未开始的活动
+     */
+    Integer updateUnStartActivity(@Param("curTime") String curTime);
 
     /**
      * 更新结束的活动
-     * @param endActivityIds
      */
-    void updateEndActivity(@Param("list") List<String> endActivityIds);
+    void updateProcessingActivity();
 }

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

@@ -43,7 +43,7 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
 
     List<TaBuilding> buildingAll(@Param("orgId") Integer orgId);
 
-    List<TaBuilding> getBuildingListById(@Param("orgId") Integer orgId);
+    List<TaBuilding> getBuildingListById(@Param("orgId") Integer orgId,@Param("cityId") Integer cityId);
     /**
      * 查询当前楼盘
      * @param buildingId

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

@@ -16,5 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaBuildingReportMapper extends BaseMapper<TaBuildingReport> {
 	
-	void deleteAll();
+	void deleteAll(Integer orgId);
 }

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

@@ -2,10 +2,15 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 资料审核  Mapper 接口
@@ -17,6 +22,8 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaDocumentVerifyMapper extends BaseMapper<TaDocumentVerify> {
 
-    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("name") String name, @Param("tel") String tel,@Param("orgId")Integer orgId);
+    IPage<TaDocumentVerify> getDocumentVerifyList (IPage<TaDocumentVerify> page, @Param("personId") String personId, @Param("orgId")Integer orgId);
+
+    List<TaDocumentVerifyModel> getAdminDocumentList(Page page, @Param("name") String name, @Param("tel") String tel, @Param("orgId")Integer orgId, @Param("startDate")LocalDateTime startDate, @Param("endDate")LocalDateTime endDate);
 
 }

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

@@ -0,0 +1,17 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaOrgCity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 辅助内容表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Mapper
+public interface TaOrgCityMapper extends BaseMapper<TaOrgCity> {
+}

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

@@ -31,14 +31,14 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     List<TaPerson> getPersonByOpenId(@Param("openId") String openId);
 
-    List<Map<String, Object>> selectBuildingConsultants(@Param("buildingId") String buildingId, @Param("personType") String personType, @Param("status") int status);
+    List<Map<String, Object>> selectBuildingConsultants(@Param("buildingId") String buildingId, @Param("personType") String personType, @Param("status") int status, @Param("orgId") Integer orgId);
 
     IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
 
     TaPerson getById(@Param("personId") String personId);
 
 
-    List<String>getUserProjects(@Param("personId") String personId);
+    List<String>getUserProjects(@Param("personId") Integer personId);
 
     TaPerson selectByIdPerson(@Param("openid") String openid);
 
@@ -52,21 +52,19 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
     /**
      * 总用户数
-     * @param personType
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType}")
-    Integer selectUserCount(@Param("org") Integer orgId, @Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent')")
+    Integer selectUserCount(@Param("org") Integer orgId);
 
     /**
      * 总注册数
-     * @param personType
      * @return
      */
     @ResultType(Integer.class)
-    @Select("select count(1) from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and phone is not null")
-    Integer selectRegisteredCount(@Param("org") Integer orgId, @Param("personType") String personType);
+    @Select("select count(1) from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent') and phone is not null")
+    Integer selectRegisteredCount(@Param("org") Integer orgId);
 
     /**
      * 根据时间段查询
@@ -115,11 +113,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      *
      *  据说 1 男  2 女
      *
-     * @param personType
      * @return
      */
-    @Select("select count(1) as sex_count from ta_person where org_id = #{org} AND ifnull(person_type, '') != #{personType} and gender = #{gender}")
-    Integer selectSexUser(@Param("org") Integer orgId, @Param("personType") String personType, @Param("gender") Integer gender);
+    @Select("select count(1) as sex_count from ta_person where org_id = #{org} AND person_type IN ('customer','drift','estate agent')  and gender = #{gender}")
+    Integer selectSexUser(@Param("org") Integer orgId, @Param("gender") Integer gender);
 
 
     /**
@@ -140,10 +137,10 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
             "on a.city = b.id " +
             "WHERE " +
             "   a.org_id = #{org} " +
-            "	AND ifnull(a.person_type, '') != #{personType} " +
+            "	AND a.person_type IN ('customer','drift','estate agent')  " +
             "GROUP BY " +
             "	a.city ")
-    List<Map<String, Object>> selectCityUser(@Param("org") Integer orgId, @Param("personType") String personType);
+    List<Map<String, Object>> selectCityUser(@Param("org") Integer orgId);
 
 
     // ------------- 用户来源 start ------------

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

@@ -44,7 +44,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param sex
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("buildingId") String buildingId, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("consultTel")String consultTel);
 
     /**
      * 导出数据 获取推荐用户数据
@@ -65,14 +65,14 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(@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 orgId
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(@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);
 
     /**
      * 导出数据 获取经纪人数据 总数

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

@@ -20,11 +20,11 @@ import java.util.List;
 public interface TaShareActivityMapper extends BaseMapper<TaShareActivity> {
     TaShareActivity selectTaShareActivityById(@Param("activityId")Integer activityId);
 
-    void updateJoinPeople(@Param("activityId") Integer activityId);
+    void updateActivityToUnStart();
 
-    void updateUnStartGroupActivity(@Param("list") List<Integer> startGroupActivityId);
+    void updateUnStartGroupActivity();
 
-    void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityId);
+    void updateProcessGroupActivity();
 
     Integer calParticipateNum(@Param("groupActivityId") Integer groupActivityId);
 }

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

@@ -21,5 +21,6 @@ import java.util.List;
 public interface TaShareChildRecordMapper extends BaseMapper<TaShareChildRecord> {
     IPage<TaShareChildRecord> getList(IPage<TaShareChildRecord> pg, @Param("groupActivityId") Integer groupActivityId, @Param("status") Integer status, @Param("recordId") Integer recordId, @Param("orgId") Integer orgId);
     List<ShareChildRecordExport> getShareRecordExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
-    void updateEndGroupActivity(List<Integer> endGroupActivityIds);
+    void updateEndGroupActivity();
+    void updateActivityProcessToEndByGroupActivityId(@Param("groupActivityId") Integer groupActivityId);
 }

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

@@ -28,5 +28,12 @@ public interface TaShareRecordMapper extends BaseMapper<TaShareRecord> {
     List<ShareRecordSuccessExport> getShareRecordSuccessExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
     List<ShareRecordFailExport> getShareRecordFailExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("recordId") Integer recordId , @Param("status")Integer status, @Param("groupActivityId") Integer groupActivityId);
 	List<TaShareRecord> getShareRecordList(Page<TaShareRecord> pg,@Param("orgId") Integer orgId,@Param("personId") String personId);
-    void updateEndGroupActivity(@Param("list")List<Integer> endGroupActivityIds);
+    void updateEndGroupActivity();
+    void updateEndGroupActivityByGroupActivityId(@Param("groupActivityId")Integer groupActivityId);
+    /**
+     * 计算成团数
+     * @param groupActivityId
+     * @return
+     */
+    Integer countGroupBuyPeople(@Param("groupActivityId") Integer groupActivityId);
 }

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

@@ -0,0 +1,9 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TdMiniappTemplateType;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface TdMiniappTemplateTypeMapper extends BaseMapper<TdMiniappTemplateType> {
+}

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TdPointsRules;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 积分获取规则字典表  Mapper 接口
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TdPointsRulesMapper extends BaseMapper<TdPointsRules> {
 
+    List<TdPointsRules> getTPLRules();
 }

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

@@ -115,21 +115,35 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      */
     List<HelpRecordExport> getHelpRecordExportList(int i, Integer pageSize, Integer helpRecordInitiateId);
 
+    /**
+     * 未开始的助力活动
+     */
+    void updateActivityToUnStart();
+
     /**
      * 开始助力活动
      */
-    void updateUnStartActivity(List<Integer> startGroupActivityIds);
+    void updateUnStartHelpActivity();
 
     /**
      * 结束助力活动
-     * @param endGroupActivityIds
      */
-    void updateEndActivity(List<Integer> endGroupActivityIds);
+    void updateProcessingHelpActivity();
 
     /**
      * 微信端查询拼团和助力推首页的活动的
      * @param orgId
      * @return
      */
-    ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId);
+    ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId,String cityID);
+
+    /**
+     * 列表  已开始 和 未开始
+     * @param pageNum
+     * @param pageSize
+     * @param cityId
+     * @param orgId
+     * @return
+     */
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId);
 }

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

@@ -26,5 +26,5 @@ public interface IHelpInitiateRecordService extends IService<HelpInitiateRecord>
 	 */
 	ResponseBean getInitiateRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId);
 
-	void updateEndActivity(List<Integer> endHelpActivityIds);
+	void updateHelpActivityProcessToEnd();
 }

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

@@ -40,12 +40,4 @@ public interface IMiniAppService {
     TaMiniappQrcode getQrCodeBySerialNo(Integer id);
 
     List<TaMiniapp> getAllAvaliableMiniapps();
-
-    /**
-     * 活动二维码生成
-     * @param miniappId
-     * @param replace
-     * @return
-     */
-    TaMiniappQrcode createActivityQrcode(String miniappId, String replace);
 }

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

@@ -83,21 +83,24 @@ public interface ITaBuildingDynamicService extends IService<TaBuildingDynamic> {
      */
     ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
 
-    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person,Integer orgId);
 
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
 
+    /**
+     * 判断活动是否开始
+     */
+    Integer updateActivityToUnStart(String time);
+
     /**
      * 开始未进行的活动
-     * @param startActivityId
      */
-    void updateUnStartActivity(List<String> startActivityId);
+    Integer updateUnStartActivity(String time);
 
     /**
      * 结束过期的活动
-     * @param endActivityId
      */
-    void updateEndActivity(List<String> endActivityId);
+    void updateProcessingActivity();
 
     /**
      * 报名记录导出当前总数

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

@@ -13,5 +13,5 @@ import com.huiju.estateagents.entity.TaBuildingReport;
  */
 public interface ITaBuildingReportService extends IService<TaBuildingReport> {
 	
-	void deleteAll();
+	void deleteAll(Integer orgId);
 }

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

@@ -3,7 +3,6 @@ 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 org.springframework.web.bind.annotation.RequestParam;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -46,7 +45,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param id
      * @return
      */
-    ResponseBean buildingAllSelectId(String id,String personId);
+    ResponseBean buildingAllSelectId(String id,String personId, Integer orgId);
 
 
     /**
@@ -159,5 +158,5 @@ public interface ITaBuildingService extends IService<TaBuilding> {
 
     Integer getCityById(String buildingId);
 
-    ResponseBean getBuildingListById(Integer orgId);
+    ResponseBean getBuildingListById(Integer orgId,Integer cityId);
 }

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

@@ -2,7 +2,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.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaDocumentVerifyModel;
+
+import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -14,6 +18,8 @@ import com.huiju.estateagents.entity.TaDocumentVerify;
  */
 public interface ITaDocumentVerifyService extends IService<TaDocumentVerify> {
 
-    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String name,String tel,Integer orgId);
+    IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String personId,Integer orgId);
+    
+    ResponseBean getAdminDocumentList(Integer pageNum, Integer pageSize, String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate);
 
 }

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -42,6 +43,8 @@ public interface ITaPersonService extends IService<TaPerson> {
 
     IPage<TaPerson> getPersonList(int pageNumber, int pageSize, String personType, String name, String phone,Integer status,String buildingId,String personTags);
 
+    IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize,String buildingId);
+
     TaPerson newPersonByOpenid(String openid,Integer orgId);
 
     ResponseBean bindCard(String phone, String pass, String openid);

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

@@ -13,7 +13,15 @@ import com.huiju.estateagents.entity.*;
  * @since 2019-07-25
  */
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
-
+	
+	/**
+	 * 根据code获取积分
+	 * @param code
+	 * @param orgId
+	 * @return
+	 */
+	Integer getRulePoints(String code,Integer orgId);
+	
 	// 分享赚积分
 	void sharePoints(TaShare taShare, Integer orgId);
 
@@ -52,4 +60,13 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
 	 * @param orgId
 	 */
 	void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId);
+	
+	/**
+	 * 消费拼团积分
+	 * @param person
+	 * @param integral
+	 * @param buildingId
+	 * @param groupActivityId
+	 */
+	void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId);
 }

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

@@ -69,7 +69,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(Integer orgId);
+    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId);
 
     /**
      * 导出数据(报备客户)
@@ -78,7 +78,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @param pageSize
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(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);
 
     /**
      * 导出数据(经纪人) 总数

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

@@ -20,14 +20,27 @@ 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);
 
     /**
-     * 开始未进行的活动
-     * @param startGroupActivityId
+     * 判断活动是否开始
      */
-    void updateUnStartActivity(List<Integer> startGroupActivityId);
+    void updateActivityToUnStart();
 
     /**
-     * 结束过期的活动
-     * @param endGroupActivityId
+     * 活动未开始更新为进行中
      */
-    void updateEndActivity(List<Integer> endGroupActivityId);
+    void updateUnStartGroupActivity();
+
+    /**
+     * 活动进行中更新为已结束
+     */
+    void updateProcessingGroupActivity();
+
+    /**
+     * 查询拼团  已开始 和 未开始
+     * @param pageNum
+     * @param pageSize
+     * @param cityId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, String buildingId, Integer orgId);
 }

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

@@ -22,7 +22,14 @@ public interface ITaShareChildRecordService extends IService<TaShareChildRecord>
     ResponseBean validateRule(TaShareChildRecord taShareChildRecord);
     Integer getShareRecord(Integer recordId, Integer status);
     List<ShareChildRecordExport> getShareRecordExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
-	void updateEndActivity(List<Integer> endGroupActivityIds);
+	void updateActivityProcessToEnd();
+
+	/**
+	 * 根据拼团活动id更新参团者拼团失败
+	 * @param groupActivityId
+	 */
+	void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId);
+
 	/**
 	 * 微信端成为团员
 	 *

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

@@ -29,7 +29,13 @@ public interface ITaShareRecordService extends IService<TaShareRecord> {
     Integer getShareRecord(Integer recordId, Integer status);
     List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
     List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
-	void updateEndActivity(List<Integer> endGroupActivityIds);
+	void updateActivityProcessToEnd();
+
+	/**
+	 * 根据拼团活动id更新发团者拼团失败
+	 */
+	void updateActivityProcessToEndByGroupActivityId(Integer groupActivityId);
+
     /**
 	 * 分页获取微信端发起拼团记录
 	 * @param pageNum

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

@@ -0,0 +1,10 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TdMiniappTemplateType;
+
+import java.util.List;
+
+public interface ITdMiniappTemplateTypeService extends IService<TdMiniappTemplateType> {
+    public List<TdMiniappTemplateType> getAllTypes();
+}

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

@@ -29,13 +29,6 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
     @Override
     public ResponseBean extendContentAdd(ExtendContent extendContent) {
         ResponseBean responseBean= new ResponseBean<>();
-        if ("1".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_ACTIVITY);
-        }else if("2".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_PROJECT);
-        }else if ("3".equals(extendContent.getContentType())){
-            extendContent.setContentType(CommConstant.CAROUSEL_NEWS);
-        }
         extendContentMapper.insert(extendContent);
         responseBean.addSuccess("成功");
         return  responseBean;

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

@@ -197,43 +197,35 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public void updateUnStartActivity(List<Integer> startHelpActivityIds) {
-        if (CollectionUtils.isNotEmpty(startHelpActivityIds)){
-            taHelpActivityMapper.updateUnStartHelpActivity(startHelpActivityIds);
-        }
+    public void updateActivityToUnStart() {
+        taHelpActivityMapper.updateActivityToUnStart();
     }
 
     @Override
-    public void updateEndActivity(List<Integer> endHelpActivityIds) {
-        if (CollectionUtils.isNotEmpty(endHelpActivityIds)){
-            taHelpActivityMapper.updateEndHelpActivity(endHelpActivityIds);
-        }
+    public void updateUnStartHelpActivity() {
+        taHelpActivityMapper.updateUnStartHelpActivity();
     }
 
     @Override
-    public ResponseBean wxhelpActivityAndGroup(Integer orgId,Integer type,Integer buildingId) {
-        ResponseBean responseBean = new ResponseBean<>();
-        // 根据楼盘id查助力
-        if ("1".equals(type)){
-            QueryWrapper<HelpActivity> helpActivityQuery= new QueryWrapper<>();
-            helpActivityQuery.eq("building_id",buildingId);
-            helpActivityQuery.eq("org_id",orgId);
-            List<HelpActivity> list = taHelpActivityMapper.selectList(helpActivityQuery);
-            responseBean.addSuccess(list);
-            return responseBean;
-        }
-        // 根据楼盘id查拼团
-        if ("2".equals(type)){
-            QueryWrapper<TaShareActivity> taShareActivityQuery= new QueryWrapper<>();
-            taShareActivityQuery.eq("building_id",buildingId);
-            taShareActivityQuery.eq("org_id",orgId);
-            List<TaShareActivity> list = taShareActivityMapper.selectList(taShareActivityQuery);
-            responseBean.addSuccess(list);
-            return responseBean;
-        }
+    public void updateProcessingHelpActivity() {
+        taHelpActivityMapper.updateProcessingHelpActivity();
+    }
 
-        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId);
+    @Override
+    public ResponseBean wxhelpActivityAndGroup(Integer orgId,String buildingId,String cityID) {
+        ResponseBean responseBean = new ResponseBean<>();
+        // buildingId 楼盘ID为空时首页只查置顶的活动，楼盘ID不为空查所有拼团和助力
+        List<HelpActivity> HelpActivity = taHelpActivityMapper.selectWxhelpActivityAndGroup(orgId,buildingId,cityID);
         responseBean.addSuccess(HelpActivity);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId) {
+        ResponseBean responseBean = new ResponseBean<>();
+        IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId);
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
 }

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

@@ -45,15 +45,7 @@ public class HelpInitiateRecordServiceImpl extends ServiceImpl<HelpInitiateRecor
 	}
 
 	@Override
-	public void updateEndActivity(List<Integer> endHelpActivityIds) {
-		if (CollectionUtils.isNotEmpty(endHelpActivityIds)){
-			List<HelpInitiateRecord> helpInitiateRecords = helpInitiateRecordMapper.selectBatchIds(endHelpActivityIds);
-			for (HelpInitiateRecord helpInitiateRecord : helpInitiateRecords){
-				helpInitiateRecord.setStatus(2);
-				if (helpInitiateRecord.getStatus() != 0){
-					helpInitiateRecordMapper.updateById(helpInitiateRecord);
-				}
-			}
-		}
+	public void updateHelpActivityProcessToEnd() {
+		helpInitiateRecordMapper.updateHelpActivityProcessToEnd();
 	}
 }

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

@@ -3,6 +3,7 @@ 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.common.StringUtils;
 import com.huiju.estateagents.entity.HelpActivity;
 import com.huiju.estateagents.entity.HelpInitiateRecord;
@@ -65,17 +66,24 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		//查看是否助力成功
 		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
 		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
-			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("该活动已成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
 		if (null != helpInitiateRecord.getEnlistNum() && helpInitiateRecord.getEnlistNum() >= helpActivity.getPersonNum()){
-			return ResponseBean.error("助力失败", ResponseBean.ERROR_UNAVAILABLE);
+			return ResponseBean.error("该活动已成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
 			return ResponseBean.error("活动已超时", ResponseBean.ERROR_UNAVAILABLE);
 		}
+		if(helpActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
+			return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		if(helpActivity.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
+			return ResponseBean.error("活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+		}
+		
 		//查看每个人的助力次数
 		Integer helpNum = helpActivity.getHelpNum();
 		

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

@@ -220,37 +220,6 @@ public class MiniAppServiceImpl implements IMiniAppService {
         return taMiniappList;
     }
 
-    @Override
-    public TaMiniappQrcode createActivityQrcode(String miniappId, String replace) {
-
-        WxMaService wxService = wxUtils.getMiniApp(miniappId);
-
-        JSONObject params = JSONObject.parseObject(replace);
-        String scene = params.getString("scene");
-        String page = StringUtils.ifNull(params.getString("page"), "");
-        String lineColorStr = StringUtils.ifNull(params.getString("line_color"), "{\"r\":0,\"g\":0,\"b\":0}");
-        WxMaCodeLineColor lineColor = JSONObject.parseObject(lineColorStr, WxMaCodeLineColor.class);
-        TaMiniappQrcode taQrcode = new TaMiniappQrcode();
-        
-        try {
-            // 使用ID作为场景值
-            File qrFile = wxService.getQrcodeService().createWxaCodeUnlimit(scene, page, 430, true, lineColor, true);
-            String qrcode = AliOSSUtils.putObject(qrFile, CommConstant.ALIOSS_DEFAULT_UPLOAD);
-            
-            taQrcode.setAppid(miniappId);
-            taQrcode.setCreateDate(LocalDateTime.now());
-            taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
-            taQrcode.setQrParams(replace);
-            taQrcode.setQrCode(qrcode);
-            taMiniappQrcodeMapper.insert(taQrcode);
-            return  taQrcode;
-        }catch (Exception e) {
-            e.printStackTrace();
-            log.error("活动二维码生成失败", e);
-        }
-        return taQrcode;
-    }
-
     private void sendMessage(String tplName, TaPerson toUser, String link, List<WxMaTemplateData> data) {
         String appid = toUser.getMiniappId();
         if (StringUtils.isEmpty(appid)) {

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

@@ -52,74 +52,19 @@ public class StatisticalServiceImpl implements IStatisticalService {
         Map<String,Object> map = new HashMap<>();
 
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
 
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
 
         // 最近七天
         Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
 
-        // 用户行为
-        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null, null, null, null, null);
-
-        // 用户活跃数
-        List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.DAY, null, null);
-
-        // 新增用户数
-        List<Map<String, Object>> selectNewsUserCount = taPersonMapper.selectNewsUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
-
-        // 性别比例
-        // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
-        Map<String, Object> selectSexMaleMap = new HashMap<>();
-        selectSexMaleMap.put("name", "男");
-        selectSexMaleMap.put("value", selectSexMale);
-        Map<String, Object> selectSexFemaleMap = new HashMap<>();
-        selectSexFemaleMap.put("name", "女");
-        selectSexFemaleMap.put("value", selectSexFemale);
-        List<Map<String, Object>> selectSexUser = new ArrayList<>();
-        selectSexUser.add(selectSexMaleMap);
-        selectSexUser.add(selectSexFemaleMap);
-
-        // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
-
-        // 转化率, 当前 默认项目收藏
-        Map<String, Object> selectBuildingStatistical = taBuildingMapper.selectBuildingStatistical(orgId, "save");
-
-        // -------  用户来源 start ------------
-
-        // 用户来源 柱状
-        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
-
-        // 用户来源 饼状
-        // 来源置业顾问, 来源全民经纪人，自由进入
-        Integer person_realty_consultant = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_estate_agent = taPersonMapper.selectUserSourcePie(orgId, CommConstant.PERSON_ESTATE_AGENT, CommConstant.PERSON_REALTY_CONSULTANT);
-        Integer person_null = taPersonMapper.selectUserSourcePie(orgId, null, CommConstant.PERSON_REALTY_CONSULTANT);
-        Map<String, Object> pieMap = new HashMap<>();
-        pieMap.put("person_realty_consultant", person_realty_consultant);
-        pieMap.put("person_estate_agent", person_estate_agent);
-        pieMap.put("person_null", person_null);
-
-        Map<String, Object> result = new HashMap<>();
-        result.put("columnar", mapList);
-        result.put("pie", pieMap);
-
         // -------  用户来源 end ------------
 
         map.put("selectUserCount", selectUserCount);
         map.put("selectRegisteredCount", selectRegisteredCount);
         map.put("selectRecentlyCount", selectRecentlyCount);
-        map.put("selectUserBehavior", selectUserBehavior);
-        map.put("selectActiveUserCount", selectActiveUserCount);
-        map.put("selectNewsUserCount", selectNewsUserCount);
-        map.put("selectSexUser", selectSexUser);
-        map.put("selectCityUser", selectCityUser);
-        map.put("selectBuildingStatistical", selectBuildingStatistical);
-        map.put("selectUserSource", result);
 
         responseBean.addSuccess(map);
 
@@ -235,10 +180,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
             case CommConstant.AUTHORIZATION_PHONE:
                 // 总用户数
-                Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
 
                 // 注册数
-                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+                Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
                 Map<String, Object> userMap = new HashMap<>();
                 userMap.put("pvNum", selectUserCount);
                 userMap.put("registeredCount", selectRegisteredCount);
@@ -284,7 +229,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectUserCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 总用户数
-        Integer selectUserCount = taPersonMapper.selectUserCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectUserCount = taPersonMapper.selectUserCount(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserCount", selectUserCount);
         responseBean.addSuccess(map);
@@ -295,7 +240,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
     public ResponseBean selectRegisteredCount(Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
         // 注册数
-        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectRegisteredCount", selectRegisteredCount);
         responseBean.addSuccess(map);
@@ -319,8 +264,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
         // 性别比例
         // 1 男 2 女
-        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_MALE);
-        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.SEX_FEMALE);
+        Integer selectSexMale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_MALE);
+        Integer selectSexFemale = taPersonMapper.selectSexUser(orgId, CommConstant.SEX_FEMALE);
         Map<String, Object> selectSexMaleMap = new HashMap<>();
         selectSexMaleMap.put("name", "男");
         selectSexMaleMap.put("value", selectSexMale);
@@ -342,7 +287,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         ResponseBean responseBean = new ResponseBean();
 
         // 城市比例
-        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId, CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(orgId);
         Map<String, Object> map = new HashMap<>();
         map.put("selectCityUser", selectCityUser);
         responseBean.addSuccess(map);

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

@@ -134,6 +134,9 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
         buildingDynamicQueryWrapper.eq("status",1);
         TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
+        if (null == tabuildingDynamic){
+            return ResponseBean.error("当前活动已失效", ResponseBean.ERROR_UNAVAILABLE);
+        }
         // 当前阅读量加1
         Integer saveNum = tabuildingDynamic.getPvNum() == null ? 1:tabuildingDynamic.getPvNum()+1;
         tabuildingDynamic.setPvNum(saveNum);
@@ -231,11 +234,15 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
 
         // 当报名人数已满时，活动为已结束
         if ((enlistCount + taActivityDynamicEnlist.getAttendNum()) > buildingDynamic.getPersonNum()) {
-            taBuildingDynamic.setIsEnlist(2);
+            //taBuildingDynamic.setIsEnlist(2);
             buildingDynamicMapper.updateById(taBuildingDynamic);
             responseBean.addError("当前报名人数已满");
             return responseBean;
         }
+        if(null != buildingDynamic.getEnlistEnd() && buildingDynamic.getEnlistEnd().isBefore(LocalDateTime.now())){
+            responseBean.addError("当前活动已结束报名");
+            return responseBean;
+        }
         // 判断是否报名根据电话号码校验
         QueryWrapper<TaActivityDynamicEnlist> taBuildingDynamicQuery=  new QueryWrapper<>();
         taBuildingDynamicQuery.eq("dynamic_id",taBuildingDynamic.getDynamicId());
@@ -325,17 +332,18 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public void updateUnStartActivity(List<String> startActivityIds) {
-        if (CollectionUtils.isNotEmpty(startActivityIds)){
-            buildingDynamicMapper.updateUnStartActivity(startActivityIds);
-        }
+    public Integer updateActivityToUnStart(String time) {
+        return buildingDynamicMapper.updateActivityToUnStart(time);
     }
 
     @Override
-    public void updateEndActivity(List<String> endActivityIds) {
-        if (CollectionUtils.isNotEmpty(endActivityIds)){
-            buildingDynamicMapper.updateEndActivity(endActivityIds);
-        }
+    public Integer updateUnStartActivity(String curTime) {
+        return buildingDynamicMapper.updateUnStartActivity(curTime);
+    }
+
+    @Override
+    public void updateProcessingActivity() {
+        buildingDynamicMapper.updateProcessingActivity();
     }
 
     @Override
@@ -354,9 +362,10 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
     }
 
     @Override
-    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
         activityDynamicEnlistQueryWrapper.eq("phone",person.getPhone());
+        activityDynamicEnlistQueryWrapper.eq("org_id",orgId);
         if(!StringUtils.isEmpty(building)){
             activityDynamicEnlistQueryWrapper.eq("building_id",building);
         }
@@ -394,6 +403,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
                 taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
                 taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
 
+                //更改状态为已参与
+                taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 
             }
             return result;

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

@@ -22,7 +22,7 @@ public class TaBuildingReportServiceImpl extends ServiceImpl<TaBuildingReportMap
 	private TaBuildingReportMapper taBuildingReportMapper;
 	
 	@Override
-	public void deleteAll() {
-		taBuildingReportMapper.deleteAll();
+	public void deleteAll(Integer orgId) {
+		taBuildingReportMapper.deleteAll(orgId);
 	}
 }

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

@@ -15,9 +15,7 @@ import com.huiju.estateagents.service.ITaBuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.service.TaPosterService;
 import com.huiju.estateagents.service.TaShareContentService;
-import jodd.util.CollectionUtil;
 import org.apache.commons.collections.CollectionUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -26,6 +24,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -82,13 +81,31 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaShareActivityMapper taShareActivityMapper;
 
+    @Autowired
+    private  TaOrgMapper  taOrgMapper;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
-        page.setRecords(building);
+
+        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId);
+
+        if (null != buildings) {
+            for(TaBuilding taBuilding: buildings) {
+                //查询当前图片
+                QueryWrapper<TaBuildingImg> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("building_id", taBuilding.getBuildingId());
+                queryWrapper.eq("img_type", "banner");
+                queryWrapper.orderByAsc("create_date");
+
+                List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(queryWrapper);
+                taBuilding.setBuildingImg(buildingImg);
+            }
+        }
+
+        page.setRecords(buildings);
 
         return ResponseBean.success(page);
     }
@@ -118,6 +135,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
         building.setBuildingImg(buildingImg);
 
+        // 列表图
+        QueryWrapper<TaBuildingImg> BuildingListImgQueryWrapper = new QueryWrapper<>();
+        BuildingListImgQueryWrapper.eq("building_id", building.getBuildingId());
+        BuildingListImgQueryWrapper.eq("img_type", "list");
+        List<TaBuildingImg> buildingListImg = taBuildingImgMapper.selectList(BuildingListImgQueryWrapper);
+        building.setBuildingListImg(buildingListImg);
+
+
         // 查询tag
         QueryWrapper<TaBuildingTag> BuildingTagQueryWrapper = new QueryWrapper<>();
         BuildingTagQueryWrapper.eq("building_id", id);
@@ -136,7 +161,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id,String personId) {
+    public ResponseBean buildingAllSelectId(String id,String personId, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().gt(TaBuilding::getStatus,-1);
@@ -232,6 +257,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
             buildingIdQueryWrapper.eq("building_id", building.getBuildingId());
             buildingIdQueryWrapper.eq("org_id", orgId);
+            building.setName(building.getBuildingName());
             taBuildingMapper.update(building,buildingIdQueryWrapper);
             QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
             BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
@@ -240,6 +266,17 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             insertImgBatch(buildingImgs, building.getBuildingId());
         }
 
+        // 列表图
+        String listImg = object.getString("listImg");
+        List<TaBuildingImg> buildingListImg = JSONObject.parseArray(listImg, TaBuildingImg.class);
+        if (CollectionUtils.isNotEmpty(buildingListImg)) {
+            QueryWrapper<TaBuildingImg> BuildingListImgQueryWrapper = new QueryWrapper<>();
+            BuildingListImgQueryWrapper.eq("building_id", building.getBuildingId());
+            BuildingListImgQueryWrapper.eq("img_type", "list");
+            taBuildingImgMapper.delete(BuildingListImgQueryWrapper);
+            buildingListImg = insertImgBatch(buildingListImg, building.getBuildingId());
+        }
+
 
         // tag先删除再增加
         String tagStr = object.getString("tag");
@@ -264,7 +301,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
-        return ResponseBean.success("");
+        return ResponseBean.success(building);
     }
 
     @Override
@@ -275,6 +312,16 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Override
     public ResponseBean buildingAdd(String parameter, Integer orgId) {
         JSONObject object= JSONObject.parseObject(parameter);
+        // 根据orgId查询当前楼盘最大数
+        TaOrg taOrg = taOrgMapper.selectById(orgId);
+        // 查询当前org楼盘总数
+        QueryWrapper<TaBuilding>  taBuildingQuery = new QueryWrapper<>();
+        taBuildingQuery.eq("org_id",orgId);
+        taBuildingQuery.gt("status",-1);
+        int orgNum= taBuildingMapper.selectCount(taBuildingQuery);
+        if (orgNum >= taOrg.getBuildingNum()){
+            return ResponseBean.error("楼盘已超过最大限制", ResponseBean.ERROR_UNAVAILABLE);
+        }
 
         TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
         if(null!= object.getDate("openingDate")){
@@ -283,6 +330,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setCreateDate(LocalDateTime.now());
         building.setStatus(2);
         building.setOrgId(orgId);
+        building.setName(building.getBuildingName());
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -292,20 +340,25 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             tdCityMapper.updateById(city);
         }
 
+        // 项目主图
         String imgStr = object.getString("img");
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
-
-//        building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
-//        building.setCreateDate(LocalDateTime.now());
-//        building.setStatus(0);
         if (CollectionUtils.isNotEmpty(buildingImgs)) {
-            insertImgBatch(buildingImgs, building.getBuildingId());
+            buildingImgs = insertImgBatch(buildingImgs, building.getBuildingId());
+        }
+
+        // 列表图
+        String listImg = object.getString("listImg");
+        List<TaBuildingImg> buildingListImg = JSONObject.parseArray(listImg, TaBuildingImg.class);
+        if (CollectionUtils.isNotEmpty(buildingListImg)) {
+            buildingListImg = insertImgBatch(buildingListImg, building.getBuildingId());
         }
 
+        // 标签
         String tagStr = object.getString("tag");
         List<TaBuildingTag> buildingTags = JSONObject.parseArray(tagStr, TaBuildingTag.class);
         if (CollectionUtils.isNotEmpty(buildingTags)) {
-            insertTagBatch(buildingTags, building.getBuildingId());
+            buildingTags = insertTagBatch(buildingTags, building.getBuildingId());
         }
 
         // 项目类型
@@ -314,7 +367,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
 
-        return ResponseBean.success("");
+        return ResponseBean.success(building);
     }
 
     @Override
@@ -514,7 +567,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         IPage<TaShare> taShareList = taShareMapper.selectPage(pg, taShareQueryWrapper);
         build.setShareList(taShareList);
 
-        build.setConsultants(taPersonMapper.selectBuildingConsultants(build.getBuildingId(), CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL));
+        build.setConsultants(taPersonMapper.selectBuildingConsultants(build.getBuildingId(), CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.STATUS_NORMAL, build.getOrgId()));
     }
 
     @Override
@@ -619,15 +672,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getBuildingListById(Integer orgId) {
-        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId);
+    public ResponseBean getBuildingListById(Integer orgId,Integer cityId) {
+        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId,cityId);
         return ResponseBean.success(buildings);
     }
 
 
-    int insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
-        int rows = 0;
-        for (TaBuildingImg img: imgs){
+    private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
+        return imgs.stream().map(img -> {
             TaBuildingImg Images = new TaBuildingImg();
             Images.setBuildingId(buildingId);
             Images.setImgType(img.getImgType());
@@ -635,21 +687,20 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             Images.setOrderNo(Integer.valueOf(img.getOrderNo()));
             Images.setStatus(1);
             Images.setCreateDate(LocalDateTime.now());
-            rows += taBuildingImgMapper.insert(Images);
-        }
+            taBuildingImgMapper.insert(Images);
 
-        return rows;
+            return Images;
+        }).collect(Collectors.toList());
     }
 
-    int insertTagBatch(List<TaBuildingTag> tags, String buildingId) {
-        int rows = 0;
-        for (TaBuildingTag tag:tags){
+    private List<TaBuildingTag> insertTagBatch(List<TaBuildingTag> tags, String buildingId) {
+        return tags.stream().map(tag -> {
             TaBuildingTag btag = new TaBuildingTag();
             btag.setBuildingId(buildingId);
             btag.setTagName(tag.getTagName());
-            rows += taBuildingTagMapper.insert(btag);
-        }
-        return rows;
+            taBuildingTagMapper.insert(btag);
+            return btag;
+        }).collect(Collectors.toList());
     }
 
     int insertApartmentImgBatch(List<TaBuildingImg> imgs, String buildingId, String apartmentId) {

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

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaDocumentImg;
 import com.huiju.estateagents.entity.TaDocumentVerify;
+import com.huiju.estateagents.entity.TaDocumentVerifyModel;
 import com.huiju.estateagents.mapper.TaDocumentImgMapper;
 import com.huiju.estateagents.mapper.TaDocumentVerifyMapper;
 import com.huiju.estateagents.service.ITaDocumentVerifyService;
@@ -13,6 +15,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,9 +36,9 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
     TaDocumentImgMapper taDocumentImgMapper;
 
     @Override
-    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum, Integer pageSize, String name, String tel,Integer orgId){
+    public IPage<TaDocumentVerify> getDocumentVerifyList (Integer pageNum,Integer pageSize,String personId,Integer orgId){
         IPage<TaDocumentVerify>page = new Page<>(pageNum,pageSize);
-        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,name,tel,orgId);
+        IPage<TaDocumentVerify> data = documentVerifyMapper.getDocumentVerifyList(page,personId,orgId);
         List<Integer> idList = new ArrayList<>();
         for (int i = 0; i<data.getRecords().size();i++){
             idList.add(data.getRecords().get(i).getDocumentVerifyId());
@@ -60,4 +63,12 @@ public class TaDocumentVerifyServiceImpl extends ServiceImpl<TaDocumentVerifyMap
         return data;
     }
 
+    @Override
+    public ResponseBean getAdminDocumentList(Integer pageNum, Integer pageSize, String name, String tel, Integer orgId, LocalDateTime startDate, LocalDateTime endDate){
+        Page page = new Page<>(pageNum,pageSize);
+        List<TaDocumentVerifyModel> taDocumentVerifyModelList = documentVerifyMapper.getAdminDocumentList(page, name, tel, orgId, startDate, endDate);
+        page.setRecords(taDocumentVerifyModelList);
+        return ResponseBean.success(page);
+    }
+
 }

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

@@ -97,7 +97,10 @@ public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> impl
 		TaPointsExchange taPointsExchange = new TaPointsExchange();
 		taPointsExchange.setPersonId(taPerson.getPersonId());
 		taPointsExchange.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
-		taPointsExchange.setPhone(taPerson.getPhone());
+
+		// 存在 phone 字段没有值的情况，但是 tel 字段有值
+		String phone = org.apache.commons.lang3.StringUtils.isNotBlank(taPerson.getPhone()) ? taPerson.getPhone() : taPerson.getTel();
+		taPointsExchange.setPhone(phone);
 		taPointsExchange.setAvatar(taPerson.getAvatarurl());
 		taPointsExchange.setTargetId(taGoods.getGoodsId().toString());
 		taPointsExchange.setTargetName(taGoods.getGoodsName());

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

@@ -72,6 +72,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
+        taNewsQueryWrapper.orderByAsc("news_status");
         taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
@@ -126,6 +127,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
         taNews.setCreateDate(LocalDateTime.now());
         taNews.setStatus(1);
+        taNews.setNewsStatus(1);
         this.save(taNews);
         responseBean.addSuccess(taNews);
         return responseBean;

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

@@ -18,6 +18,7 @@ import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
@@ -28,6 +29,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -293,7 +295,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             }
             result.put("unReadNum", null == unReadNum ? 0 : unReadNum);
         } else {
-            result.put("liked", true);
+            List<TaFavor> taUvList = getFavorListBy(person, person);
+            result.put("liked", null != taUvList && taUvList.size() > 0);
             Integer unReadNum = taChatMapper.getAllUnReadMessage(person.getPersonId());
             result.put("unReadNum", null == unReadNum ? 0 : unReadNum);
         }
@@ -425,6 +428,31 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPersonMapper.getPersonList(page,personType,name,phone,status,buildingId,personTags);
     }
 
+    @Override
+    public IPage<TaUser> getBuildingConsultantList(int pageNumber, int pageSize,String buildingId){
+        IPage<TaUser> page = new Page<>(pageNumber,pageSize);
+        QueryWrapper<TaPersonBuilding> personBuildingQueryWrapper = new QueryWrapper<>();
+        personBuildingQueryWrapper.eq("building_id",buildingId);
+        List<TaPersonBuilding> list = taPersonBuildingMapper.selectList(personBuildingQueryWrapper);
+        List<Integer>idLists = new ArrayList<>();
+//        for(int i=0; i<list.size();i++){
+//            if(null != list.get(i).getUserId()){
+//                idLists.add(list.get(i).getUserId());
+//            }
+//        }
+
+        idLists = list.stream().filter(e -> null != e.getUserId()).map(e -> e.getUserId()).collect(Collectors.toList());
+        IPage<TaUser> data = new Page<>();
+        if(CollectionUtils.isNotEmpty(idLists)) {
+            QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
+            userQueryWrapper.in("user_id",idLists);
+            userQueryWrapper.eq("is_consultant", true);
+            data = taUserService.page(page,userQueryWrapper);
+        }
+
+        return data;
+    }
+
     @Override
     public TaPerson newPersonByOpenid(String openid,Integer orgId) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);

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

@@ -19,9 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -44,11 +42,16 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	/**
 	 * 获取规则积分, 0 代表未启用
-	 * @param ruleId
+	 * @param code
 	 * @return
 	 */
-	private Integer getRulePoints(Integer ruleId) {
-		TdPointsRules rule = tdPointsRulesMapper.selectById(ruleId);
+	@Override
+	public Integer getRulePoints(String code,Integer orgId) {
+		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
+		tdPointsRulesQueryWrapper.eq("code",code);
+		tdPointsRulesQueryWrapper.eq("org_id",orgId);
+		tdPointsRulesQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+		TdPointsRules rule = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
 		if (null == rule) {
 			return 0;
 		}
@@ -70,15 +73,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void sharePoints(TaShare taShare, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
+		
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
-
 		// 已经领取过的不会再次领取
 		String[] params = {
 				"shareId="+String.valueOf(taShare.getShareId()),
@@ -99,14 +102,13 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void sharePosterAll(String recommenderId, Integer orgId) {
+		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SHARE_POSTER);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		String changeType = CommConstant.POINTS_CHANGE_SHARE_POSTER;
-
 		String[] params = {
 				"openUser="+recommenderId
 		};
@@ -121,15 +123,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void checkinPoints(TaPersonSign taPersonSign,Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
+		
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_CHECKIN);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_CHECKIN;
-
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("date="+DateUtils.today());
@@ -160,15 +162,17 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void checkinActivityPoints(TaActivityDynamicEnlist taActivityDynamicEnlist, Integer orgId){
+		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_CHECKIN);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
-		String changeType =CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN;
+		
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("user="+taActivityDynamicEnlist.getPersonId());
+			add("targetId="+taActivityDynamicEnlist.getEnlistId().toString());
 		}};
 		String changeParams = String.join("&", params);
 		boolean hasJoined = isPointsRecordsExist(taActivityDynamicEnlist.getPersonId(), changeType, changeParams);
@@ -188,15 +192,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void signUpPoints(TaPerson taPerson, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_SIGNUP_AGENT);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_SIGNUP_AGENT;
-
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			add("user="+taPerson.getPersonId());
@@ -215,15 +218,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void recommendCustPoints(TaRecommendCustomer taRecommendCustomer, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
+		
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_RECOMMENDER_CUSTOMER);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_RECOMMEND_CUSTOMER;
-
 		// 已经领取过的不会再次领取
 		List<String> params = new ArrayList<String>() {{
 			// 推荐人
@@ -343,15 +346,14 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void documentVerify(TaDocumentVerify taDocumentVerify, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_DOCUMENT_VERIFY);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_DOCUMENT_VERIFY;
-
 		// 已经领取过的不会再次领取
 		String[] params = {
 				"shareId="+String.valueOf(taDocumentVerify.getDocumentVerifyId()),
@@ -372,14 +374,15 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 
 	@Override
 	public void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId) {
+		//
+		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
 		// 是否开启积分规则
-		Integer pointsAmount = getRulePoints(CommConstant.POINTS_RULE_ACTIVITY_VERIFICATION);
+		Integer pointsAmount = getRulePoints(changeType,orgId);
 		if (pointsAmount == 0) {
 			return;
 		}
 
-		//
-		String changeType = CommConstant.POINTS_CHANGE_ACTIVITY_VERIFICATION;
+		
 
 		// 已经领取过的不会再次领取
 		String[] params = {
@@ -398,4 +401,27 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
 		}
 	}
+	
+	/**
+	 * 消费拼团积分
+	 *  @param person
+	 * @param integral
+	 * @param buildingId
+	 * @param groupActivityId
+	 */
+	@Override
+	public void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId) {
+		TaPointsRecords taPointsRecords = new TaPointsRecords();
+		taPointsRecords.setPersonId(person.getPersonId());
+		taPointsRecords.setPersonName(person.getNickname());
+		taPointsRecords.setPersonType(person.getPersonType());
+		taPointsRecords.setPointsAmount(-integral);
+		taPointsRecords.setChangeType(CommConstant.POINTS_CHANGE_GROUP);
+		taPointsRecords.setChangeParams("{\"group_activity_id\":"+groupActivityId+"}");
+		taPointsRecords.setCreateDate(LocalDateTime.now());
+		taPointsRecords.setOrgId(person.getOrgId());
+		taPointsRecords.setBuildingId(buildingId);
+		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
+		taPointsRecordsMapper.insert(taPointsRecords);
+	}
 }

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

@@ -15,13 +15,11 @@ import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.TdCity;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
-import com.huiju.estateagents.mapper.TaBuildingMapper;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
-import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -63,6 +61,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
+    @Autowired
+    private TdCityMapper cityMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -217,7 +218,6 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
         // 报备有 10 天有效期
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("name", taRecommendCustomer.getName());
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
         queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
@@ -286,7 +286,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDemandType(params.getString("demandType"));
 //        taRecommendCustomer.setPriceRange(params.getString("priceRange"));
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
-        taRecommendCustomer.setVerifyStatus(CommConstant.READY);
+        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
 
 
@@ -399,7 +399,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
             // 公客
             IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getPublicCustomerList(page, building,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
+            // 公客就不用 buildingId 进行查询
+            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel);
         } else {
             // 私客
             IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
@@ -437,13 +438,37 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public TaRecommendCustomer getCustomerDetail(String customerId){
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
+        TaPerson person = taPersonMapper.selectById(personId);
         if(!StringUtils.isEmpty(personId)){
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            Map<String,String>geoInfo = new HashMap<>();
+            geoInfo.put("provience",person.getProvince());
+            geoInfo.put("country",person.getCountry());
+            TdCity city = cityMapper.selectById(person.getCity());
+            if(null!=city){
+                geoInfo.put("city",city.getName());
+            }else {
+                geoInfo.put("city","未知");
+            }
+            taRecommendCustomer.setGeoInfo(geoInfo);
         }
         if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
-            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getPersonId()));
+            if(null == consultant){
+                TaUser user = userService.getById(taRecommendCustomer.getRealtyConsultant());
+                consultant.setPersonId(taRecommendCustomer.getRealtyConsultant());
+                consultant.setTel(user.getPhone());
+                consultant.setPhone(user.getPhone());
+                consultant.setDepartment(user.getDepartment());
+                consultant.setUserId(user.getUserId());
+                consultant.setPost(user.getPosition());
+                consultant.setName(user.getUserName());
+                consultant.setAddress(user.getAddress());
+                consultant.setAvatarurl(user.getAvatar());
+                consultant.setCompany(user.getOrgName());
+            }
+            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getUserId()));
             taRecommendCustomer.setConsultant(consultant);
         }
         return taRecommendCustomer;
@@ -535,13 +560,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public Integer getRepCustomerReportCount(Integer orgId) {
-        return taRecommendCustomerMapper.getRepCustomerReportCount(orgId);
+    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);
     }
 
     @Override
-    public List<ReporRecommendCustomer> getRepCustomerReportExport(Integer orgId, Integer pageCode, Integer pageSize) {
-        return taRecommendCustomerMapper.getRepCustomerReportExport(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) {
+        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType,verifyStatus,sex, orgId, pageCode, pageSize);
     }