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

pom.xml

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

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

@@ -90,9 +90,6 @@ public class TaUserController extends BaseController {
     @Autowired
     private ITaPersonService iTaPersonService;
 
-    @Autowired
-    private ITaUserService iTaUserService;
-
     /**
      * 分页查询列表
      * @param pageNum

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;
     /**
      * 活动助力列表
      *
@@ -293,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/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);
@@ -530,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/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 ("0".equals(String.valueOf(taNews.getNewsStatus()))){
+            // 设置为取消发布以后把轮播图和资讯设置为停用
+            iExtendContentService.updateActivity(String.valueOf(id),"news",getOrgId(request));
+        }
         return responseBean;
     }
 

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;
+
 
     /**
      * 分页查询列表
@@ -318,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/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/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(1);
+            extendContentMapper.updateById(extendContent);
+        }
+    }
 }

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

@@ -42,7 +42,7 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
      * 根据经纬度获取城市详情信息
      *
      * @param location
-     * @return
+     * @return  
      */
     @Override
     public TdCity getLocationCity(String location) {

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

@@ -51,7 +51,6 @@
         GROUP BY
             c.org_id,c.realty_consultant
     </select>
-
     <select id="getDailyList" resultType="com.huiju.estateagents.statistic.entity.TsCustomerStatisticDaily">
         SELECT
           *
@@ -65,4 +64,5 @@
         AND date_format( create_date, '%Y-%m-%d' ) &lt;= date_format( #{nowDate}, '%Y-%m-%d' )
         order by `day`
     </select>
+
 </mapper>