feats

src/main/java/com/yunzhi/marketing/borker/controller/BkAgreementController.java

@@ -85,6 +85,7 @@ public class BkAgreementController extends BaseController {
 
         bkAgreement.setOrgId(getOrgId(request).toString());
         bkAgreement.setInstitutionId(CommConstant.ROOT_INSTITUTION);
+        bkAgreement.setStatus(CommConstant.STATUS_NORMAL);
 
         if (iBkAgreementService.save(bkAgreement)){
             return ResponseBean.success(bkAgreement);
@@ -103,11 +104,11 @@ public class BkAgreementController extends BaseController {
                                           HttpServletRequest request) throws Exception{
 
         BkAgreement bkAgreement = iBkAgreementService.getById(id);
-        if (null == bkAgreement || CommConstant.STATUS_DELETE.equals(bkAgreement)) {
+        if (null == bkAgreement || CommConstant.STATUS_DELETE.equals(bkAgreement.getStatus())) {
             return ResponseBean.success("success");
         }
 
-        if (!bkAgreement.getOrgId().equals(getOrgId(request))) {
+        if (!bkAgreement.getOrgId().equals(getOrgId(request).toString())) {
             return ResponseBean.error("暂无权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
@@ -135,15 +136,16 @@ public class BkAgreementController extends BaseController {
         }
 
         BkAgreement origin = iBkAgreementService.getById(id);
-        if (null == bkAgreement || CommConstant.STATUS_DELETE.equals(bkAgreement)) {
+        if (CommConstant.STATUS_DELETE.equals(bkAgreement.getStatus())) {
             return ResponseBean.success("success");
         }
 
-        if (!bkAgreement.getOrgId().equals(getOrgId(request))) {
+        if (!bkAgreement.getOrgId().equals(getOrgId(request).toString())) {
             return ResponseBean.error("暂无权限", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         bkAgreement.setOrgId(origin.getOrgId());
+        bkAgreement.setStatus(CommConstant.STATUS_NORMAL);
 
         if (iBkAgreementService.updateById(bkAgreement)){
             return ResponseBean.success(iBkAgreementService.getById(id));

src/main/java/com/yunzhi/marketing/borker/entity/BkAgreement.java

@@ -39,6 +39,9 @@ public class BkAgreement implements Serializable {
     @ApiModelProperty(value = "规则内容")
     private String content;
 
+    @ApiModelProperty(value = "有效天数")
+    private Integer expirationDays;
+
     @ApiModelProperty(value = "城市")
     private String cityId;
 

src/main/java/com/yunzhi/marketing/borker/service/IBkAgreementService.java

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IBkAgreementService extends IService<BkAgreement> {
 
+    boolean switchByBuilding(String buildingId, Boolean on);
 }

src/main/java/com/yunzhi/marketing/borker/service/impl/BkAgreementServiceImpl.java

@@ -1,9 +1,11 @@
 package com.yunzhi.marketing.borker.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yunzhi.marketing.borker.entity.BkAgreement;
 import com.yunzhi.marketing.borker.mapper.BkAgreementMapper;
 import com.yunzhi.marketing.borker.service.IBkAgreementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.common.CommConstant;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +19,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class BkAgreementServiceImpl extends ServiceImpl<BkAgreementMapper, BkAgreement> implements IBkAgreementService {
 
+    @Override
+    public boolean switchByBuilding(String buildingId, Boolean on) {
+        UpdateWrapper<BkAgreement> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("building_id", buildingId);
+        updateWrapper.gt("status", CommConstant.STATUS_DELETE);
+        updateWrapper.set("status", on ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_READY);
+
+        return update(updateWrapper);
+    }
 }

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -38,6 +38,8 @@ public class CommConstant {
      */
     public final static String PERSON_BORKER = "borker";
 
+
+    public final static Integer STATUS_READY = 0;
     /**
      * 状态: 正常
      */

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.borker.service.IBkAgreementService;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.entity.*;
@@ -66,6 +67,9 @@ public class TaBuildingController extends BaseController {
     @Autowired
     TaBuildingApartmentMapper taBuildingApartmentMapper;
 
+    @Autowired
+    IBkAgreementService iBkAgreementService;
+
     /**
      * 楼盘详情
      *
@@ -535,7 +539,7 @@ public class TaBuildingController extends BaseController {
     }
 
     @ApiOperation(value = "admin - 开启全民经纪人", notes = "admin - 开启全民经纪人")
-    @PutMapping(value = "/admin/marketing/{id}/borker")
+    @PutMapping(value = "/admin/building/{id}/borker")
     public  ResponseBean switchBorker(@ApiParam("楼盘ID") @PathVariable String id,
                                       @ApiParam(value = "是否开启", allowableValues = "true,false") @RequestParam Boolean on,
                                       HttpServletRequest request) throws Exception {
@@ -544,6 +548,8 @@ public class TaBuildingController extends BaseController {
             return ResponseBean.error("未找到楼盘", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        iBkAgreementService.switchByBuilding(id, on);
+
         taBuilding.setIsBorker(on);
         taBuildingService.updateById(taBuilding);
         return ResponseBean.success("success");

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

@@ -447,6 +447,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         channelCustomer.setPhone(channelReportDTO.getPhone());
         channelCustomer.setSex(channelReportDTO.getSex());
         channelCustomer.setRecommendPerson(channelReportDTO.getPersonId());
+        channelCustomer.setRecommendPersonType(person.getPersonType());
         channelCustomer.setCreateDate(LocalDateTime.now());
         channelCustomer.setStatus("1");
         channelCustomer.setChannelId(taChannelPeople.getChannelId());

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

@@ -180,7 +180,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             customerVisit.setRecommendPerson(customer.getRecommendPerson());
             TaPerson recommendPerson = taPersonMapper.getById(customer.getRecommendPerson());
             if (null != recommendPerson) {
-                customerVisit.setRealtyConsultantName(recommendPerson.getName());
+                customerVisit.setRecommendName(recommendPerson.getName());
             }
             customerVisit.setRealtyConsultant(params.getRealtyConsultant());
             TaPerson channelPerson = taPersonMapper.getById(params.getRealtyConsultant());
@@ -225,7 +225,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
                 customer.setName(customerVisit.getName());
                 channelCustomerMapper.updateById(customer);
-            }else if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
+            } else if (StringUtils.isEmpty(recommendCustomer.getRealtyConsultant()) &&
                     (StringUtils.isEmpty(recommendCustomer.getRecommendPerson()) || recommendCustomer.getRecommendPerson().equals(customer.getRecommendPerson()))){
                 // 审核通过
                 customer.setStatus(CommConstant.CHANNEL_CUSTOMER_AGREE);
@@ -243,7 +243,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 recommendCustomer.setCirculationTime(LocalDateTime.now());
                 recommendCustomer.setName(customerVisit.getName());
                 taRecommendCustomerMapper.updateById(recommendCustomer);
-            }else {
+            } else {
                 return ResponseBean.error("该客户已到访", ResponseBean.ERROR_UNAVAILABLE);
             }
         }else if ("customer".equals(params.getType())) {
@@ -254,7 +254,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             taRecommendCustomer.setCirculationTime(LocalDateTime.now());
             customerVisit.setCustomerId(taRecommendCustomer.getCustomerId());
             taRecommendCustomerMapper.updateById(taRecommendCustomer);
-        }else {
+        } else {
             return ResponseBean.error("请输入正确的类型参数", ResponseBean.ERROR_UNAVAILABLE);
         }