bug 修改

src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java

@@ -450,7 +450,7 @@ public class TaBuildingDynamicController extends BaseController {
         Integer cityId = iTaBuildingService.getCityById(dynamic.getBuildingId());
         dynamic.setCityId(cityId);
         //发布状态 1展示
-        dynamic.setStatus(1);
+        dynamic.setStatus(CommConstant.NOT_PUBLISH);
         //活动状态，如果不需要报名则直接置为进行中
         dynamic.setActivityStatus(1);
         dynamic.setIsEnlist(1);

src/main/java/com/yunzhi/marketing/controller/TaCustomImgController.java

@@ -102,17 +102,17 @@ public class TaCustomImgController extends BaseController {
                 customImg.setImgDesc("小程序首页分享配图");
                 taCustomImgs.add(customImg);
             }
-            if (CommConstant.BANNER_INDEX.equals(taCustomImg.getImgType())){
-                TaCustomImg customImg = new TaCustomImg();
-                customImg.setCreateTime(LocalDateTime.now());
-                customImg.setUpdateTime(LocalDateTime.now());
-                customImg.setOrgId(getOrgId(request));
-                customImg.setStatus(CommConstant.STATUS_NORMAL);
-                customImg.setImgUrl("http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png");
-                customImg.setImgType(CommConstant.INDEX_NEWS);
-                customImg.setImgDesc("首页资讯logo");
-                taCustomImgs.add(customImg);
-            }
+//            if (CommConstant.BANNER_INDEX.equals(taCustomImg.getImgType())){
+//                TaCustomImg customImg = new TaCustomImg();
+//                customImg.setCreateTime(LocalDateTime.now());
+//                customImg.setUpdateTime(LocalDateTime.now());
+//                customImg.setOrgId(getOrgId(request));
+//                customImg.setStatus(CommConstant.STATUS_NORMAL);
+//                customImg.setImgUrl("http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png");
+//                customImg.setImgType(CommConstant.INDEX_NEWS);
+//                customImg.setImgDesc("首页资讯logo");
+//                taCustomImgs.add(customImg);
+//            }
             if (iTaCustomImgService.saveBatch(taCustomImgs)){
                 responseBean.addSuccess(taCustomImg);
             }else {

src/main/java/com/yunzhi/marketing/job/CustomerStatisticTimeJob.java

@@ -50,7 +50,7 @@ public class CustomerStatisticTimeJob extends BaseController {
      *
      * 开启定时任务，每天23:50执行
      */
-//    @Scheduled(cron = "59 50 23 * * ?")
+    @Scheduled(cron = "59 50 23 * * ?")
 //    @Scheduled(cron = "* 0/1 * * * ?")
     private void configureTasks() {
         LocalDateTime nowDate = LocalDateTime.now();

src/main/java/com/yunzhi/marketing/po/TaRecommendCustomerPO.java

@@ -25,6 +25,8 @@ public class TaRecommendCustomerPO {
 
     private String customerStatus;
 
+    private Boolean visitStatus;
+
     private String channelStatus;
 
     private String consultant;

src/main/java/com/yunzhi/marketing/service/impl/TaLiveActivityServiceImpl.java

@@ -78,6 +78,7 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
             taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html", ""));
         }
 
+        taLiveActivity.setStatus(CommConstant.NOT_PUBLISH);
         Boolean result = save(taLiveActivity);
         if (!result) {
             responseBean.addError("fail");

src/main/java/com/yunzhi/marketing/service/impl/TaPersonServiceImpl.java

@@ -330,7 +330,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         result.put("pvNum", person.getPvNum());
         result.put("post", person.getPost());
         result.put("phone", user.getPhone());
-        result.put("avatar",user.getAvatar());
+        result.put("avatar",person.getAvatarurl());
         result.put("visitors", visitors);
         result.put("liked", false);
         result.put("unReadNum", 0);

src/main/java/com/yunzhi/marketing/service/impl/TaRecommendCustomerServiceImpl.java

@@ -392,7 +392,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         LambdaQueryWrapper<TaRecommendCustomer> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TaRecommendCustomer::getPhone,channelReportDTO.getPhone());
         queryWrapper.eq(TaRecommendCustomer::getBuildingId,channelReportDTO.getBuildingId());
-        queryWrapper.isNull(TaRecommendCustomer::getRecommendPerson);
+        queryWrapper.isNotNull((TaRecommendCustomer::getRecommendPerson));
         List<TaRecommendCustomer> taRecommendCustomers = taRecommendCustomerMapper.selectList(queryWrapper);
         if (taRecommendCustomers.size() > 0) {
             return ResponseBean.error("已存在的客户报备失败", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/yunzhi/marketing/statistic/controller/TsCustomerGenderStatisticController.java

@@ -173,7 +173,7 @@ public class TsCustomerGenderStatisticController extends BaseController {
             QueryWrapper<TsCustomerGenderStatistic> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",getOrgId(request));
             queryWrapper.eq("customer_type",customerType);
-            queryWrapper.eq("realty_consultant",person.getPersonId());
+            queryWrapper.nested(query -> query.eq("realty_consultant", person.getPersonId()).or().eq("realty_consultant", person.getUserId()));
             queryWrapper.orderByDesc("create_date");
      
             List<TsCustomerGenderStatistic> result = iTaCustomerGenderStatisticService.list(queryWrapper);

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java

@@ -129,7 +129,13 @@ public class ChannelCustomerController extends BaseController {
     @ApiOperation(value = "森哥看这里-wx-驻场确认到访", notes = "森哥看这里-wx-驻场确认到访")
     @RequestMapping(value="/{plat}/marking/visit",method= RequestMethod.PUT)
     public ResponseBean channelCustomerUpdate(@RequestBody MarkingChannelCustomerDTO params){
-        return iChannelCustomerService.markingChannelCustomer(params);
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iChannelCustomerService.markingChannelCustomer(params);
+        }catch (Exception e){
+            responseBean.addError("不允许重复报备");
+        }
+        return responseBean;
     }
 
     /**

src/main/java/com/yunzhi/marketing/xlk/service/IChannelCustomerService.java

@@ -32,7 +32,7 @@ public interface IChannelCustomerService extends IService<ChannelCustomer> {
      * @param params
      * @return
      */
-    ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params);
+    ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params) throws Exception;
 
     /**
      * 驻场 无效报备

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -23,6 +23,7 @@ import com.yunzhi.marketing.xlk.mapper.*;
 import com.yunzhi.marketing.xlk.service.IChannelCustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -167,7 +168,8 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
      * @return
      */
     @Override
-    public ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params) {
+    @Transactional
+    public ResponseBean markingChannelCustomer(MarkingChannelCustomerDTO params) throws Exception {
         CustomerVisit customerVisit = params.getCustomerVisit();
         // 渠道推荐的客户
         if ("report".equals(params.getType())) {
@@ -255,6 +257,12 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
 
         // 保存到访单
         customerVisit.setCreateDate(LocalDateTime.now());
+        LambdaQueryWrapper<CustomerVisit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CustomerVisit::getCustomerId,customerVisit.getCustomerId());
+        CustomerVisit oldCustomerVisit = customerVisitMapper.selectOne(lambdaQueryWrapper);
+        if (null != oldCustomerVisit) {
+            throw new Exception("不允许重复报备");
+        }
         customerVisitMapper.insert(customerVisit);
 
         return ResponseBean.success("审核成功");

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -1019,10 +1019,12 @@ FROM
             t.recommend_person,
             null as channel_id,
             p.name as channelName,
-            t.create_date
+            t.create_date,
+            if(v.customer_visit_id is not null || t.`status` = 2 ,true,false) as visitStatus
         FROM
             ta_recommend_customer t
          left JOIN ta_person p ON t.realty_consultant = p.person_id
+         LEFT JOIN xlk_customer_visit v on t.customer_id = v.customer_id
         WHERE
             t.building_id = #{buildingId}
         and t.entry_type = "verify"
@@ -1044,7 +1046,8 @@ FROM
         t.recommend_person,
         t.channel_id,
         c.channel_name as channelName,
-        t.create_date
+        t.create_date,
+        false as visitStatus
         FROM
             xlk_channel_customer t
         Left join ta_channel c on t.channel_id = c.channel_id
@@ -1054,6 +1057,7 @@ FROM
         <if test="keywords != null and keywords !=''">
             and t.name like CONCAT('%',#{keywords}, '%')
         </if>
+        ORDER BY create_date desc
     </select>
     <select id="getCustomersRecommended" resultType="com.yunzhi.marketing.entity.TaRecommendCustomer">
         select a.*,b.avatarurl from ta_recommend_customer a left join ta_person b on a.person_id = b.person_id

src/main/resources/mapper/xlk/ChannelCustomerMapper.xml

@@ -86,7 +86,6 @@
         LEFT JOIN ta_building d on a.building_id = d.building_id
         WHERE
         a.recommend_person = #{params.personId}
-        and a.`status` != 3
         and a.org_id = #{params.orgId}
         <if test="params.status != null and params.status !=''">
             and c.status = #{params.status}
@@ -109,7 +108,6 @@
         FROM
         xlk_channel_customer t
         WHERE t.channel_id  = #{params.channelId}
-        and t.`status` = 1
         <if test="params.startDate != null or params.endDate != null">
             AND t.create_date BETWEEN #{params.startDate} and #{params.endDate}
         </if>
@@ -144,7 +142,6 @@
         FROM
         xlk_channel_customer t
         WHERE t.channel_id  = #{params.channelId}
-        and t.`status` = 1
         <if test="params.startDate != null or params.endDate != null">
             AND t.create_date BETWEEN #{params.startDate} and #{params.endDate}
         </if>

src/main/resources/mapper/xlk/SearchHouseMapper.xml

@@ -9,11 +9,12 @@
             p.`nickname`,
             p.phone,
             p.gender,
-            c.`name`
+            CONCAT(cc.name,c.name) as `name`
         FROM
             xlk_search_house t
             LEFT JOIN ta_person p ON t.person_id = p.person_id
             LEFT JOIN td_city c on t.intent_area = c.id
+            LEFT JOIN td_city cc on cc.id = c.parentid
             WHERE t.ORG_ID = #{params.orgId}
                 and t.type = #{params.type}
         <if test="params.nickname != null and params.nickname != ''">