merge

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.1</version>
+	<version>v3.5.1.0</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 
@@ -128,7 +128,6 @@
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>2.7.0</version>
 		</dependency>
-
 	</dependencies>
 
 	<profiles>
@@ -171,6 +170,12 @@
 				<profiles.active>nj</profiles.active>
 			</properties>
 		</profile>
+		<profile>
+			<id>hj</id>
+			<properties>
+				<profiles.active>hj</profiles.active>
+			</properties>
+		</profile>
 		<profile>
 			<id>gzysd</id>
 			<properties>
@@ -178,9 +183,9 @@
 			</properties>
 		</profile>
 		<profile>
-			<id>v3</id>
+			<id>jj</id>
 			<properties>
-				<profiles.active>v3</profiles.active>
+				<profiles.active>jj</profiles.active>
 			</properties>
 		</profile>
 	</profiles>

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.activity.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.activity.service.ActivityServiceI;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
@@ -66,15 +67,21 @@ public class ActivityController extends BaseController {
 		queryWrapper.eq("customer_id",customerId);
 		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerService.getOne(queryWrapper);
 		if (null == taRecommendCustomer){
-			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
 		}
 		if (null == taRecommendCustomer.getPersonId()){
-			return ResponseBean.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
 		}
 		
 		QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
 		taPersonQueryWrapper.eq("person_id",taRecommendCustomer.getPersonId());
 		TaPerson person = taPersonService.getOne(taPersonQueryWrapper);
+		if (null == person){
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
+		}
 		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
 		return responseBean;
 	}

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

@@ -372,6 +372,8 @@ public class TaUserController extends BaseController {
             taUserQueryWrapper.eq(null != status,"status",status);
             if(null != isConsultant && isConsultant == 1){
                 taUserQueryWrapper.eq("is_consultant",true);
+            }else if (null != isConsultant && isConsultant == 0){
+                taUserQueryWrapper.eq("is_consultant",false);
             }
             taUserQueryWrapper.ne("IFNULL(is_admin,0)",CommConstant.STATUS_NORMAL);
             IPage<TaUser> result = iTaUserService.page(pg,taUserQueryWrapper);

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

@@ -177,11 +177,17 @@ public class TaUser implements Serializable {
      * 前台传值城市
      */
     @TableField(exist = false)
-    private ArrayList<Integer> selectCityTree;
+    private ArrayList<String> selectCityTree;
 
     /**
      * 城市ID
      */
     @TableField(exist = false)
     private Integer cityId;
+
+    /**
+     * 默认城市
+     */
+    @TableField(exist = false)
+    private Integer defaultCityId;
 }

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

@@ -24,4 +24,6 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	List<Map<String,Object>> getPageList(IPage<TaUser> pg);
 	
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
+	
+	List<TaUser> getUserList(@Param("phone") String phone,@Param("loginName") String loginName,@Param("orgId") Integer orgId);
 }

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

@@ -100,6 +100,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setLoginName(taUser.getPhone());
 		}
 
+		//判断默认城市是否在维护城市内
+		verificationCity(taUser.getSelectCityTree(),taUser.getDefaultCityId());
+
 		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
 		wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
 		List<TaUser> taUserList = this.list(wrapper);
@@ -113,7 +116,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taOrg.setWaterMark(taUser.getWaterMark());
 		taOrg.setCreateDate(LocalDateTime.now());
 		taOrg.setBuildingNum(taUser.getOrgNum());
-		taOrg.setDefaultCityId(taUser.getCityId());
+		taOrg.setDefaultCityId(taUser.getDefaultCityId());
 		if (taOrgMapper.insert(taOrg) < 1) {
 			throw new Exception("生成用户公司信息失败");
 		}
@@ -164,31 +167,52 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 	}
 
 	// 维护公司所在城市
-	public void addAndupdate(ArrayList<Integer> selectCityTree,boolean isA,Integer orgid){
-
+	public void addAndupdate(ArrayList<String> selectCityTree,boolean isA,Integer orgid){
+			// 查询当前所有的市
 			QueryWrapper<TdCity> tdCityQuery= new QueryWrapper<>();
-			tdCityQuery.eq("leveltype",1);
-			 List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQuery);
+			tdCityQuery.eq("leveltype",2);
+			List<TdCity> tdCityList= tdCityMapper.selectList(tdCityQuery);
 
 		// isA=true删除所有城市重新添加
 		if (isA == true){
-			for(Integer city:selectCityTree) {
-				taOrgCityMapper.deleteById(city);
-			}
+			QueryWrapper<TaOrgCity> taOrgCity= new  QueryWrapper<>();
+			taOrgCity.eq("org_id",orgid);
+			taOrgCityMapper.delete(taOrgCity);
 		}
+		TaOrgCity  taOrgCity = new TaOrgCity();
 			 // 对比现在的城市ID
-			 for(Integer city:selectCityTree){
+			 for(String 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());
+						// 入库城市
+					if (city.equals(String.valueOf(tdCity.getId()))){
+						taOrgCity.setCityId(Integer.valueOf(city)).setName(tdCity.getName()).setOrgId(orgid).setStatus(1).setParentid(tdCity.getParentid());
+						taOrgCityMapper.insert(taOrgCity);
+						// 查询当前公司选择省份是否存在
+                       QueryWrapper<TaOrgCity> taOrgCityParent = new QueryWrapper<>();
+                        taOrgCityParent.eq("city_id",tdCity.getParentid());
+                        taOrgCityParent.eq("org_id",orgid);
+						TaOrgCity taOrgParent = taOrgCityMapper.selectOne(taOrgCityParent);
+						// 如果为空，查询行政表
+						if (null == taOrgParent){
+							TdCity  tdCityParent = tdCityMapper.selectById(tdCity.getParentid());
+							taOrgCity.setCityId(tdCityParent.getId()).setName(tdCityParent.getName()).setOrgId(orgid).setStatus(1).setParentid(100000);
+							taOrgCityMapper.insert(taOrgCity);
+						}
 					}
 
 				}
 			 }
 
 	}
-
+	// 判断当前城市是否存在
+	public void  verificationCity(ArrayList<String> selectCityTree,Integer city)throws Exception{
+		for (String id: selectCityTree) {
+			if (id.equals(String.valueOf(city))) {
+				return;
+				}
+			}
+		throw new Exception("当前默认城市不在维护城市内");
+	}
 	@Override
 	public TaUser getInfoWithOrg(Integer id) {
 		TaUser taUser = this.getById(id);
@@ -201,7 +225,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setOrgName(taOrg.getName());
 			taUser.setWaterMark(taOrg.getWaterMark());
 			taUser.setOrgNum(taOrg.getBuildingNum());
-			taOrg.setDefaultCityId(taUser.getCityId());
+			taUser.setDefaultCityId(taOrg.getDefaultCityId());
 		}
 
 		QueryWrapper<TaMiniapp> wrapper = new QueryWrapper<>();
@@ -216,17 +240,23 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 
 		taUser.setMiniapp(taMiniapp);
 		taUser.setLoginPassword(null);
