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

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,17 +67,20 @@ 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.error("验证人员信息失败",ResponseBean.ERROR_UNAVAILABLE);
+			//验证人员信息失败小程序端希望是空数组对象
+			return ResponseBean.success(new Page(pageNumber,pageSize));
 		}
 		responseBean = activityService.getCustomerActivityList(pageNumber,pageSize,orgId,person);
 		return responseBean;

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

@@ -217,6 +217,7 @@ public class TaPersonVisitRecordController extends BaseController {
             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/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/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;

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

@@ -214,6 +214,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());
@@ -733,6 +734,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());
 

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

@@ -60,7 +60,7 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		List<TaPersonVisitRecord> records = result.getRecords();
 		records.forEach(e -> {
 			//获取活动标题
-			if (e.getEventType().equals("activity") && null != e.getTargetId()){
+			if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
 				TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
 				if (null != taBuildingDynamic){
 					e.setActivityName(taBuildingDynamic.getTitle());
@@ -68,14 +68,14 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				
 			}
 			//获取拼团标题
-			if (e.getEventType().equals("group") && null != e.getTargetId()){
+			if ("group".equals(e.getEventType()) && null != e.getTargetId()){
 				TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
 				if (null != taShareActivity){
 					e.setActivityName(taShareActivity.getActivityName());
 				}
 			}
 			//获取助力标题
-			if (e.getEventType().equals("help") && null != e.getTargetId()){
+			if ("help".equals(e.getEventType()) && null != e.getTargetId()){
 				HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
 				if (null != helpActivity){
 					e.setActivityName(helpActivity.getTitle());

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

@@ -276,6 +276,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
+        taRecommendCustomer.setIntention(params.getString("intention"));
         taRecommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());

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

@@ -104,7 +104,7 @@ public class TsCustomerStatisticDailyServiceImpl extends ServiceImpl<TsCustomerS
 			//合并数据
 			list.forEach(l -> {
 				if (newDate.equals(l.getDay())){
-					tsCustomerStatisticDaily.setCustomerNum(l.getCustomerNum());
+					tsCustomerStatisticDaily.setCustomerNum(tsCustomerStatisticDaily.getCustomerNum() + l.getCustomerNum());
 				}
 			});
 			newList.add(tsCustomerStatisticDaily);

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

@@ -101,7 +101,7 @@ public class TsCustomerStatisticMonthlyServiceImpl extends ServiceImpl<TsCustome
 			tsCustomerStatisticMonthly.setRealtyConsultant(personId);
 			list.forEach(l -> {
 				if (newDate.equals(l.getMonth())){
-					tsCustomerStatisticMonthly.setCustomerNum(l.getCustomerNum());
+					tsCustomerStatisticMonthly.setCustomerNum(tsCustomerStatisticMonthly.getCustomerNum() + l.getCustomerNum());
 				}
 			});
 			newList.add(tsCustomerStatisticMonthly);