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

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

 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.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.entity.TaChannel;
+import com.huiju.estateagents.entity.TaChannelPerson;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.TaChannelPersonService;
 import com.huiju.estateagents.service.TaChannelService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
-import org.checkerframework.checker.units.qual.A;
-import org.checkerframework.checker.units.qual.C;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-
-import com.huiju.estateagents.base.BaseController;
 import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
             return ResponseBean.error("您已经成为置业顾问",ResponseBean.ERROR_UNAVAILABLE);
         }
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone",person.getTel()).or().eq("phone",person.getPhone());
+        queryWrapper.nested(query -> query.eq("phone", person.getTel()).or().eq("phone", person.getPhone()));
         queryWrapper.eq("org_id",orgId);
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         queryWrapper.eq("is_consultant",true);

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

                     if (null != realtyConsultant) {
                         List<TaBuilding> taBuildings = taPersonBuildingMapper.getBuildingsOf(realtyConsultant);
                         taRecommendCustomer.setRealtyConsultant(realtyConsultant);
-                        taRecommendCustomer.setCreateDate(LocalDateTime.now());
                         if (taBuildings != null && taBuildings.size() > 0) {
                             TaBuilding taBuilding = taBuildings.get(0);
                             taRecommendCustomer.setBuildingId(taBuilding.getBuildingId());
                     }
                 }
 
+                taRecommendCustomer.setVerifyDate(LocalDateTime.now());
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)) {
 
                     // 审核通过增加积分

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

 
     private LocalDateTime arrivalDate;
 
+    private LocalDateTime verifyDate;
+
     @DateTimeFormat("yyyy年MM月dd日")
     private LocalDateTime createDate;
 

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

 
     TaRecommendCustomer newByPerson(TaPerson person);
 
-    ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId);
+    ResponseBean consultantAssist(TaUser taUser, String customerId, Integer orgId);
 
     ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId);
 

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

      */
     @Override
     public List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
-        return taRecommendCustomerMapper.getConsultantCustomerList(userId,personId,buildingId,orgId);
+        return taRecommendCustomerMapper.getConsultantCustomerList(userId, personId, buildingId, orgId);
     }
 
     @Override
     }
 
     @Override
-    public ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId) {
-        TaPerson taPerson = taPersonMapper.getById(personId);
-
-        TaPerson recommendPerson = taPersonMapper.selectById(personId);
+    public ResponseBean consultantAssist(TaUser taUser, String customerId, Integer orgId) {
 
+        // 1.校验置业顾问
         QueryWrapper<TaUser> queryWrapper = new QueryWrapper();
         queryWrapper.eq("user_id", taUser.getUserId());
         TaUser userInfo = taUserMapper.selectOne(queryWrapper);
         taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
         TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(taPersonBuildingQueryWrapper);
 
-        if (null == userInfo || userInfo.getStatus() != CommConstant.STATUS_NORMAL) {
+        if (null == userInfo || CommConstant.STATUS_NORMAL != userInfo.getStatus() ) {
             return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
         }
 
+        // 2.根据customerId获取personId
+        TaRecommendCustomer recommendCustomerInfo = taRecommendCustomerMapper.selectById(customerId);
+        if(recommendCustomerInfo == null){
+            return ResponseBean.error("分配客户失败",ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 3.判断是否有buildingId,有则直接更新数据
+        if(!StringUtils.isEmpty(recommendCustomerInfo.getBuildingId()) && StringUtils.isEmpty(recommendCustomerInfo.getRealtyConsultant())){
+            log.error("公客添加置业顾问 customer:" + JSONObject.toJSONString(recommendCustomerInfo));
+            recommendCustomerInfo.setRealtyConsultant(userInfo.getUserId().toString());
+            return ResponseBean.success(taRecommendCustomerMapper.updateById(recommendCustomerInfo));
+        }
+
+        // 4.无buildingId，新增一条私客数据
+        TaPerson taPerson = taPersonMapper.getById(recommendCustomerInfo.getPersonId());
+        if(taPerson == null){
+            return ResponseBean.error("分配客户失败",ResponseBean.ERROR_UNAVAILABLE);
+        }
+
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
         taRecommendCustomer.setOrgId(orgId);
         taRecommendCustomer.setName(taPerson.getNickname());
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
-        taRecommendCustomer.setPersonId(personId);
-        taRecommendCustomer.setRecommendPerson(recommendPerson == null ? "" : recommendPerson.getRecommendPerson());
+        taRecommendCustomer.setPersonId(taPerson.getPersonId());
+        taRecommendCustomer.setRecommendPerson(taPerson.getRecommendPerson());
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
         if (row < 1) {
             return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-
         return ResponseBean.success(taRecommendCustomer);
-
     }
 
     private List<TaRecommendCustomer> getCustomerByPhone(String phone, Integer orgId) {

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         <if test="belongStatus == 0">
             and (t.building_id = ''  OR t.building_id is null )
         </if>
+        order by t.create_date desc
     </select>
     <!--    limit #{pageCode}, #{pageSize}-->