+		// 查询所有城市id
+		ArrayList<String> taOrgCityList= taOrgCityMapper.selectByIdCity(taUser.getOrgId());
+		taUser.setSelectCityTree(taOrgCityList);
 		return taUser;
 	}
 
 	@Override
 	public void updateInfoWithOrg(TaUser taUser) throws Exception {
+		//判断默认城市是否在维护城市内
+		verificationCity(taUser.getSelectCityTree(),taUser.getDefaultCityId());
+
 		TaOrg taOrg = taOrgMapper.selectById(taUser.getOrgId());
 		if (null != taOrg) {
 			taOrg.setName(taUser.getOrgName());
 			taOrg.setWaterMark(taUser.getWaterMark());
 			taOrg.setBuildingNum(taUser.getOrgNum());
-
+			taOrg.setDefaultCityId(taUser.getDefaultCityId());
 			if (taOrgMapper.updateById(taOrg) < 1) {
 				throw new Exception("更新用户公司信息失败");
 			}
@@ -292,10 +322,7 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 			taUser.setLoginName(taUser.getPhone());
 		}
 		
-		QueryWrapper<TaUser> wrapper = new QueryWrapper<>();
-		wrapper.eq("phone", taUser.getPhone()).or().eq("login_Name", taUser.getLoginName());
-		wrapper.eq("org_id",taUser.getOrgId());
-		List<TaUser> taUserList = this.list(wrapper);
+		List<TaUser> taUserList = taUserMapper.getUserList(taUser.getPhone(),taUser.getLoginName(),taUser.getOrgId());
 		if (null != taUserList && taUserList.size() > 0) {
 			throw new Exception("电话号码或登录名重复");
 		}

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

@@ -482,7 +482,7 @@ public class CommConstant {
     public static final String BUILDING_IMG_BANNER = "banner";
 
     /**
-     * 项目列表图
+     * 项目列表图（现在是用于楼盘封面图）
      */
     public static final String BUILDING_IMG_LIST = "list";
 
@@ -495,4 +495,14 @@ public class CommConstant {
      * 户型图
      */
     public static final String BUILDING_IMG_APARMENT = "aparment";
+    
+    /**
+     * 高德地图url
+     */
+	public static final String AMAP_HTTP = "https://restapi.amap.com/v3/geocode/regeo";
+    
+    /**
+     * 高德地图key
+     */
+    public static final String AMAP_KEY = "14f05ce59c26364fd0674014dc0d8b1b";
 }

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

@@ -17,14 +17,7 @@ import com.huiju.estateagents.excel.HelpRecordExport;
 import com.huiju.estateagents.excel.PublicCustomerExport;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.mapper.HelpInitiateRecordMapper;
-import com.huiju.estateagents.service.IHelpActivityService;
-import com.huiju.estateagents.service.IHelpInitiateRecordService;
-import com.huiju.estateagents.service.IHelpRecordService;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITdPosterTemplateService;
-import com.huiju.estateagents.service.TaPosterService;
-import com.huiju.estateagents.service.TaShareContentService;
+import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiImplicitParam;
@@ -84,6 +77,9 @@ public class HelpActivityController extends BaseController {
     
     @Autowired
     private ITdPosterTemplateService tdPosterTemplateService;
+
+    @Autowired
+    private IExtendContentService iExtendContentService;
     /**
      * 活动助力列表
      *
@@ -164,7 +160,8 @@ public class HelpActivityController extends BaseController {
         helpActivity.setStatus(1);
         helpActivity.setWeight(0);
         helpActivity.setIsMain(false);
-        taHelpActivityService.helpActivityAdd(helpActivity, orgId);
+         int id = taHelpActivityService.helpActivityAdd(helpActivity, orgId);
+        responseBean.addSuccess(id);
         return responseBean;
     }
 
@@ -202,6 +199,7 @@ public class HelpActivityController extends BaseController {
         HelpActivity helpActivity = JSONObject.parseObject(parameter, HelpActivity.class);
         QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
         helpActivityQueryWrapper.eq("heavy", helpActivity.getHeavy());
+        helpActivityQueryWrapper.ne("help_activity_id", helpActivity.getHelpActivityId());
         Integer heavyCount = taHelpActivityService.count(helpActivityQueryWrapper);
         if (heavyCount != 0){
             responseBean.addError("权重已存在，请重新编辑");
@@ -291,6 +289,8 @@ public class HelpActivityController extends BaseController {
         helpActivity.setStatus(-1);
         helpActivity.setOrgId(getOrgId(request));
         taHelpActivityService.update(helpActivity, taShareActivityQueryWrapper);
+        // 设置为取消发布以后把轮播图和资讯设置为停用
+        iExtendContentService.updateActivity(helpActivityId,"help",getOrgId(request));
         return responseBean;
     }
 

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

@@ -154,7 +154,7 @@ public class MiniAppController extends BaseController {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
                 TaPerson recommenderPerson = taPersonService.getById(recommender);
                 taSharePersonFrom.setCreateDate(LocalDateTime.now());
-                taSharePersonFrom.setOrgId(getOrgId(request));
+                taSharePersonFrom.setOrgId(orgId);
                 taSharePersonFrom.setPersonId(taPerson.getPersonId());
                 taSharePersonFrom.setSharePersonType(recommenderPerson.getPersonType());
                 taSharePersonFrom.setTargetId(targetId);
@@ -204,12 +204,13 @@ public class MiniAppController extends BaseController {
 
             // 获取其余信息
             Map<String, Object> extraInfo = taPersonService.getExtraInfo(taPerson.getPersonId());
-            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
+            // 所有人员都返回 org yansen 2019-11-13 19:56:18
+//            if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taPerson.getPersonType())){
                 QueryWrapper<TaOrg>orgQueryWrapper = new QueryWrapper<>();
                 orgQueryWrapper.eq("org_id",taPerson.getOrgId());
                 TaOrg org = taOrgService.getOne(orgQueryWrapper);
                 taPerson.setOrg(org);
-            }
+//            }
             Map<String, Object> result = new HashMap<>();
             result.put("miniApp", miniResp);
             result.put("person", taPerson);

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

@@ -1,12 +1,16 @@
 package com.huiju.estateagents.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaOrg;
 import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.mapper.TaOrgMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
@@ -51,6 +55,12 @@ public class TaBuildingController extends BaseController {
     @Autowired
     ITaPersonService iTaPersonService;
 
+    @Autowired
+    TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    TaOrgMapper taOrgMapper;
+
 
     /**
      * 楼盘详情
@@ -350,5 +360,22 @@ public class TaBuildingController extends BaseController {
         ResponseBean taBuilding= taBuildingService.buildingAll(getOrgId(request));
         return taBuilding;
     }
+
+    /**
+     * 校验楼盘是否可以添加
+     */
+    @RequestMapping(value = "/admin/verifyMax", method = RequestMethod.GET)
+    public ResponseBean verifyMax(HttpServletRequest request) {
+        // 根据orgId查询当前楼盘最大数
+        TaOrg taOrg = taOrgMapper.selectById(getOrgId(request));
+        QueryWrapper<TaBuilding> taBuildingQuery = new QueryWrapper<>();
+        taBuildingQuery.eq("org_id", getOrgId(request));
+        taBuildingQuery.gt("status", -1);
+        int orgNum = taBuildingMapper.selectCount(taBuildingQuery);
+        if (orgNum >= taOrg.getBuildingNum()) {
+            return ResponseBean.error("当前系统仅供维护" + taOrg.getBuildingNum() + "个项目，需要维护更多项目，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        return ResponseBean.success("成功");
+    }
 }
 

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

@@ -99,6 +99,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private ITaPointsRecordsService taPointsRecordsService;
 
+    @Autowired
+    private IExtendContentService iExtendContentService;
+
     @InitBinder
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
@@ -310,14 +313,17 @@ public class TaBuildingDynamicController extends BaseController {
                Integer tempIsCheckin = enlist.getIsCheckin();
                enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
-                   if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
+                   System.out.println("验证1");
+                   if (tempIsCheckin.equals(CommConstant.STATUS_UNACCALIMED)){
+                       System.out.println("验证2");
                        enlist.setEnlistId(Integer.valueOf(enlistId));
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
                        QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
                        customerQueryWrapper.eq("person_id",enlist.getPersonId());
                        customerQueryWrapper.eq("building_id",enlist.getBuildingId());
                        TaRecommendCustomer recommendCustomer = recommendCustomerService.getOne(customerQueryWrapper);
-                       if (recommendCustomer.getStatus() < CommConstant.CUSTOMER_VISITE){
+                       if (null != recommendCustomer&&recommendCustomer.getStatus().equals(CommConstant.CUSTOMER_REPORT)){
+                           System.out.println("验证3");
                            recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
                            recommendCustomer.setArrivalDate(LocalDateTime.now());
                            recommendCustomerService.updateById(recommendCustomer);
@@ -416,6 +422,7 @@ public class TaBuildingDynamicController extends BaseController {
         dynamic.setStatus(1);
         //活动状态，如果不需要报名则直接置为进行中
         dynamic.setActivityStatus(1);
+        dynamic.setIsEnlist(1);
         //3.5.1版本去除是否需要报名
 //        if (dynamic.getIsEnlist() == 0){
 //            dynamic.setActivityStatus(0);
@@ -423,7 +430,7 @@ public class TaBuildingDynamicController extends BaseController {
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
 
-        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
         if (heavyCount != 0){
             responseBean.addError("权重已存在，请重新编辑");
             return responseBean;
@@ -459,7 +466,7 @@ public class TaBuildingDynamicController extends BaseController {
         if (dynamic.getEnlistEnd() != null && LocalDateTime.now().isAfter(dynamic.getEnlistEnd())){
             dynamic.setActivityStatus(2);
         }
-        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy());
+        Integer heavyCount = iTaBuildingService.countNumByHeavy(dynamic.getHeavy(), dynamic.getDynamicId());
         if (heavyCount != 0){
             responseBean.addError("权重已存在，请重新编辑");
             return responseBean;
@@ -529,7 +536,8 @@ public class TaBuildingDynamicController extends BaseController {
         dynamicQueryWrapper.eq("dynamic_id", dynamicId);
         TaBuildingDynamic dynamic = iBuildingDynamicService.getOne(dynamicQueryWrapper);
         dynamic.setStatus(0);
-        dynamic.setOrgId(getOrgId(request));
+        // 设置为取消发布以后把轮播图和资讯设置为停用
+        iExtendContentService.updateActivity(dynamicId,"activity",getOrgId(request));
         iBuildingDynamicService.update(dynamic, dynamicQueryWrapper);
         return responseBean;
     }

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

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

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

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingProjectType;
 import com.huiju.estateagents.service.ITaBuildingProjectTypeService;
+import com.huiju.estateagents.service.ITaPersonBuildingService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
 /**
  * <p>
     *   前端控制器
@@ -35,6 +40,12 @@ public class TaBuildingProjectTypeController extends BaseController {
     @Autowired
     public ITaBuildingProjectTypeService iTaBuildingProjectTypeService;
 
+    @Autowired
+    private ITaPersonBuildingService iTaPersonBuildingService;
+
+    @Autowired
+    private ITaPersonService iTaPersonService;
+
 
     /**
      * 分页查询列表

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

@@ -337,7 +337,8 @@ public class TaGoodsController extends BaseController {
             //兑换商品
             String state = iTaGoodsService.exchangeGoods(id,openid);
             if (state.equals(CommConstant.SUCCESS)){
-                responseBean.addSuccess("兑换成功");
+                TaGoods taGoods = iTaGoodsService.getById(id);
+                responseBean.addSuccess(taGoods);
             }else{
                 responseBean.addError(state);
             }

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

@@ -10,10 +10,7 @@ import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.service.ITaBuildingService;
-import com.huiju.estateagents.service.ITaNewsService;
-import com.huiju.estateagents.service.ITaPersonService;
-import com.huiju.estateagents.service.ITaSaveService;
+import com.huiju.estateagents.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -61,7 +58,8 @@ public class TaNewsController extends BaseController {
     @Autowired
     public ITaBuildingService iTaBuildingService;
 
-
+    @Autowired
+    private IExtendContentService iExtendContentService;
     /**
      * 分页查询列表
      * @param pageNum
@@ -168,6 +166,10 @@ public class TaNewsController extends BaseController {
         taNews.setCityId(cityId);
         taNews.setOrgId(getOrgId(request));
         ResponseBean responseBean = iTaNewsService.updateTaNews(taNews);
+        if ("1".equals(String.valueOf(taNews.getNewsStatus()))){
+            // 设置为取消发布以后把轮播图和资讯设置为停用
+            iExtendContentService.updateActivity(String.valueOf(id),"news",getOrgId(request));
+        }
         return responseBean;
     }
 

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

@@ -171,6 +171,9 @@ public class TaPersonVisitRecordController extends BaseController {
     @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
     public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id){
         TaPersonVisitRecord taPersonVisitRecord = iTaPersonVisitRecordService.getById(id);
+        if(null == taPersonVisitRecord){
+            return ResponseBean.error("更新失败",ResponseBean.ERROR_UNAVAILABLE);
+        }
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
         taPersonVisitRecord.setRecordId(id);
         Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
@@ -203,20 +206,21 @@ public class TaPersonVisitRecordController extends BaseController {
     
     /**
      * 盘客工具分页获取访问记录
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.GET)
-    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxPersonVisitRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                                 @RequestParam(value = "customerId") String customerId){
         try {
             //使用分页插件
-            IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaPersonVisitRecord> pg = new Page<>(pageNumber, pageSize);
             IPage<TaPersonVisitRecord> result = iTaPersonVisitRecordService.getPersonVisitRecordList(pg, customerId);
             return ResponseBean.success(result);
         }catch (Exception e){
+            e.printStackTrace();
             logger.error("taPersonVisitRecordList -=- {}",e.toString());
             return ResponseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
         }

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

@@ -68,6 +68,9 @@ public class TaShareActivityController extends BaseController {
     @Autowired
     private ITdPosterTemplateService tdPosterTemplateService;
 
+    @Autowired
+    private  IExtendContentService iExtendContentService;
+
 
     /**
      * 分页查询列表
@@ -126,8 +129,8 @@ public class TaShareActivityController extends BaseController {
     @RequestMapping(value="/admin/taShareActivity",method= RequestMethod.POST)
     public ResponseBean taShareActivityAdd(@RequestBody String parameter, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
         try {
-            TaShareActivity taShareActivity = JSONObject.parseObject(parameter, TaShareActivity.class);
             if  (taShareActivity.getGroupBuyPeople() <= 1){
                 responseBean.addError("拼团人数必须大于等于2人");
                 return responseBean;
@@ -158,6 +161,7 @@ public class TaShareActivityController extends BaseController {
             logger.error("taShareActivityAdd -=- {}",e.toString());
             responseBean.addError(e.getMessage());
         }
+        responseBean.addSuccess(taShareActivity.getGroupActivityId());
         return responseBean;
     }
 
@@ -198,6 +202,7 @@ public class TaShareActivityController extends BaseController {
 
             QueryWrapper<TaShareActivity> taShareActivityQueryWrapper = new QueryWrapper<>();
             taShareActivityQueryWrapper.eq("heavy", taShareActivity.getHeavy());
+            taShareActivityQueryWrapper.ne("group_activity_id", taShareActivity.getGroupActivityId());
             Integer heavyCount = iTaShareActivityService.count(taShareActivityQueryWrapper);
             if (heavyCount != 0){
                 responseBean.addError("权重已存在，请重新编辑");
@@ -245,11 +250,17 @@ public class TaShareActivityController extends BaseController {
         try{
             Integer orgId = getOrgId(request);
             Integer sumPoints = taPersonService.sumPointsByOrgId(orgId);
+            sumPoints = sumPoints == null ? 0 : sumPoints;
             QueryWrapper<TaPerson> taPersonWrapper = new QueryWrapper<>();
             taPersonWrapper.eq("org_id", orgId);
             Integer personNum = taPersonService.count(taPersonWrapper);
             TaShareActivity taShareActivity = new TaShareActivity();
-            taShareActivity.setAverageScore(sumPoints/personNum);
+            if (personNum == 0){
+                taShareActivity.setAverageScore(0);
+            }else{
+                taShareActivity.setAverageScore(sumPoints/personNum);
+            }
+
             responseBean.addSuccess(taShareActivity);
         }catch (Exception e){
             e.printStackTrace();
@@ -310,6 +321,8 @@ public class TaShareActivityController extends BaseController {
         dynamic.setStatus(-1);
         dynamic.setOrgId(getOrgId(request));
         iTaShareActivityService.update(dynamic, taShareActivityQueryWrapper);
+        // 设置为取消发布以后把轮播图和资讯设置为停用
+        iExtendContentService.updateActivity(groupActivityId,"group",getOrgId(request));
         return responseBean;
     }
 

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

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
+import com.huiju.estateagents.entity.TaBuildingProjectType;
 import com.huiju.estateagents.entity.TdBuildingType;
 import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.TaBuildingMapper;
+import com.huiju.estateagents.service.ITaBuildingProjectTypeService;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITdBuildingTypeService;
 import io.swagger.annotations.Api;
@@ -52,6 +54,9 @@ public class TdBuildingTypeController extends BaseController {
     @Autowired
     public TaBuildingMapper taBuildingMapper;
 
+    @Autowired
+    public ITaBuildingProjectTypeService iTaBuildingProjectTypeService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -85,6 +90,27 @@ public class TdBuildingTypeController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 分页查询列表
+     * @return
+     */
+    @RequestMapping(value="/wx/getByBuildingIdSelectBuildingProjectType/{buildingId}",method= RequestMethod.GET)
+    public ResponseBean wxGetBuildingProjectTypeByBuildingIdList(@PathVariable(value ="buildingId") String buildingId, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            // 项目类型
+            QueryWrapper<TaBuildingProjectType> projectTypeQueryWrapper = new QueryWrapper<>();
+            projectTypeQueryWrapper.eq("building_id", buildingId);
+            projectTypeQueryWrapper.eq("status", 1);
+            List<TaBuildingProjectType> result = iTaBuildingProjectTypeService.list(projectTypeQueryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            logger.error("taBuildingProjectTypeList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 分页查询列表
      * @param pageNum

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

@@ -5,7 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaOrgCity;
 import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.mapper.TaOrgCityMapper;
+import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITdCityService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +23,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -38,12 +43,17 @@ public class TdCityController extends BaseController {
     @Autowired
     public ITdCityService iTdCityService;
 
+    @Autowired
+    private TaOrgCityMapper taOrgCityMapper;
+
+    @Autowired
+    private ITaMiniappService iTaMiniappService;
 
     /**
-     * 查询列表
+     * 中心端城市
      * @return
      */
-    @RequestMapping(value="/admin/tdCity",method= RequestMethod.GET)
+    @RequestMapping(value="/center/tdCity",method= RequestMethod.GET)
     public ResponseBean tdCityList(@RequestParam(value = "leveltype", required = false) String leveltype){
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -56,15 +66,33 @@ public class TdCityController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 业务端城市
+     */
+    @RequestMapping(value="/admin/tdCityList/tdCity",method= RequestMethod.GET)
+    public ResponseBean adminTdCityList(HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean<>();
+        List<TaOrgCity> taOrgCityList = taOrgCityMapper.selectAdminTdCityList(getOrgId(request));
+        responseBean.addSuccess(taOrgCityList);
+        return responseBean;
+    }
+
+
     /**
      * 查询列表
      * @return
      */
     @RequestMapping(value="/wx/tdCity",method= RequestMethod.GET)
-    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype){
+    public ResponseBean tdCityListWx(@RequestParam(value = "leveltype", required = false) String leveltype,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        String appId = request.getHeader("appId");
         try {
-            List<TdCity> result = iTdCityService.selectCity(leveltype, "1");
+            //通过appid获取orgId
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("miniapp_id", appId);
+            TaMiniapp taMiniapp = iTaMiniappService.getOne(taMiniappQueryWrapper);
+            /**leveltype,暂时保留*/
+            List<TdCity> result = iTdCityService.selectWxCity(leveltype, taMiniapp.getOrgId());
             responseBean.addSuccess(result);
         }catch (Exception e){
             logger.error("tdCityList -=- {}",e.toString());
@@ -152,4 +180,22 @@ public class TdCityController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 根据经纬度查询城市ID
+     * 经度在前，纬度在后，经纬度间以“,”分割，经纬度小数点后不要超过 6 位
+     * @return
+     */
+    @RequestMapping(value="/wx/location/city",method= RequestMethod.GET)
+    public ResponseBean wxLocationCityDetail(@RequestParam(value = "location") String location,HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            TdCity tdCity = iTdCityService.getLocationCity(location);
+            responseBean.addSuccess(tdCity);
+        }catch (Exception e){
+            logger.error("tdCityList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -201,6 +201,7 @@ public class TaBuilding implements Serializable {
     /**
      * 地图数据
      */
+    @TableField(exist = false)
     private String mapJson;
 
     /**

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

@@ -205,6 +205,11 @@ public class TaBuildingDynamic implements Serializable {
 
     private String qrCode;
 
+    /**
+     * 活动主图2 用于首页底部活动轮播
+     */
+    private  String bannerListImg;
+
     @TableField(exist = false)
     private List<TaPoster> posters;
 

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

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_building_map_relation")
+public class TaBuildingMapRelation implements Serializable {
+
+    @TableId(value = "map_id", type = IdType.AUTO)
+    private Integer mapId;
+
+    private static final long serialVersionUID = 1L;
+
+    private String buildingId;
+
+    private Integer orgId;
+
+    private String types;
+
+    private String data;
+
+    private String label;
+
+    @TableField(value = "`key`")
+    private String key;
+
+    private Integer status;
+
+    private LocalDateTime createDate;
+
+
+}

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

@@ -24,11 +24,18 @@ import java.util.List;
 public class TaOrgCity implements Serializable {
 
     private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
     /**
      * 省份id
      * 城市id
      */
-    private Integer id;
+    private Integer cityId;
 
     /**
      * 省市区名称
@@ -49,4 +56,10 @@ public class TaOrgCity implements Serializable {
      * 上级ID
      */
     private Integer parentid;
+
+    /**
+     * 城市首字母
+     */
+    @TableField(exist = false)
+    private String initial;
 }

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

@@ -107,5 +107,11 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String buildingName;
+    
+    /**
+     * 活动名称
+     */
+    @TableField(exist = false)
+    private String activityName;
 
 }

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

@@ -195,4 +195,7 @@ public class TaRecommendCustomer implements Serializable {
 
     @TableField(exist = false)
     private Map<String,String> geoInfo;
+
+    @TableField(exist = false)
+    private String avatarurl;
 }

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

@@ -55,8 +55,8 @@ public class AgentsRecommendCustomer {
     /**
      * 邀请经纪人（数量）
      */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "邀请经纪人（数量）", index = 6)
-    private String agentCount;
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "邀请经纪人（数量）", index = 6)
+//    private String agentCount;
 
 }

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

@@ -1,17 +1,9 @@
 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 com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,13 +28,13 @@ public class CustomerStatisticTimeJob extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(CustomerStatisticTimeJob.class);
 
     @Autowired
-    private ITaCustomerStatisticDailyService customerStatisticDailyService;
+    private ITsCustomerStatisticDailyService customerStatisticDailyService;
     
     @Autowired
-    private ITaCustomerGenderStatisticService taCustomerGenderStatisticService;
+    private ITsCustomerGenderStatisticService taCustomerGenderStatisticService;
     
     @Autowired
-    private ITaCustomerStatisticMonthlyService customerStatisticMonthlyService;
+    private ITsCustomerStatisticMonthlyService customerStatisticMonthlyService;
 
     /**
      *
@@ -50,7 +42,8 @@ public class CustomerStatisticTimeJob extends BaseController {
      *
      * 开启定时任务，每天23:50执行
      */
-    @Scheduled(cron = "00 50 23 * * ?")
+    @Scheduled(cron = "59 50 23 * * ?")
+    //@Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();
     

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

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

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

@@ -90,5 +90,5 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * 根据权重统计该权重是否存在
      * @return
      */
-    int countNumByHeavy(@Param("heavy") Integer heavy);
+    int countNumByHeavy(@Param("heavy") Integer heavy, @Param("dynamicId") String dynamicId);
 }

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

@@ -3,6 +3,10 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaOrgCity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -14,4 +18,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaOrgCityMapper extends BaseMapper<TaOrgCity> {
+    // 查询所有的城市排除省份
+    ArrayList<String> selectByIdCity(@Param("orgId") Integer orgId);
+
+    /**
+     * 根据orgid查询城市并排除省份
+     * @param orgId
+     * @return
+     */
+    List<TaOrgCity> selectAdminTdCityList(Integer orgId);
 }

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

@@ -187,4 +187,6 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     TaRecommendCustomer getMyCustDetailById(String customerId);
 
     List<PersonIntention> getCustomerIntentions(@Param("personId")String personId);
+
+    IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId);
 }

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

@@ -20,4 +20,10 @@ import java.util.List;
 public interface TdCityMapper extends BaseMapper<TdCity> {
     List<TdCity> selectCity(@Param("leveltype")String leveltype,@Param("status") String status);
 
+    /**
+     *查出当前ta_org_city下的城市
+     * @param orgId
+     * @return
+     */
+    List<TdCity> selectWxCity(@Param("orgId") Integer orgId);
 }

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

@@ -38,4 +38,11 @@ public interface IExtendContentService extends IService<ExtendContent> {
      * @return
      */
     ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId,Integer orgId);
+
+    /**
+     * 更新活动拼团助力
+     * @param dynamicId
+     * @param type
+     */
+    void updateActivity(String dynamicId, String type,Integer orgId);
 }

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

@@ -38,7 +38,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * 活动助力添加
      * @param helpActivity
      */
-    void helpActivityAdd(HelpActivity helpActivity,Integer orgId);
+    int helpActivityAdd(HelpActivity helpActivity,Integer orgId);
 
     /**
      * 活动助力修改

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaBuildingMapRelation;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+public interface ITaBuildingMapRelationService extends IService<TaBuildingMapRelation> {
+
+}

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

@@ -165,5 +165,5 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param heavy
      * @return
      */
-    int countNumByHeavy(Integer heavy);
+    int countNumByHeavy(Integer heavy, String dynamicId);
 }

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

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

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

@@ -71,4 +71,17 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
         responseBean.addSuccess(taExtendContent);
         return responseBean;
     }
+
+    @Override
+    public void updateActivity(String dynamicId, String type,Integer orgId) {
+    QueryWrapper<ExtendContent> queryWrapperExtendContent = new QueryWrapper<>();
+        queryWrapperExtendContent.eq("target_id",dynamicId);
+        queryWrapperExtendContent.eq("content_type",type);
+        queryWrapperExtendContent.eq("org_id",orgId);
+        List<ExtendContent> list = extendContentMapper.selectList(queryWrapperExtendContent);
+        for (ExtendContent extendContent : list){
+            extendContent.setStatus(0);
+            extendContentMapper.updateById(extendContent);
+        }
+    }
 }

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

@@ -65,10 +65,11 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public void helpActivityAdd(HelpActivity helpActivity, Integer orgId) {
+    public int helpActivityAdd(HelpActivity helpActivity, Integer orgId) {
         helpActivity.setOrgId(orgId)
                 .setCreateDate(LocalDateTime.now());
-        taHelpActivityMapper.insert(helpActivity);
+                taHelpActivityMapper.insert(helpActivity);
+        return helpActivity.getHelpActivityId();
     }
 
     @Override

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

@@ -241,6 +241,10 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
             responseBean.addError("当前报名人数已满");
             return responseBean;
         }
+        if(null != buildingDynamic.getEnlistStart() && buildingDynamic.getEnlistStart().isAfter(LocalDateTime.now())){
+            responseBean.addError("当前活动未开始报名");
+            return responseBean;
+        }
         if(null != buildingDynamic.getEnlistEnd() && buildingDynamic.getEnlistEnd().isBefore(LocalDateTime.now())){
             responseBean.addError("当前活动已结束报名");
             return responseBean;
@@ -258,7 +262,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         // 默认未签到
         taActivityDynamicEnlist.setIsCheckin(0);
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
-                .setBuildingId(taBuildingDynamic.getDynamicId());
+                .setBuildingId(taBuildingDynamic.getBuildingId());
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
         int joinNum = taBuildingDynamic.getEnlistNum() == null ? taActivityDynamicEnlist.getAttendNum():taBuildingDynamic.getEnlistNum()+taActivityDynamicEnlist.getAttendNum();
         taBuildingDynamic.setEnlistNum(joinNum);

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaBuildingMapRelation;
+import com.huiju.estateagents.mapper.TaBuildingMapRelationMapper;
+import com.huiju.estateagents.service.ITaBuildingMapRelationService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-11-13
+ */
+@Service
+public class TaBuildingMapRelationServiceImpl extends ServiceImpl<TaBuildingMapRelationMapper, TaBuildingMapRelation> implements ITaBuildingMapRelationService {
+
+}

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

@@ -13,6 +13,7 @@ import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.service.ITaBuildingMapRelationService;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.service.TaPosterService;
@@ -86,6 +87,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private  TaOrgMapper  taOrgMapper;
 
+    @Autowired
+    private ITaBuildingMapRelationService iTaBuildingMapRelationService;
+
     @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<>();
@@ -104,6 +108,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
                 List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(queryWrapper);
                 taBuilding.setBuildingImg(buildingImg);
+
+                //查询封面当前图片
+                QueryWrapper<TaBuildingImg> queryListWrapper = new QueryWrapper<>();
+                queryListWrapper.eq("building_id", taBuilding.getBuildingId());
+                queryListWrapper.eq("img_type", CommConstant.BUILDING_IMG_LIST);
+                queryListWrapper.orderByAsc("create_date");
+
+                List<TaBuildingImg> buildingListImg = taBuildingImgMapper.selectList(queryListWrapper);
+                taBuilding.setBuildingListImg(buildingListImg);
             }
         }
 
@@ -130,10 +143,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
      */
     private List<TaBuildingImg> getBuildingImg(String buildingId, String imgType) {
         //查询当前图片
-        QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
-        BuildingImgQueryWrapper.eq("building_id", buildingId);
-        BuildingImgQueryWrapper.eq("img_type", imgType);
-        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
+        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
+        buildingImgQueryWrapper.eq("building_id", buildingId);
+        buildingImgQueryWrapper.eq("img_type", imgType);
+        buildingImgQueryWrapper.orderByAsc("order_no");
+        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
         return  buildingImg.size() > 0 ? buildingImg : null;
     }
 
@@ -168,6 +182,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
         building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
+        // 查询 周边数据
+        QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
+        mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
+        mapRelationQueryWrapper.eq("org_id", building.getOrgId());
+        List<TaBuildingMapRelation> mapRelationList = iTaBuildingMapRelationService.list(mapRelationQueryWrapper);
+        building.setMapJson(mapRelationList.size() > 0 ? JSONObject.toJSONString(mapRelationList) : null);
+
         return ResponseBean.success(building);
     }
 
@@ -179,6 +200,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,id);
         TaBuilding building = taBuildingMapper.selectOne(buildingtWrapper);
 
+        if (null == building){
+            return ResponseBean.error("项目不存在",ResponseBean.ERROR_UNAVAILABLE);
+        }
         //查询当前图片
         building.setBuildingImg(getBuildingImg(id, CommConstant.BUILDING_IMG_BANNER));
 
@@ -202,6 +226,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         QueryWrapper<TaBuildingApartment> AppointmentQueryWrapper = new QueryWrapper<>();
         AppointmentQueryWrapper.eq("building_id", id);
         AppointmentQueryWrapper.eq("status", 1);
+        AppointmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> appoint = taBuildingApartmentMapper.selectList(AppointmentQueryWrapper);
         for (TaBuildingApartment apar:appoint) {
             List<TaBuildingImg> imgs = taBuildingImgMapper.getBuildingImgByApartment(apar.getApartmentId());
@@ -247,9 +272,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         shareActivityQueryWrapper.eq("status", 1);
         shareActivityQueryWrapper.in("activity_status", 0, 1);
         List<TaShareActivity> shareActivityList = taShareActivityMapper.selectList(shareActivityQueryWrapper);
-
         building.setShareActivityList(shareActivityList);
 
+        // 查询 周边数据
+        QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
+        mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
+        mapRelationQueryWrapper.eq("org_id", building.getOrgId());
+        List<TaBuildingMapRelation> mapRelationList = iTaBuildingMapRelationService.list(mapRelationQueryWrapper);
+        building.setMapJson(mapRelationList.size() > 0 ? JSONObject.toJSONString(mapRelationList) : null);
 
         return ResponseBean.success(building);
     }
@@ -258,7 +288,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     public ResponseBean buildingUpdate(String parameter, Integer orgId) {
         JSONObject object= JSONObject.parseObject(parameter);
 
-        TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
 
         // 先删除视频
         UpdateWrapper<TaBuilding> updateWrapper = new UpdateWrapper<>();
@@ -328,6 +358,20 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
+
+        // 地图周边
+        JSONArray mapJson = object.getJSONArray("mapJson");
+        if (null != mapJson) {
+            // 先删除
+            QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
+            mapRelationQueryWrapper.eq("building_id", building.getBuildingId());
+            mapRelationQueryWrapper.eq("org_id", orgId);
+            iTaBuildingMapRelationService.remove(mapRelationQueryWrapper);
+
+            List<TaBuildingMapRelation> taBuildingMapRelations = mapJson.toJavaList(TaBuildingMapRelation.class);
+            insertBuildingMapRelationBeach(taBuildingMapRelations, building.getBuildingId(), orgId);
+        }
+
         return ResponseBean.success(building);
     }
 
@@ -347,10 +391,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         taBuildingQuery.gt("status",-1);
         int orgNum= taBuildingMapper.selectCount(taBuildingQuery);
         if (orgNum >= taOrg.getBuildingNum()){
-            return ResponseBean.error("楼盘已超过最大限制", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("当前系统仅供维护"+taOrg.getBuildingNum()+"个项目，需要维护更多项目，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
         }
 
-        TaBuilding building = JSONObject.parseObject(parameter,TaBuilding.class);
+        TaBuilding building = object.toJavaObject(TaBuilding.class);
         if(null!= object.getDate("openingDate")){
             building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
         }
@@ -376,7 +420,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         // 视频封面图
         String videoImage = object.getString("videoImage");
-        List<TaBuildingImg> videoImageList = JSONObject.parseArray(imgStr, TaBuildingImg.class);
+        List<TaBuildingImg> videoImageList = JSONObject.parseArray(videoImage, TaBuildingImg.class);
         if (CollectionUtils.isNotEmpty(videoImageList)) {
             videoImageList = insertImgBatch(videoImageList, building.getBuildingId());
         }
@@ -401,9 +445,37 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
 
+        // 地图周边
+        JSONArray mapJson = object.getJSONArray("mapJson");
+        if (null != mapJson) {
+            List<TaBuildingMapRelation> taBuildingMapRelations = mapJson.toJavaList(TaBuildingMapRelation.class);
+            insertBuildingMapRelationBeach(taBuildingMapRelations, building.getBuildingId(), orgId);
+        }
+
+
         return ResponseBean.success(building);
     }
 
+    /**
+     * 批量插入 周边地图数据
+     * @param list
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    private List<TaBuildingMapRelation> insertBuildingMapRelationBeach(List<TaBuildingMapRelation> list, String buildingId, Integer orgId) {
+        List<TaBuildingMapRelation> newList = list.stream().map(e -> {
+            e.setBuildingId(buildingId);
+            e.setOrgId(orgId);
+            e.setStatus(1);
+            e.setCreateDate(LocalDateTime.now());
+            return e;
+        }).collect(Collectors.toList());
+
+        iTaBuildingMapRelationService.saveBatch(newList);
+        return newList;
+    }
+
     @Override
     public ResponseBean buildingUpdateStatus(String parameter, Integer orgId) {
         TaBuilding  building = new TaBuilding();
@@ -449,6 +521,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
+
         //图片数组
         String imgStr = jsonobject.getString("img");
         //转集合
@@ -476,6 +549,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("apartment_id", building.getApartmentId());
+        building.setInsideArea(building.getInsideArea() == null ? 0d : building.getInsideArea());
         taBuildingApartmentMapper.update(building,buildingApartmentQueryWrapper);
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
@@ -559,6 +633,19 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (CollectionUtils.isNotEmpty(buildingList)) {
             for (TaBuilding build:buildingList) {
                 getBuildingAttaches(build);
+
+                // 兼容 3.0/3.5 版本（3.0/3.5 封面取的全是 buildingListImg 的第一张），因为在3.5.1新增了封面图
+
+                // 获取封面图
+                List<TaBuildingImg> buildingListImg = build.getBuildingListImg();
+                if (CollectionUtils.isNotEmpty(buildingListImg)) {
+                    // 把封面图写入到 BuildingImg 的第一张
+                    if (CollectionUtils.isNotEmpty(build.getBuildingImg())) {
+                        build.getBuildingImg().add(0, buildingListImg.get(0));
+                    }
+                }
+
+
             }
         }
 
@@ -673,6 +760,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
                 buildingImgQueryWrapper.eq("img_id", img.getImgId());
                 buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                buildingImgQueryWrapper.orderByAsc("order_no");
                 return taBuildingImgMapper.selectOne(buildingImgQueryWrapper);
             }).collect(Collectors.toList());
 
@@ -689,14 +777,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingApartmentQueryWrapper.eq("apartment_id", id);
         TaBuildingApartment buildingApartment = taBuildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
 
-        TaBuilding  building= new TaBuilding();
+//        TaBuilding  building= new TaBuilding();
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
         buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,buildingApartment.getBuildingId());
-        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
-
-        if (bui.getStatus().equals(1)){
-            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
-        }
+//        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
+//        if (bui.getStatus().equals(1)){
+//            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
+//        }
 
         buildingApartment.setStatus(-1);
        taBuildingApartmentMapper.update(buildingApartment,buildingApartmentQueryWrapper);
@@ -727,8 +814,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public int countNumByHeavy(Integer heavy) {
-        return taBuildingMapper.countNumByHeavy(heavy);
+    public int countNumByHeavy(Integer heavy, String dynamicId) {
+        return taBuildingMapper.countNumByHeavy(heavy, dynamicId);
     }
 
 

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

@@ -64,11 +64,11 @@ public class TaGoodsServiceImpl extends ServiceImpl<TaGoodsMapper, TaGoods> impl
 		}
 
 		//判断积分是否足够
-		if (taPerson.getPoints() < taGoods.getPointPrice()){
+		if (null == taPerson.getPoints() || taPerson.getPoints().intValue() < taGoods.getPointPrice()){
 			return "积分不足，请先获取积分";
 		}
 		//判断商品是否够兑换
-		if (taGoods.getInventory() < 1){
+		if (null == taGoods.getInventory()|| taGoods.getInventory().intValue() < 1){
 			return "此商品无库存";
 		}
 

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

@@ -86,6 +86,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     @Autowired
     private TaShareContentService taShareContentService;
+    
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
 
 
     @Resource
@@ -232,10 +235,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         // 获取关联项目
         List<TaPersonBuilding> buildingList = getPersonBuildings(user.getUserId().toString());
         List<String> buildings = new ArrayList<>();
+        TaBuilding taBuilding = new TaBuilding();
         if (null != buildingList && buildingList.size() > 0) {
             for(TaPersonBuilding b: buildingList) {
                 buildings.add(b.getBuildingId());
             }
+            //获取楼盘信息
+            taBuilding = taBuildingMapper.selectById(buildingList.get(0).getBuildingId());
         }
 
         Map<String, Object> result = new HashMap<>();
@@ -255,7 +261,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("liked", false);
         result.put("unReadNum", 0);
         result.put("projects", buildings);
-        result.put("address", user.getAddress());
+        result.put("address", taBuilding.getAddress());
+        result.put("coordinate", taBuilding.getCoordinate());
         result.put("personTags",person.getPersonTags());
         result.put("posters",taPosterService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
         result.put("shareContent",taShareContentService.getPostersForTarget(user.getUserId().toString(),CommConstant.POSTER_CONTENT_TYPE_PERSON));
@@ -383,7 +390,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         boolean yestodaySigned = null != taPersonSign && DateUtils.sameDay(LocalDateTime.now().minusDays(1), taPersonSign.getSignDate());
 
         if (todaySigned) {
-            return ResponseBean.error("请不要重复getPersonId(request);", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error("请不要重复签到", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int durationDays = !yestodaySigned ? 1 : taPersonSign.getDurationDays() + 1;
@@ -447,6 +454,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             QueryWrapper<TaUser> userQueryWrapper = new QueryWrapper<>();
             userQueryWrapper.in("user_id",idLists);
             userQueryWrapper.eq("is_consultant", true);
+            userQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
             data = taUserService.page(page,userQueryWrapper);
         }
 

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

@@ -2,12 +2,20 @@ package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.HelpActivity;
+import com.huiju.estateagents.entity.TaBuildingDynamic;
+import com.huiju.estateagents.entity.TaNews;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.entity.TaShareActivity;
+import com.huiju.estateagents.mapper.HelpActivityMapper;
+import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
+import com.huiju.estateagents.mapper.TaNewsMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
+import com.huiju.estateagents.mapper.TaShareActivityMapper;
 import com.huiju.estateagents.service.ITaPersonVisitRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -31,6 +39,18 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	@Autowired
 	private TaPersonVisitRecordMapper personVisitRecordMapper;
 	
+	@Autowired
+	private TaBuildingDynamicMapper taBuildingDynamicMapper;
+	
+	@Autowired
+	private TaShareActivityMapper taShareActivityMapper;
+	
+	@Autowired
+	private HelpActivityMapper helpActivityMapper;
+	
+	@Autowired
+	private TaNewsMapper taNewsMapper;
+	
 	/**
 	 * 分页获取客户访问记录
 	 *
@@ -42,6 +62,41 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 	public IPage<TaPersonVisitRecord> getPersonVisitRecordList(IPage<TaPersonVisitRecord> pg, String customerId) {
 		TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(customerId);
 		IPage<TaPersonVisitRecord> result = personVisitRecordMapper.getPersonVisitRecordList(pg,taRecommendCustomer.getPersonId());
+		List<TaPersonVisitRecord> records = result.getRecords();
+		records.forEach(e -> {
+			//获取活动标题
+			if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+				TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
+				if (null != taBuildingDynamic){
+					e.setActivityName(taBuildingDynamic.getTitle());
+				}
+				
+			}
+			//获取拼团标题
+			if ("group".equals(e.getEventType()) && null != e.getTargetId()){
+				TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
+				if (null != taShareActivity){
+					e.setActivityName(taShareActivity.getActivityName());
+				}
+			}
+			//获取助力标题
+			if ("help".equals(e.getEventType()) && null != e.getTargetId()){
+				HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
+				if (null != helpActivity){
+					e.setActivityName(helpActivity.getTitle());
+				}
+				
+			}
+			//获取咨询标题
+			if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+				TaNews taNews = taNewsMapper.selectById(e.getTargetId());
+				if (null != taNews){
+					e.setActivityName(taNews.getNewsName());
+				}
+				
+			}
+		});
+		result.setRecords(records);
 		return result;
 	}
 //    @Autowired

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

@@ -179,13 +179,20 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setSex(params.getInteger("sex"));
         taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRecommendPerson(params.getString("recommendPerson"));
-        taRecommendCustomer.setBuildingId(params.getString("buildingId"));
+        taRecommendCustomer.setBuildingId(params.getString("intention"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
         taRecommendCustomer.setOrgId(orgId);
+       QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
+       personQueryWrapper.eq("org_id",orgId);
+       personQueryWrapper.eq("phone",params.getString("phone"));
+        TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
+        if(null != currentPerson){
+            taRecommendCustomer.setPersonId(currentPerson.getPersonId());
+        }
 
         // 时间格式 yyyy-MM-dd
         String at = params.getString("appointmentTime");
@@ -220,6 +227,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
         queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
+        queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
         if (null != result && result.size() > 0) {
             return ResponseBean.error("当前客户已被推荐, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -268,6 +276,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
+        TaBuilding building = taBuildingMapper.selectById(params.getString("buildingId"));
+        taRecommendCustomer.setIntention(building.getBuildingName());
         taRecommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
@@ -288,6 +298,13 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
+        QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
+        personQueryWrapper.eq("org_id",orgId);
+        personQueryWrapper.eq("phone",params.getString("phone"));
+        TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
+        if(null != currentPerson){
+            taRecommendCustomer.setPersonId(currentPerson.getPersonId());
+        }
 
 
 //        String status = params.getString("status");
@@ -298,12 +315,29 @@ 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());
+        queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
         if (null != result && result.size() > 0) {
-            return ResponseBean.error("当前客户已被报备, 不能再次报备", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            String conName = "";
+            TaPerson conPerson = taPersonMapper.selectById(result.get(0).getRealtyConsultant());
+            if (null != conPerson){
+                if(params.getString("realtyConsultant").equals(conPerson.getPersonId())){
+                   return  ResponseBean.success("bound");
+                }
+                conName = conPerson.getName();
+            }else {
+                TaUser conUser = userService.getById(result.get(0).getRealtyConsultant());
+                if(null != conUser){
+                    if(params.getString("realtyConsultant").equals(conUser.getUserId().toString())){
+                        return ResponseBean.success("bound");
+                    }
+                    conName = conUser.getUserName();
+
+                }
+            }
+            return ResponseBean.error("您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
@@ -463,7 +497,10 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             }else {
                 user = userService.getById(consultant.getUserId());
             }
-            user.setProjects(taPersonMapper.getUserProjects(user.getUserId()));
+            List<String> projects = taPersonMapper.getUserProjects(user.getUserId());
+            if (projects.size()>0){
+                user.setProjects(projects);
+            }
             taRecommendCustomer.setConsultant(user);
         }
         return taRecommendCustomer;
@@ -493,12 +530,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
         // todo
         // 此处可能不是 person_id 而是 recommend_person
-        queryWrapper.eq("recommend_person",customerId);
-//        queryWrapper.eq("building_id",building);
-        queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
-        queryWrapper.eq("org_id", orgId);
         IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+//        queryWrapper.eq("recommend_person",customerId);
+////        queryWrapper.eq("building_id",building);
+//        queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
+//        queryWrapper.eq("org_id", orgId);
+        return taRecommendCustomerMapper.getCustomersIRecommended(page,customerId,CommConstant.STATUS_NORMAL,orgId);
     }
 
     @Override

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

@@ -54,6 +54,9 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
         if (null != uvs && uvs.size() > 0) {
             for(int i=0;i<uvs.size();i++){
                 uvs.get(i).setCreateDate(LocalDateTime.now());
+                uvs.get(i).setNameOrnick(taPerson.getNickname());
+                uvs.get(i).setPersonId(taPerson.getPersonId());
+                uvs.get(i).setPhotoOravatar(taPerson.getAvatarurl());
             }
             if(this.updateBatchById(uvs)){
                 return ResponseBean.success("");

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

@@ -1,11 +1,16 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TdCityMapper;
 import com.huiju.estateagents.service.ITdCityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
 
@@ -26,4 +31,40 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
         return tdCityMapper.selectCity(leveltype, status);
     }
 
+
+    @Override
+    public List<TdCity> selectWxCity(String leveltype, Integer orgId) {
+        List<TdCity>  tdCityList= tdCityMapper.selectWxCity(orgId);
+        return tdCityList;
+    }
+    
+    /**
+     * 根据经纬度获取城市详情信息
+     *
+     * @param location
+     * @return
+     */
+    @Override
+    public TdCity getLocationCity(String location) {
+        //获取高德地图的坐标
+        String amapString = CommConstant.AMAP_HTTP + "?location="+location+"&key=" + CommConstant.AMAP_KEY;
+        RestTemplate restTemplate = new RestTemplate();
+        String forObject = restTemplate.getForObject(amapString, String.class);
+        JSONObject jsonObject = JSONObject.parseObject(forObject);
+        //返回城市信息
+        if (jsonObject.getString("status").equals("1")){
+            JSONObject addressComponent = jsonObject.getJSONObject("regeocode").getJSONObject("addressComponent");
+            String citycode = addressComponent.getString("citycode");
+            QueryWrapper<TdCity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("citycode",citycode);
+            queryWrapper.eq("leveltype",2);
+            List<TdCity> tdCities = tdCityMapper.selectList(queryWrapper);
+            if (tdCities.size() > 0){
+                return tdCities.get(0);
+            }
+            return null;
+        }
+        return null;
+    }
+    
 }

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

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -171,6 +172,8 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         try {
             taCustomerFollowUpRecord.setFollowerId(person.getPersonId());
+            taCustomerFollowUpRecord.setCreateDate(LocalDateTime.now());
+            taCustomerFollowUpRecord.setOrgId(orgId);
             if (iTaCustomerFollowUpRecordService.save(taCustomerFollowUpRecord)){
                 responseBean.addSuccess(taCustomerFollowUpRecord);
             }else {
@@ -186,14 +189,14 @@ public class TaCustomerFollowUpRecordController extends BaseController {
     
     /**
      * 分页查询跟进记录列表
-     * @param pageNum
+     * @param pageNumber
      * @param pageSize
      * @return
      */
     @RequestMapping(value="/wx/taCustomerFollowUpRecord",method= RequestMethod.GET)
-    public ResponseBean wxCustomerFollowUpRecordList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean wxCustomerFollowUpRecordList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                      @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                     @RequestParam(value ="customerId",required = true) Integer customerId,
+                                                     @RequestParam(value ="customerId",required = true) String customerId,
                                                      HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
@@ -205,7 +208,7 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         TaPerson person = taPersons.get(0);
         try {
             //使用分页插件
-            IPage<TaCustomerFollowUpRecord> pg = new Page<>(pageNum, pageSize);
+            IPage<TaCustomerFollowUpRecord> pg = new Page<>(pageNumber, pageSize);
             QueryWrapper<TaCustomerFollowUpRecord> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("follower_id",person.getPersonId());
             queryWrapper.eq("org_id",orgId);
@@ -222,3 +225,4 @@ public class TaCustomerFollowUpRecordController extends BaseController {
         return responseBean;
     }
 }
+

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerGenderStatisticController.java → src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerGenderStatisticController.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
-import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,12 +33,15 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-public class TaCustomerGenderStatisticController extends BaseController {
+public class TsCustomerGenderStatisticController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaCustomerGenderStatisticController.class);
+    private final Logger logger = LoggerFactory.getLogger(TsCustomerGenderStatisticController.class);
 
     @Autowired
-    public ITaCustomerGenderStatisticService iTaCustomerGenderStatisticService;
+    public ITsCustomerGenderStatisticService iTaCustomerGenderStatisticService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
 
     /**
@@ -51,11 +56,11 @@ public class TaCustomerGenderStatisticController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaCustomerGenderStatistic> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
+		    IPage<TsCustomerGenderStatistic> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
-            IPage<TaCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.page(pg, queryWrapper);
+            IPage<TsCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -71,7 +76,7 @@ public class TaCustomerGenderStatisticController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerGenderStatistic",method= RequestMethod.POST)
-    public ResponseBean taCustomerGenderStatisticAdd(@RequestBody TaCustomerGenderStatistic taCustomerGenderStatistic){
+    public ResponseBean taCustomerGenderStatisticAdd(@RequestBody TsCustomerGenderStatistic taCustomerGenderStatistic){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerGenderStatisticService.save(taCustomerGenderStatistic)){
@@ -117,7 +122,7 @@ public class TaCustomerGenderStatisticController extends BaseController {
      */
     @RequestMapping(value="/taCustomerGenderStatistic/{id}",method= RequestMethod.PUT)
     public ResponseBean taCustomerGenderStatisticUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCustomerGenderStatistic taCustomerGenderStatistic){
+                                        @RequestBody TsCustomerGenderStatistic taCustomerGenderStatistic){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerGenderStatisticService.updateById(taCustomerGenderStatistic)){
@@ -158,13 +163,20 @@ public class TaCustomerGenderStatisticController extends BaseController {
     public ResponseBean wxCustomerGenderStatisticList(@PathVariable(value = "customerType") String customerType, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            //查询当前小程序的男女比统计
-            QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
+            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);
+            //查询当前小程序的当前置业顾问男女比统计
+            QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq("customer_type",customerType);
+            queryWrapper.eq("realty_consultant",person.getPersonId());
             queryWrapper.orderByDesc("create_date");
      
-            List<TaCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);
+            List<TsCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticDailyController.java → src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticDailyController.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,13 +33,15 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-public class TaCustomerStatisticDailyController extends BaseController {
+public class TsCustomerStatisticDailyController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticDailyController.class);
+    private final Logger logger = LoggerFactory.getLogger(TsCustomerStatisticDailyController.class);
 
     @Autowired
-    public ITaCustomerStatisticDailyService iTaCustomerStatisticDailyService;
-
+    public ITsCustomerStatisticDailyService iTaCustomerStatisticDailyService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
 
     /**
      * 分页查询列表
@@ -51,11 +55,11 @@ public class TaCustomerStatisticDailyController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaCustomerStatisticDaily> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaCustomerStatisticDaily> queryWrapper = new QueryWrapper<>();
+		    IPage<TsCustomerStatisticDaily> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsCustomerStatisticDaily> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
-            IPage<TaCustomerStatisticDaily> result = iTaCustomerStatisticDailyService.page(pg, queryWrapper);
+            IPage<TsCustomerStatisticDaily> result = iTaCustomerStatisticDailyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -71,7 +75,7 @@ public class TaCustomerStatisticDailyController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerStatisticDaily",method= RequestMethod.POST)
-    public ResponseBean taCustomerStatisticDailyAdd(@RequestBody TaCustomerStatisticDaily taCustomerStatisticDaily){
+    public ResponseBean taCustomerStatisticDailyAdd(@RequestBody TsCustomerStatisticDaily taCustomerStatisticDaily){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerStatisticDailyService.save(taCustomerStatisticDaily)){
@@ -117,7 +121,7 @@ public class TaCustomerStatisticDailyController extends BaseController {
      */
     @RequestMapping(value="/taCustomerStatisticDaily/{id}",method= RequestMethod.PUT)
     public ResponseBean taCustomerStatisticDailyUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCustomerStatisticDaily taCustomerStatisticDaily){
+                                        @RequestBody TsCustomerStatisticDaily taCustomerStatisticDaily){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerStatisticDailyService.updateById(taCustomerStatisticDaily)){
@@ -159,8 +163,14 @@ public class TaCustomerStatisticDailyController extends BaseController {
     public ResponseBean wxCustomerStatisticDailyList(@PathVariable(value = "customerType") String customerType,
                                                      HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        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 {
-            List<TaCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request));
+            List<TsCustomerStatisticDaily> list = iTaCustomerStatisticDailyService.getDailyList(customerType,getOrgId(request),person.getPersonId(),person.getUserId());
             responseBean.addSuccess(list);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/huiju/estateagents/statistic/controller/TaCustomerStatisticMonthlyController.java → src/main/java/com/huiju/estateagents/statistic/controller/TsCustomerStatisticMonthlyController.java

@@ -5,8 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.service.ITaPersonService;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,14 +33,16 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-public class TaCustomerStatisticMonthlyController extends BaseController {
+public class TsCustomerStatisticMonthlyController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaCustomerStatisticMonthlyController.class);
+    private final Logger logger = LoggerFactory.getLogger(TsCustomerStatisticMonthlyController.class);
 
     @Autowired
-    public ITaCustomerStatisticMonthlyService iTaCustomerStatisticMonthlyService;
-
-
+    public ITsCustomerStatisticMonthlyService iTaCustomerStatisticMonthlyService;
+    
+    @Autowired
+    private ITaPersonService taPersonService;
+    
     /**
      * 分页查询列表
      * @param pageNum
@@ -51,11 +55,11 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaCustomerStatisticMonthly> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
+		    IPage<TsCustomerStatisticMonthly> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TsCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
-            IPage<TaCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.page(pg, queryWrapper);
+            IPage<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();
@@ -71,7 +75,7 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
      * @return
      */
     @RequestMapping(value="/taCustomerStatisticMonthly",method= RequestMethod.POST)
-    public ResponseBean taCustomerStatisticMonthlyAdd(@RequestBody TaCustomerStatisticMonthly taCustomerStatisticMonthly){
+    public ResponseBean taCustomerStatisticMonthlyAdd(@RequestBody TsCustomerStatisticMonthly taCustomerStatisticMonthly){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerStatisticMonthlyService.save(taCustomerStatisticMonthly)){
@@ -117,7 +121,7 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
      */
     @RequestMapping(value="/taCustomerStatisticMonthly/{id}",method= RequestMethod.PUT)
     public ResponseBean taCustomerStatisticMonthlyUpdate(@PathVariable Integer id,
-                                        @RequestBody TaCustomerStatisticMonthly taCustomerStatisticMonthly){
+                                        @RequestBody TsCustomerStatisticMonthly taCustomerStatisticMonthly){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (iTaCustomerStatisticMonthlyService.updateById(taCustomerStatisticMonthly)){
@@ -159,9 +163,15 @@ public class TaCustomerStatisticMonthlyController extends BaseController {
     public ResponseBean taCustomerStatisticMonthlyList(@PathVariable(value = "customerType") String customerType,
                                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
+        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 {
             //查询月客户分析数据
-            List<TaCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request));
+            List<TsCustomerStatisticMonthly> result = iTaCustomerStatisticMonthlyService.getCustomerMonthlyList(customerType, getOrgId(request),person.getPersonId(),person.getUserId());
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -24,4 +24,6 @@ public class GenderStatistic {
 	private Integer unknownSum;
 	
 	private BigDecimal unknownPct;
+	
+	private String realtyConsultant;
 }

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerGenderStatistic.java → src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerGenderStatistic.java

@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class TaCustomerGenderStatistic implements Serializable {
+public class TsCustomerGenderStatistic implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -65,4 +65,9 @@ public class TaCustomerGenderStatistic implements Serializable {
      * 客户类型 visite 到访客户， new 新增客户 ，follow跟进客户
      */
     private String customerType;
+    
+    /**
+     * 置业顾问ID
+     */
+    private String realtyConsultant;
 }

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerStatisticDaily.java → src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticDaily.java

@@ -21,8 +21,8 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("ta_customer_statistic_daily")
-public class TaCustomerStatisticDaily implements Serializable {
+@TableName("ts_customer_statistic_daily")
+public class TsCustomerStatisticDaily implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -51,6 +51,14 @@ public class TaCustomerStatisticDaily implements Serializable {
      * 创建时间
      */
     private LocalDateTime createDate;
-
-
+    
+    /**
+     * 日期 格式yyyymmdd例20191111
+     */
+    private String day;
+    
+    /**
+     * 置业顾问ID
+     */
+    private String realtyConsultant;
 }

src/main/java/com/huiju/estateagents/statistic/entity/TaCustomerStatisticMonthly.java → src/main/java/com/huiju/estateagents/statistic/entity/TsCustomerStatisticMonthly.java

@@ -21,8 +21,8 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("ta_customer_statistic_monthly")
-public class TaCustomerStatisticMonthly implements Serializable {
+@TableName("ts_customer_statistic_monthly")
+public class TsCustomerStatisticMonthly implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -61,6 +61,9 @@ public class TaCustomerStatisticMonthly implements Serializable {
      * 更新时间
      */
     private LocalDateTime updateDate;
-
-
+    
+    /**
+     * 置业顾问ID
+     */
+    private String realtyConsultant;
 }

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerGenderStatisticMapper.java → src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerGenderStatisticMapper.java

@@ -2,11 +2,12 @@ package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.statistic.entity.GenderStatistic;
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -17,13 +18,14 @@ import java.util.Map;
  * @since 2019-11-08
  */
 @Mapper
-public interface TaCustomerGenderStatisticMapper extends BaseMapper<TaCustomerGenderStatistic> {
+public interface TsCustomerGenderStatisticMapper extends BaseMapper<TsCustomerGenderStatistic> {
 	
 	/**
 	 * 获取新增客户的男女性别比
 	 * @return
+	 * @param nowDate
 	 */
-	List<GenderStatistic> getNewCustomerSexCount();
+	List<GenderStatistic> getNewCustomerSexCount(@Param("nowDate") LocalDateTime nowDate);
 	
 	/**
 	 * 获取跟进客户的男女性别比

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerStatisticDailyMapper.java → src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticDailyMapper.java

@@ -1,13 +1,12 @@
 package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -18,14 +17,14 @@ import java.util.Map;
  * @since 2019-11-08
  */
 @Mapper
-public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerStatisticDaily> {
+public interface TsCustomerStatisticDailyMapper extends BaseMapper<TsCustomerStatisticDaily> {
 	
 	/**
 	 * 获取当天跟进客户数
 	 * @param nowDate
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getFollowUpData(@Param("nowDate") LocalDateTime nowDate);
+	List<TsCustomerStatisticDaily> getFollowUpData(@Param("nowDate") LocalDateTime nowDate);
 	
 	/**
 	 * 获取当天新增客户数
@@ -33,7 +32,7 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
 	 * @param status
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getNewCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("status") int status);
+	List<TsCustomerStatisticDaily> getNewCustomerData(@Param("nowDate") LocalDateTime nowDate, @Param("status") int status);
 	
 	/**
 	 * 获取当天到访客户数
@@ -41,7 +40,7 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
 	 * @param checkin
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
+	List<TsCustomerStatisticDaily> getVisiteCustomerData(@Param("nowDate") LocalDateTime nowDate, @Param("checkin") int checkin);
 	
 	/**
 	 * 获取31天的统计数据
@@ -49,9 +48,11 @@ public interface TaCustomerStatisticDailyMapper extends BaseMapper<TaCustomerSta
 	 * @param orgId
 	 * @param nowDate
 	 * @param beforeDate
+	 * @param personId
+	 * @param userId
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType,@Param("orgId")  Integer orgId,@Param("nowDate")  LocalDateTime nowDate,@Param("beforeDate")  LocalDateTime beforeDate);
+	List<TsCustomerStatisticDaily> getDailyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate, @Param("personId") String personId,@Param("userId") Integer userId);
 	
 	int deleteNowDate(@Param("nowDate") LocalDateTime nowDate,@Param("customerType") String customerType);
 }

src/main/java/com/huiju/estateagents/statistic/mapper/TaCustomerStatisticMonthlyMapper.java → src/main/java/com/huiju/estateagents/statistic/mapper/TsCustomerStatisticMonthlyMapper.java

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,7 +17,7 @@ import java.util.List;
  * @since 2019-11-08
  */
 @Mapper
-public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerStatisticMonthly> {
+public interface TsCustomerStatisticMonthlyMapper extends BaseMapper<TsCustomerStatisticMonthly> {
 	
 	/**
 	 * 获取一个月新增客户的数据插入
@@ -25,14 +25,14 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
 	 * @param status
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getNewCustomerStatisticMonthly(@Param("nowDate") LocalDateTime nowDate,@Param("status") int status);
+	List<TsCustomerStatisticMonthly> getNewCustomerStatisticMonthly(@Param("nowDate") LocalDateTime nowDate, @Param("status") int status);
 	
 	/**
 	 * 获取一个月跟进客户数据插入
 	 * @param nowDate
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getFollowUpStatisticMonthly(@Param("nowDate") LocalDateTime nowDate);
+	List<TsCustomerStatisticMonthly> getFollowUpStatisticMonthly(@Param("nowDate") LocalDateTime nowDate);
 	
 	/**
 	 * 获取一个月访问客户数据插入
@@ -40,7 +40,7 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
 	 * @param checkin
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getVisiteStatisticMonthly(@Param("nowDate") LocalDateTime nowDate,@Param("checkin") int checkin);
+	List<TsCustomerStatisticMonthly> getVisiteStatisticMonthly(@Param("nowDate") LocalDateTime nowDate, @Param("checkin") int checkin);
 	
 	/**
 	 * 获取12个月的统计数据
@@ -48,7 +48,9 @@ public interface TaCustomerStatisticMonthlyMapper extends BaseMapper<TaCustomerS
 	 * @param orgId
 	 * @param nowDate
 	 * @param beforeDate
+	 * @param personId
+	 * @param userId
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType,@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime nowDate,@Param("beforeDate") LocalDateTime beforeDate);
+	List<TsCustomerStatisticMonthly> getMonthlyList(@Param("customerType") String customerType, @Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate, @Param("beforeDate") LocalDateTime beforeDate, @Param("personId") String personId,@Param("userId") Integer userId);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerGenderStatisticService.java → src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerGenderStatisticService.java

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.statistic.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
 
 import java.time.LocalDateTime;
 
@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
  * @author jobob
  * @since 2019-11-08
  */
-public interface ITaCustomerGenderStatisticService extends IService<TaCustomerGenderStatistic> {
+public interface ITsCustomerGenderStatisticService extends IService<TsCustomerGenderStatistic> {
 	
 	/**
 	 * 每天的新增客户性别统计

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticDailyService.java → src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticDailyService.java

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.statistic.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
  * @author jobob
  * @since 2019-11-08
  */
-public interface ITaCustomerStatisticDailyService extends IService<TaCustomerStatisticDaily> {
+public interface ITsCustomerStatisticDailyService extends IService<TsCustomerStatisticDaily> {
 	
 	/**
 	 * 每天的跟进客户统计
@@ -38,7 +38,9 @@ public interface ITaCustomerStatisticDailyService extends IService<TaCustomerSta
 	 * 获取日统计数据
 	 * @param customerType
 	 * @param orgId
+	 * @param personId
+	 * @param userId
 	 * @return
 	 */
-	List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId);
+	List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId, String personId, Integer userId);
 }

src/main/java/com/huiju/estateagents/statistic/service/ITaCustomerStatisticMonthlyService.java → src/main/java/com/huiju/estateagents/statistic/service/ITsCustomerStatisticMonthlyService.java

@@ -1,7 +1,7 @@
 package com.huiju.estateagents.statistic.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
  * @author jobob
  * @since 2019-11-08
  */
-public interface ITaCustomerStatisticMonthlyService extends IService<TaCustomerStatisticMonthly> {
+public interface ITsCustomerStatisticMonthlyService extends IService<TsCustomerStatisticMonthly> {
 	
 	/**
 	 * 每月新增客户统计，每天都更新
@@ -38,7 +38,9 @@ public interface ITaCustomerStatisticMonthlyService extends IService<TaCustomerS
 	 * 查询12个月的客户统计分析数据
 	 * @param customerType
 	 * @param orgId
+	 * @param personId
+	 * @param userId
 	 * @return
 	 */
-	List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId);
+	List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId, String personId, Integer userId);
 }

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerGenderStatisticServiceImpl.java → src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerGenderStatisticServiceImpl.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.statistic.entity.GenderStatistic;
-import com.huiju.estateagents.statistic.entity.TaCustomerGenderStatistic;
-import com.huiju.estateagents.statistic.mapper.TaCustomerGenderStatisticMapper;
-import com.huiju.estateagents.statistic.service.ITaCustomerGenderStatisticService;
+import com.huiju.estateagents.statistic.entity.TsCustomerGenderStatistic;
+import com.huiju.estateagents.statistic.mapper.TsCustomerGenderStatisticMapper;
+import com.huiju.estateagents.statistic.service.ITsCustomerGenderStatisticService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -23,10 +23,10 @@ import java.util.List;
  * @since 2019-11-08
  */
 @Service
-public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomerGenderStatisticMapper, TaCustomerGenderStatistic> implements ITaCustomerGenderStatisticService {
+public class TsCustomerGenderStatisticServiceImpl extends ServiceImpl<TsCustomerGenderStatisticMapper, TsCustomerGenderStatistic> implements ITsCustomerGenderStatisticService {
 	
 	@Autowired
-	private TaCustomerGenderStatisticMapper customerGenderStatisticMapper;
+	private TsCustomerGenderStatisticMapper customerGenderStatisticMapper;
 	
 	/**
 	 * 每天的新增客户性别统计
@@ -36,7 +36,7 @@ public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomer
 	@Override
 	public void newCustomerSexStatisticDaily(LocalDateTime nowDate) {
 		//获取新增客户的男女性别比和性别数
-		List<GenderStatistic> newCustomerSexList = customerGenderStatisticMapper.getNewCustomerSexCount();
+		List<GenderStatistic> newCustomerSexList = customerGenderStatisticMapper.getNewCustomerSexCount(nowDate);
 		//批量保存
 		saveBatchCustomerSexData(newCustomerSexList,nowDate,CommConstant.CUSTOMER_TYPE_NEW);
 	}
@@ -80,38 +80,41 @@ public class TaCustomerGenderStatisticServiceImpl extends ServiceImpl<TaCustomer
 	 */
 	private void saveBatchCustomerSexData(List<GenderStatistic> customerSexList, LocalDateTime nowDate,String customerType) {
 		//先删除在添加
-		QueryWrapper<TaCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("customer_type",customerType);
 		customerGenderStatisticMapper.delete(queryWrapper);
 		
-		List<TaCustomerGenderStatistic> list = new ArrayList<>();
+		List<TsCustomerGenderStatistic> list = new ArrayList<>();
 		//划分男女未知三条数据
 		customerSexList.forEach(e -> {
-			TaCustomerGenderStatistic maleCustomer = new TaCustomerGenderStatistic();
+			TsCustomerGenderStatistic maleCustomer = new TsCustomerGenderStatistic();
 			maleCustomer.setCreateDate(nowDate);
 			maleCustomer.setGenderType(CommConstant.SEX_MALE);
 			maleCustomer.setCustomerType(customerType);
 			maleCustomer.setCustomerNum(e.getManSum());
 			maleCustomer.setPercentage(e.getManPct());
 			maleCustomer.setOrgId(e.getOrgId());
+			maleCustomer.setRealtyConsultant(e.getRealtyConsultant());
 			list.add(maleCustomer);
 			
-			TaCustomerGenderStatistic femaleCustomer = new TaCustomerGenderStatistic();
+			TsCustomerGenderStatistic femaleCustomer = new TsCustomerGenderStatistic();
 			femaleCustomer.setCreateDate(nowDate);
 			femaleCustomer.setGenderType(CommConstant.SEX_FEMALE);
 			femaleCustomer.setCustomerType(customerType);
 			femaleCustomer.setCustomerNum(e.getWomanSum());
 			femaleCustomer.setPercentage(e.getWomanPct());
 			femaleCustomer.setOrgId(e.getOrgId());
+			femaleCustomer.setRealtyConsultant(e.getRealtyConsultant());
 			list.add(femaleCustomer);
 			
-			TaCustomerGenderStatistic unknownCustomer = new TaCustomerGenderStatistic();
+			TsCustomerGenderStatistic unknownCustomer = new TsCustomerGenderStatistic();
 			unknownCustomer.setCreateDate(nowDate);
 			unknownCustomer.setGenderType(CommConstant.SEX_UNKNOWN);
 			unknownCustomer.setCustomerType(customerType);
 			unknownCustomer.setCustomerNum(e.getUnknownSum());
 			unknownCustomer.setPercentage(e.getUnknownPct());
 			unknownCustomer.setOrgId(e.getOrgId());
+			unknownCustomer.setRealtyConsultant(e.getRealtyConsultant());
 			list.add(unknownCustomer);
 		});
 		//批量插入

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticDailyServiceImpl.java → src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticDailyServiceImpl.java

@@ -2,17 +2,16 @@ package com.huiju.estateagents.statistic.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
-import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticDailyService;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily;
+import com.huiju.estateagents.statistic.mapper.TsCustomerStatisticDailyMapper;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticDailyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -23,10 +22,10 @@ import java.util.Map;
  * @since 2019-11-08
  */
 @Service
-public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerStatisticDailyMapper, TaCustomerStatisticDaily> implements ITaCustomerStatisticDailyService {
+public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerStatisticDailyMapper, TsCustomerStatisticDaily> implements ITsCustomerStatisticDailyService {
 	
 	@Autowired
-	private TaCustomerStatisticDailyMapper customerStatisticDailyMapper;
+	private TsCustomerStatisticDailyMapper customerStatisticDailyMapper;
 	
 	/**
 	 * 每天的跟进客户统计
@@ -36,7 +35,7 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	@Override
 	public void followUpStatisticDaily(LocalDateTime nowDate) {
 		//按当前时间获取当天的跟进客户的数量，多一个客户进行多次跟进行为，只记录一次
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getFollowUpData(nowDate);
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getFollowUpData(nowDate);
 		//批量保存
 		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_FOLLOW);
 	}
@@ -49,7 +48,7 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	@Override
 	public void newCustomerStatisticDaily(LocalDateTime nowDate) {
 		//按当前时间获取当天的新增客户的数量，ta_recommend_customer 表的status 为1 的就是新增客户
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getNewCustomerData(nowDate,CommConstant.STATUS_NORMAL);
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getNewCustomerData(nowDate,CommConstant.STATUS_NORMAL);
 		//批量保存
 		statisticDailySaveBatch(list,nowDate,CommConstant.CUSTOMER_TYPE_NEW);
 	}
@@ -62,8 +61,8 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	@Override
 	public void visiteStatisticDaily(LocalDateTime nowDate) {
 		//按当前时间获取当天的到访客户的数量，同一天同一个项目只记录一次
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getVisiteCustomerData(nowDate,CommConstant.STATUS_NORMAL);
-		List<TaCustomerStatisticDaily> saveList = new ArrayList<>();
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getVisiteCustomerData(nowDate,CommConstant.STATUS_NORMAL);
+		List<TsCustomerStatisticDaily> saveList = new ArrayList<>();
 		list.forEach(e -> {
 			if (null != e.getOrgId() && !e.getOrgId().equals("null")){
 				saveList.add(e);
@@ -78,17 +77,40 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	 *
 	 * @param customerType
 	 * @param orgId
+	 * @param personId
+	 * @param userId
 	 * @return
 	 */
 	@Override
-	public List<TaCustomerStatisticDaily> getDailyList(String customerType, Integer orgId) {
+	public List<TsCustomerStatisticDaily> getDailyList(String customerType, Integer orgId, String personId, Integer userId) {
 		//当前日期
 		LocalDateTime nowDate = LocalDateTime.now();
 		//31天前的日期
 		LocalDateTime beforeDate = nowDate.plusDays(-31);
 		//获取31天的日期数据
-		List<TaCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate);
-		return list;
+		List<TsCustomerStatisticDaily> list = customerStatisticDailyMapper.getDailyList(customerType,orgId,nowDate,beforeDate,personId,userId);
+		//构造31天的数据
+		List<TsCustomerStatisticDaily> newList = new ArrayList<>();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+		for (int i = 0; i < 31;i++){
+			String newDate = nowDate.plusDays(-i).format(formatter);
+			TsCustomerStatisticDaily tsCustomerStatisticDaily = new TsCustomerStatisticDaily();
+			tsCustomerStatisticDaily.setOrgId(orgId);
+			tsCustomerStatisticDaily.setCustomerNum(0);
+			tsCustomerStatisticDaily.setDay(newDate);
+			tsCustomerStatisticDaily.setCustomerType(customerType);
+			tsCustomerStatisticDaily.setRealtyConsultant(personId);
+			
+			//合并数据
+			list.forEach(l -> {
+				if (newDate.equals(l.getDay())){
+					tsCustomerStatisticDaily.setCustomerNum(tsCustomerStatisticDaily.getCustomerNum() + l.getCustomerNum());
+				}
+			});
+			newList.add(tsCustomerStatisticDaily);
+		}
+		
+		return newList;
 	}
 	
 	/**
@@ -97,13 +119,18 @@ public class TaCustomerStatisticDailyServiceImpl extends ServiceImpl<TaCustomerS
 	 * @param nowDate
 	 * @param customerType
 	 */
-	private void statisticDailySaveBatch(List<TaCustomerStatisticDaily> list, LocalDateTime nowDate, String customerType) {
+	private void statisticDailySaveBatch(List<TsCustomerStatisticDaily> list, LocalDateTime nowDate, String customerType) {
+		//格式化年月日
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+		String todayDate = nowDate.format(formatter);
+		
 		//先删除当天数据在添加防止有脏数据
 		customerStatisticDailyMapper.deleteNowDate(nowDate,customerType);
 		
 		list.forEach(e -> {
 			e.setCreateDate(nowDate);
 			e.setCustomerType(customerType);
+			e.setDay(todayDate);
 		});
 		//批量保存
 		this.saveBatch(list);

src/main/java/com/huiju/estateagents/statistic/service/impl/TaCustomerStatisticMonthlyServiceImpl.java → src/main/java/com/huiju/estateagents/statistic/service/impl/TsCustomerStatisticMonthlyServiceImpl.java

@@ -3,10 +3,9 @@ package com.huiju.estateagents.statistic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily;
-import com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly;
-import com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper;
-import com.huiju.estateagents.statistic.service.ITaCustomerStatisticMonthlyService;
+import com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly;
+import com.huiju.estateagents.statistic.mapper.TsCustomerStatisticMonthlyMapper;
+import com.huiju.estateagents.statistic.service.ITsCustomerStatisticMonthlyService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,10 +23,10 @@ import java.util.List;
  * @since 2019-11-08
  */
 @Service
-public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustomerStatisticMonthlyMapper, TaCustomerStatisticMonthly> implements ITaCustomerStatisticMonthlyService {
+public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustomerStatisticMonthlyMapper, TsCustomerStatisticMonthly> implements ITsCustomerStatisticMonthlyService {
 	
 	@Autowired
-	private TaCustomerStatisticMonthlyMapper customerStatisticMonthlyMapper;
+	private TsCustomerStatisticMonthlyMapper customerStatisticMonthlyMapper;
 	
 	/**
 	 * 每月新增客户统计，每天都更新
@@ -37,7 +36,7 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	@Override
 	public void newCustomerStatisticMonthly(LocalDateTime nowDate) {
 		//获取当月新增客户总数
-		List<TaCustomerStatisticMonthly> newCustomerMonthList = customerStatisticMonthlyMapper.getNewCustomerStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
+		List<TsCustomerStatisticMonthly> newCustomerMonthList = customerStatisticMonthlyMapper.getNewCustomerStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
 		//批量插入
 		statisticMonthlySaveBatch(newCustomerMonthList,nowDate, CommConstant.CUSTOMER_TYPE_NEW);
 	}
@@ -50,7 +49,7 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	@Override
 	public void followUpStatisticMonthly(LocalDateTime nowDate) {
 		//获取当月跟进客户总数
-		List<TaCustomerStatisticMonthly> followUpMonthList = customerStatisticMonthlyMapper.getFollowUpStatisticMonthly(nowDate);
+		List<TsCustomerStatisticMonthly> followUpMonthList = customerStatisticMonthlyMapper.getFollowUpStatisticMonthly(nowDate);
 		statisticMonthlySaveBatch(followUpMonthList,nowDate, CommConstant.CUSTOMER_TYPE_FOLLOW);
 	}
 	
@@ -62,14 +61,14 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	@Override
 	public void visiteStatisticMonthly(LocalDateTime nowDate) {
 		//获取当月访问客户总数
-		List<TaCustomerStatisticMonthly> visiteMonthList = customerStatisticMonthlyMapper.getVisiteStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
-		List<TaCustomerStatisticMonthly> newVisiteMonthList = new ArrayList<>();
+		List<TsCustomerStatisticMonthly> visiteMonthList = customerStatisticMonthlyMapper.getVisiteStatisticMonthly(nowDate,CommConstant.STATUS_NORMAL);
+		List<TsCustomerStatisticMonthly> newVisiteMonthList = new ArrayList<>();
 		visiteMonthList.forEach(e -> {
 			if (null != e.getOrgId() && !e.getOrgId().equals("null")){
 				newVisiteMonthList.add(e);
 			}
 		});
-		statisticMonthlySaveBatch(newVisiteMonthList,nowDate, CommConstant.CUSTOMER_TYPE_FOLLOW);
+		statisticMonthlySaveBatch(newVisiteMonthList,nowDate, CommConstant.CUSTOMER_TYPE_VISITE);
 	}
 	
 	/**
@@ -77,17 +76,38 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	 *
 	 * @param customerType
 	 * @param orgId
+	 * @param personId
+	 * @param userId
 	 * @return
 	 */
 	@Override
-	public List<TaCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId) {
+	public List<TsCustomerStatisticMonthly> getCustomerMonthlyList(String customerType, Integer orgId, String personId, Integer userId) {
 		//当前日期
 		LocalDateTime nowDate = LocalDateTime.now();
 		//12个月前的日期
 		LocalDateTime beforeDate = nowDate.plusMonths(-12);
-		//获取31天的日期数据
-		List<TaCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate);
-		return list;
+		//获取12个月数据
+		List<TsCustomerStatisticMonthly> list = customerStatisticMonthlyMapper.getMonthlyList(customerType,orgId,nowDate,beforeDate,personId,userId);
+		//构造12个月的数据
+		List<TsCustomerStatisticMonthly> newList = new ArrayList<>();
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
+		for (int i = 0; i < 12;i++){
+			String newDate = nowDate.plusMonths(-i).format(formatter);
+			TsCustomerStatisticMonthly tsCustomerStatisticMonthly = new TsCustomerStatisticMonthly();
+			tsCustomerStatisticMonthly.setCustomerType(customerType);
+			tsCustomerStatisticMonthly.setMonth(newDate);
+			tsCustomerStatisticMonthly.setCustomerNum(0);
+			tsCustomerStatisticMonthly.setOrgId(orgId);
+			tsCustomerStatisticMonthly.setRealtyConsultant(personId);
+			list.forEach(l -> {
+				if (newDate.equals(l.getMonth())){
+					tsCustomerStatisticMonthly.setCustomerNum(tsCustomerStatisticMonthly.getCustomerNum() + l.getCustomerNum());
+				}
+			});
+			newList.add(tsCustomerStatisticMonthly);
+		}
+		
+		return newList;
 	}
 	
 	/**
@@ -96,13 +116,13 @@ public class TaCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TaCustome
 	 * @param nowDate
 	 * @param customerType
 	 */
-	private void statisticMonthlySaveBatch(List<TaCustomerStatisticMonthly> list, LocalDateTime nowDate, String customerType) {
-		//格式化年月日
+	private void statisticMonthlySaveBatch(List<TsCustomerStatisticMonthly> list, LocalDateTime nowDate, String customerType) {
+		//格式化年月
 		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
 		String todayDate = nowDate.format(formatter);
 		
 		//先删除在添加
-		QueryWrapper<TaCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
+		QueryWrapper<TsCustomerStatisticMonthly> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("customer_type",customerType);
 		queryWrapper.eq("month",todayDate);
 		customerStatisticMonthlyMapper.delete(queryWrapper);

src/main/resources/application-gzysd.yml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 server:
   port: 8009
 spring:
@@ -71,4 +72,58 @@ sms:
     sign: AI智慧案场
 
   visitor:
-    code: "0501"
+    code: "0501"
+=======
+server:
+  port: 8009
+spring:
+  application:
+    name: estateagents
+  datasource:
+    username: estateagents
+    password: DQ@0lW##kBb2+-jPZ
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_gzysd?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    initial-size: 10 # 初始化连接数
+    max-active: 20 # 最大连接数
+    min-idle: 8 # 最小空闲数
+    max-idle: 8 # 最大空闲数
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 50MB
+
+##mybatis-plus
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
+  mapper-locations: classpath:mapper/*.xml
+wx:
+  miniapp:
+    appid: wxe3b1e683853800b5
+    secret: 207dd6d0f807b2dd0d41b57a8184365f
+    token:
+    aesKey:
+    msgDataFormat: JSON
+  tpls:
+    - name: notice
+      id: IVWM-wpzSNV6CyXeSBGBgRku2lRrZ-3x4vXRILQpHM0
+      keywords: 4
+    - name: newCustomer
+      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+      keywords: 4
+    - name: mainbiz
+      id: IywdSfNPegeg5GB3Q-TVieSYD9DA0im8eI-hF_u0i-4
+
+      keywords: 6
+ali:
+  accessKeyId: LTAIkc75dpkJw8Lb
+  accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
+  oss:
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: estateagents
+    bucketURL: https://estateagents.oss-cn-shanghai.aliyuncs.com
+
+
+>>>>>>> ac499f2ddc4d4469098e59fff8bbe310779f7be3

src/main/resources/application-test.yml

@@ -1,12 +1,12 @@
 server:
-  port: 8566
+  port: 8080
 spring:
   application:
     name: estateagents
   datasource:
     username: estateagents
-    password: DQ@0lW##kBb2+-jPZ
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/estateagents_t?useUnicode=true&serverTimezone=CTT&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    password: estateagents
+    url: jdbc:mysql://47.101.36.130:3306/estateagents_3.5.1_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数
@@ -25,21 +25,21 @@ mybatis-plus:
   mapper-locations: classpath:mapper/**/*.xml
 wx:
   miniapp:
-    appid: wxc56decdcbc64d8de
-    secret: 80864fa371a8db79e719c07df52d59d0
+    appid: wxd6f47a9bb3052175
+    secret: 28f33b6bbc0f778c11a0bb234a7d6d4e
     token:
     aesKey:
     msgDataFormat: JSON
   tpls:
-    - name: notice
-      id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
-      keywords: 4
-    - name: newCustomer
-      id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
-      keywords: 4
-    - name: mainbiz
-      id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
-      keywords: 6
+  - name: notice
+    id: 6hWKexNlaVpAOvrcWxHHQ_Duz1gRIkg2-Clsktp2-Os
+    keywords: 4
+  - name: newCustomer
+    id: WiBYjqkE9KvwDv1WSq5vnuv5A6FSaOB8ETFcrVmtCEI
+    keywords: 4
+  - name: mainbiz
+    id: WiBYjqkE9KvwDv1WSq5vniGU4P0gvwlat-5ENYKpfxg
+    keywords: 6
 ali:
   accessKeyId: LTAIkc75dpkJw8Lb
   accessKeySecret: v4bvXCaix6vSDTCFfwSAdqV53iFEQw
@@ -68,7 +68,7 @@ sms:
     # 验证码长度
     size: 4
     # 短信签名
-    sign: AI智慧案场
+    sign: 营销云
 
   visitor:
     code: "0501"

src/main/resources/mapper/Activity.xml

@@ -3,36 +3,37 @@
 <mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
 
     <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
-        SELECT dynamic_id as id,list_img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type
+        SELECT dynamic_id as id,list_img_url as main_img,title,start_date as start_date,enlist_end as end_date,heavy, weight,activity_status,'dynamic' as type
         FROM ta_building_dynamic
         WHERE org_id = #{orgId}  and `status` = #{status}
         <if test="cityId != null and cityId != ''">
           and city_id = #{cityId}
         </if>
         UNION  all
-        SELECT group_activity_id as id,list_img as main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type
+        SELECT group_activity_id as id,list_img as main_img,activity_name as title,start_time as start_date,end_time as end_date,heavy,weight,activity_status,'group' as type
         from ta_share_activity
         WHERE org_id = #{orgId} and `status` = #{status}
         <if test="cityId != null and cityId != ''">
             and city_id = #{cityId}
         </if>
         UNION  all
-        SELECT help_activity_id as id,list_img as main_img,title,start_date,end_date,weight,activity_status,'help' as type
+        SELECT help_activity_id as id,list_img as main_img,title,start_date,end_date,heavy,weight,activity_status,'help' as type
         from ta_help_activity
         WHERE org_id = #{orgId} and `status` = #{status}
         <if test="cityId != null and cityId != ''">
             and city_id = #{cityId}
         </if>
-        ORDER BY weight desc,activity_status,start_date
+        ORDER BY heavy desc,activity_status,start_date
     </select>
     <select id="getCustomerActivityList" resultType="java.util.Map">
         SELECT
             t.enlist_id AS id,
             t.dynamic_id AS activityId,
             t.create_date AS createDate,
-            IF( t.is_checkin = 1, "已签到", "未签到" ) AS `status`,
+            IF( t.is_checkin = 1, "已签到", "未签到" ) AS `joinStatus`,
             d.list_img_url AS mainImg,
             d.title,
+            d.status,
             d.start_date AS startDate,
             d.enlist_end AS endDate,
             'dynamic' AS type
@@ -58,9 +59,10 @@
         "成功未核销"
         WHEN t.STATUS = 2 THEN
         "失败"
-        END `status`,
+        END `joinStatus`,
             d.list_img AS mainImg,
             d.activity_name AS title,
+            d.status,
             d.start_time AS startDate,
             d.end_time AS endDate,
             'group' AS type
@@ -70,6 +72,35 @@
         WHERE
             t.org_id = #{orgId}
             AND t.person_id = #{personId}
+      UNION ALL
+        SELECT
+            t.record_id AS id,
+            t.group_activity_id AS activityId,
+            t.create_time AS createDate,
+        CASE
+            WHEN t.STATUS = 1 THEN
+            "进行中"
+            WHEN t.STATUS = 0
+            AND t.verification_status = 1 THEN
+            "成功已核销"
+        WHEN t.STATUS = 0
+        AND t.verification_status != 1 THEN
+        "成功未核销"
+        WHEN t.STATUS = 2 THEN
+        "失败"
+        END `joinStatus`,
+            d.list_img AS mainImg,
+            d.activity_name AS title,
+            d.status,
+            d.start_time AS startDate,
+            d.end_time AS endDate,
+            'group' AS type
+        FROM
+            ta_share_child_record t
+            LEFT JOIN ta_share_activity d ON t.group_activity_id = d.group_activity_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.person_id = #{personId}
       UNION ALL
         SELECT
             t.help_record_initiate_id AS id,
@@ -86,9 +117,10 @@
                         "成功未核销"
                         WHEN t.STATUS = 2 THEN
                         "失败"
-                    END `status`,
+                    END `joinStatus`,
             d.list_img AS mainImg,
             d.title,
+            d.status,
             d.start_date AS startDate,
             d.end_date AS endDate,
             'help' AS type

src/main/resources/mapper/HelpActivityMapper.xml

@@ -66,7 +66,7 @@
 			FROM
 				ta_help_activity a
 				WHERE
-                    a.org_id =#{orgId}
+                    a.org_id =#{orgId} and a.`status` = 1
                 <if test="buildingId  == null or  buildingId ==''">
                   and  a.is_main = 1
                 </if>
@@ -88,7 +88,7 @@
 				FROM
 					ta_share_activity s
 					WHERE
-                    s.org_id =#{orgId}
+                    s.org_id =#{orgId} and s.`status` = 1
                 <if test="buildingId  == null or  buildingId =='' ">
                     and  s.sort = 1
                 </if>

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -3,14 +3,18 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper">
         <select id="signList" resultType="com.huiju.estateagents.entity.TaActivityDynamicEnlist">
 
-                SELECT
-                    tade.*,
-                    tp.NAME AS sharePersonName,
-                    tp.company AS orgName
-                FROM
-                    ta_activity_dynamic_enlist tade
-                    LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id AND tspf.target_type = 'dynamic_share' and tspf.status = 1 and tade.person_id = tspf.person_id
-                    LEFT JOIN ta_person tp ON tspf.share_person = tp.person_id
+            SELECT
+            tade.*,
+            IFNULL(tp.nickname,tu.user_name) AS sharePersonName,
+            IFNULL(tp.company,tu.org_name)AS orgName
+            FROM
+            ta_activity_dynamic_enlist tade
+            LEFT JOIN ta_share_person_from tspf ON tade.dynamic_id = tspf.target_id
+            AND tspf.target_type = 'dynamic_share'
+            AND tspf.STATUS = 1
+            AND tade.person_id = tspf.person_id
+            LEFT JOIN ta_person tp ON tspf.share_person = tp.person_id AND tspf.share_person_type != 'Realty Consultant'
+            LEFT JOIN ta_user tu ON tspf.share_person = tu.user_id AND tspf.share_person_type = 'Realty Consultant'
                 <where>
                     tade.dynamic_id = #{dynamicId}
                     AND tade.org_id = #{orgId}

src/main/resources/mapper/TaBuildingImgMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaBuildingImgMapper">
     <select id="getBuildingImgByApartment" resultType="com.huiju.estateagents.entity.TaBuildingImg" >
       select a.* from ta_building_img a inner join ta_apartment_img b on a.img_id = b.img_id
-      where a.status = 1 and b.status= 1 and b.apartment_id = #{id}
+      where a.status = 1 and b.status= 1 and b.apartment_id = #{id} order by a.order_no asc
     </select>
 
     <delete id="delBuildingImgByApartment" >

src/main/resources/mapper/TaBuildingMapRelationMapper.xml

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

src/main/resources/mapper/TaBuildingMapper.xml

@@ -196,12 +196,15 @@
 
     <select id="getBuildingListById" resultType="com.huiju.estateagents.entity.TaBuilding">
       select * from ta_building t where t.building_id in (
-	    select t.building_id from ta_goods t where t.org_id = #{orgId} and t.city_id = #{cityId} group by t.building_id
+	    select t.building_id from ta_goods t where t.org_id = #{orgId} and t.city_id = #{cityId} and `status`=1 group by t.building_id
       )
     </select>
 
     <select id="countNumByHeavy" resultType="java.lang.Integer">
       select COUNT(1) from ta_building_dynamic t where t.heavy = #{heavy}
+      <if test="dynamicId != null and dynamicId != ''">
+          and t.dynamic_id != #{dynamicId}
+      </if>
     </select>
 
 </mapper>

src/main/resources/mapper/TaMiniFormidsMapper.xml

@@ -8,7 +8,7 @@
             ta_mini_formids t
         WHERE
             t.openid = #{openid}
-        AND ADDDATE(t.create_date, INTERVAL 7 DAY) >= now()
+        AND ADDDATE(t.create_date, INTERVAL 6 DAY) >= now()
         ORDER BY t.create_date ASC
         LIMIT 1
     </select>

src/main/resources/mapper/TaOrgCity.xml

@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaOrgCityMapper">
+    <select id="selectByIdCity"  resultType="string">
+        select city_id from ta_org_city where  parentid != 100000 and  org_id = #{orgId}
+    </select>
+
+    <select id="selectAdminTdCityList" resultType="com.huiju.estateagents.entity.TaOrgCity">
+                SELECT
+                    oc.city_id AS id,
+                    oc.`name` AS name,
+                    oc.org_id,
+                    oc.`status`,
+                    oc.parentid,
+                LEFT (c.pinyin, 1) AS initial
+                FROM
+                ta_org_city oc
+                LEFT JOIN td_city c ON oc.city_id = c.id
+                WHERE
+                oc.org_id = #{orgId}
+                and  oc.parentid  !=100000
+                and  oc.status = 1
+                ORDER BY
+                c.pinyin
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -49,6 +49,7 @@
         AND t. STATUS = #{status}
         and t.org_id = #{orgId}
         and u.org_id = #{orgId}
+        and u.status = 1
         ORDER BY
             t.create_date DESC
     </select>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -22,7 +22,7 @@ WHERE
     <select id="getCustomerDetail" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
       SELECT
 	a.*,
-	(select c.visit_time FROM ta_person_visit_record c where c.person_id = #{personId} ORDER BY c.visit_time desc LIMIT 1) as visitTime,
+	(select c.visit_time FROM ta_person_visit_record c where c.person_id = #{personId} ORDER BY c.visit_time asc LIMIT 1) as visitTime,
 	(SELECT SUM(d.visit_duration) FROM ta_person_visit_record d WHERE d.person_id= #{personId}) as duration
 FROM
 	ta_recommend_customer a
@@ -164,6 +164,7 @@ FROM
             a.status > 0
             and a.verify_status = 1
             and a.realty_consultant is not null
+            and a.realty_consultant != ''
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>
@@ -607,8 +608,8 @@ FROM
 
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT
-            sum( IF ( STATUS = 4, 1, 0 ) ) AS followSum,
-            sum( IF ( STATUS != 4 AND STATUS != 4, 1, 0 ) ) AS clinchSum
+            sum( IF ( STATUS = 4 AND verify_status = 1, 1, 0 ) ) AS clinchSum,
+            sum( IF ( STATUS != 4 AND verify_status = 1, 1, 0 ) ) AS followSum
         FROM
             ta_recommend_customer
         WHERE
@@ -630,8 +631,9 @@ FROM
         AND ( realty_consultant = #{personId} OR realty_consultant = #{userId} )
         <if test="type == 'follow'">
           AND STATUS != 4
+          AND verify_status = 1
             <if test="name != null and name !=''">
-                and `name` like CONCAT('%',#{name}, '%')
+                and (`name` like CONCAT('%',#{name}, '%') or phone like CONCAT('%',#{name}, '%'))
             </if>
             <if test="phone != null and phone !=''">
                 and phone like CONCAT('%',#{phone}, '%')
@@ -667,17 +669,25 @@ FROM
 
     <select id="getCustomerIntentions" resultType="com.huiju.estateagents.entity.PersonIntention">
         SELECT
-            SUM( intention ) AS intention,
-            building_id,
-            building_name
+            SUM( a.intention ) AS intention,
+            a.building_id,
+            b.building_name
         FROM
-            `ta_person_intention_record`
+            ta_person_intention_record a
+            left join ta_building b on a.building_id = b.building_id
         WHERE
-            person_id = #{personId}
+           a.person_id = #{personId}
         GROUP BY
-            building_id
+            a.building_id
         ORDER BY
             intention DESC
     </select>
 
+    <select id="getCustomersIRecommended" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        select a.*,b.avatarurl from ta_recommend_customer a left join ta_person b on a.person_id = b.person_id
+        where a.recommend_person = #{customerId}
+        and a.status = #{status}
+        and a.org_id = #{orgId}
+    </select>
+
 </mapper>

src/main/resources/mapper/TaUserMapper.xml

@@ -39,4 +39,15 @@
         WHERE
             u.user_id = #{userId}
     </select>
+
+    <select id="getUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+    SELECT
+        *
+    FROM
+        ta_user
+    WHERE
+          org_id = #{orgId}
+        and (phone = #{phone}
+        OR login_Name = #{loginName})
+    </select>
 </mapper>

src/main/resources/mapper/TdCityMapper.xml

@@ -19,6 +19,33 @@ FROM
 ORDER BY
 	pinyin
     </select>
-    
+
+
+    <select id="selectWxCity" resultType="com.huiju.estateagents.entity.TdCity">
+
+        SELECT
+                    c.id,
+                    c.name,
+                    c.parentid,
+                    c.shortname,
+                    c.leveltype,
+                    c.citycode,
+                    c.zipcode,
+                    c.lng,
+                    c.lat,
+                    c.pinyin,
+                    oc.org_id,
+                    oc.`status`,
+                    LEFT (c.pinyin, 1) AS initial
+                FROM
+                ta_org_city oc
+                INNER JOIN td_city c ON oc.city_id = c.id
+                WHERE
+                oc.org_id = #{orgId}
+                and  oc.parentid  !=100000
+                and  oc.status = 1
+                ORDER BY
+                c.pinyin
+    </select>
 
 </mapper>

src/main/resources/mapper/statistic/TaCustomerGenderStatisticMapper.xml → src/main/resources/mapper/statistic/TsCustomerGenderStatisticMapper.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerGenderStatisticMapper">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerGenderStatisticMapper">
 
     <select id="getNewCustomerSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">
         SELECT
-            org_id,
+            org_id,realty_consultant,
             sum(if(sex = 1,1,0)) as man_sum,
             sum(if(sex = 1,1,0))/count(*) as man_pct,
             sum(if(sex = 2,1,0)) as woman_sum,
@@ -14,12 +14,13 @@
         FROM
             ta_recommend_customer
         WHERE
-            `STATUS` = 1
-            GROUP BY org_id
+            verify_status = 1
+            GROUP BY org_id,realty_consultant
     </select>
     <select id="getFollowUpSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">
         SELECT
             t.org_id,
+            t.follower_id as realty_consultant,
             sum( IF ( t.customer_sex = 1, 1, 0 ) ) AS manSum,
             sum( IF ( t.customer_sex = 1, 1, 0 ) ) / count( * ) AS manPct,
             sum( IF ( t.customer_sex = 2, 1, 0 ) ) AS womanSum,
@@ -29,11 +30,12 @@
         FROM
             ( SELECT * FROM ta_customer_follow_up_record GROUP BY customer_id ) t
         GROUP BY
-            t.org_id
+            t.org_id,t.follower_id
     </select>
     <select id="getVisiteSexCount" resultType="com.huiju.estateagents.statistic.entity.GenderStatistic">
         SELECT
             d.org_id,
+            d.realty_consultant,
             sum( IF ( d.sex = 1, 1, 0 ) ) AS manSum,
             sum( IF ( d.sex = 1, 1, 0 ) ) / count( * ) AS manPct,
             sum( IF ( d.sex = 2, 1, 0 ) ) AS womanSum,
@@ -50,12 +52,13 @@
                     LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
                     AND t.building_id = c.building_id
                     AND t.org_id = c.org_id
+                    AND c.verify_status = 1
                 WHERE
                     t.is_checkin = 1
                 GROUP BY
                     c.customer_id
             ) d
         GROUP BY
-            d.org_id
+            d.org_id,d.realty_consultant
     </select>
 </mapper>

src/main/resources/mapper/statistic/TaCustomerStatisticDailyMapper.xml → src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml

@@ -1,62 +1,68 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerStatisticDailyMapper">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerStatisticDailyMapper">
 
     <delete id="deleteNowDate">
-        delete from ta_customer_statistic_daily
+        delete from ts_customer_statistic_daily
         where customer_type = #{customerType}
         AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
     </delete>
 
-    <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+    <select id="getFollowUpData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             org_id,
-            count( DISTINCT ( customer_id ) ) as customer_num
+            count( DISTINCT ( customer_id ) ) as customer_num,
+            follower_id AS realty_consultant
         FROM
             ta_customer_follow_up_record
         WHERE
             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
         GROUP BY
-            org_id
+            org_id,follower_id
     </select>
 
-    <select id="getNewCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+    <select id="getNewCustomerData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             org_id,
-            count( customer_id ) as customer_num
+            count( customer_id ) as customer_num,
+			realty_consultant
         FROM
             ta_recommend_customer
         WHERE
-            `STATUS` = #{status}
-            AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
+             AND verify_status = 1
         GROUP BY
-            org_id
+            org_id,realty_consultant
     </select>
-    <select id="getVisiteCustomerData" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+    <select id="getVisiteCustomerData" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
             count( DISTINCT ( c.customer_id ) ) as customer_num,
-            c.org_id
+            c.org_id,
+			c.realty_consultant
         FROM
             ta_activity_dynamic_enlist t
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
             AND t.building_id = c.building_id
             AND t.org_id = c.org_id
+            AND c.verify_status = 1
         WHERE
             t.is_checkin = #{checkin}
             AND date_format( t.create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
         GROUP BY
-            c.org_id
+            c.org_id,c.realty_consultant
     </select>
-
-    <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticDaily">
+    <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
           *
         FROM
-          ta_customer_statistic_daily
+          ts_customer_statistic_daily
         WHERE
           org_id = #{orgId}
         AND customer_type = #{customerType}
+        AND (realty_consultant = #{personId} or realty_consultant = #{userId})
         AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
         AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
+        order by `day`
     </select>
+
 </mapper>

src/main/resources/mapper/statistic/TaCustomerStatisticMonthlyMapper.xml → src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml

@@ -1,58 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huiju.estateagents.statistic.mapper.TaCustomerStatisticMonthlyMapper">
+<mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerStatisticMonthlyMapper">
 
     <select id="getNewCustomerStatisticMonthly"
-            resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+            resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
             org_id,
-            count( customer_id ) as customer_num
+            count( customer_id ) as customer_num,
+            realty_consultant
         FROM
             ta_recommend_customer
         WHERE
-            `STATUS` = #{status}
-            AND date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
+            date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
+            AND verify_status = 1
         GROUP BY
-            org_id
+            org_id,realty_consultant
     </select>
 
     <select id="getFollowUpStatisticMonthly"
-            resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+            resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
             org_id,
-            count( DISTINCT ( customer_id ) ) as customer_num
+            count( DISTINCT ( customer_id ) ) as customer_num,
+            follower_id AS realty_consultant
         FROM
             ta_customer_follow_up_record
         WHERE
             date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
         GROUP BY
-            org_id
+            org_id,follower_id
     </select>
     <select id="getVisiteStatisticMonthly"
-            resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+            resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
             count( DISTINCT ( c.customer_id ) ) as customer_num,
-            c.org_id
+            c.org_id,
+            c.realty_consultant
         FROM
             ta_activity_dynamic_enlist t
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
             AND t.building_id = c.building_id
             AND t.org_id = c.org_id
+            AND c.verify_status = 1
         WHERE
             t.is_checkin = #{checkin}
             AND date_format( t.create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
         GROUP BY
-            c.org_id
+            c.org_id,c.realty_consultant
     </select>
-    <select id="getMonthlyList" resultType="com.huiju.estateagents.statistic.entity.TaCustomerStatisticMonthly">
+    <select id="getMonthlyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticMonthly">
         SELECT
           *
         FROM
-          ta_customer_statistic_monthly
+          ts_customer_statistic_monthly
         WHERE
           org_id = #{orgId}
         AND customer_type = #{customerType}
-        AND date_format( create_date, '%Y-%m-%d' ) >= date_format( #{beforeDate}, '%Y-%m-%d' )
-        AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
+        AND (realty_consultant = #{personId} or realty_consultant = #{userId})
+        AND date_format( create_date, '%Y-%m' ) >= date_format( #{beforeDate}, '%Y-%m' )
+        AND date_format( create_date, '%Y-%m' ) &lt;= date_format( #{nowDate}, '%Y-%m' )
+         order by `month`
     </select>
 </mapper>

src/test/java/com/huiju/estateagents/TdCityServiceImplTest.java

@@ -0,0 +1,30 @@
+package com.huiju.estateagents;
+
+import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.service.ITdCityService;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@Transactional
+public class TdCityServiceImplTest {
+	
+	@Autowired
+	private ITdCityService iTdCityService;
+	
+	@Test
+	public void getLocationCity() {
+		TdCity locationCity = iTdCityService.getLocationCity("116.310003,39.991957");
+		//断言 对象不为null
+		Assert.assertNotNull(locationCity);
+		//断言获取的是北京市
+		Assert.assertEquals("北京市",locationCity.getName());
+	}
+}