Kaynağa Gözat

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

魏超 5 yıl önce
ebeveyn
işleme
4a0a6ac2db

+ 6
- 7
src/main/java/com/huiju/estateagents/controller/TaPersonController.java Dosyayı Görüntüle

5
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
6
 import com.baomidou.mybatisplus.core.metadata.IPage;
7
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8
+import com.huiju.estateagents.base.BaseController;
8
 import com.huiju.estateagents.base.ResponseBean;
9
 import com.huiju.estateagents.base.ResponseBean;
9
 import com.huiju.estateagents.center.taUser.entity.TaUser;
10
 import com.huiju.estateagents.center.taUser.entity.TaUser;
10
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
11
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
11
 import com.huiju.estateagents.common.CommConstant;
12
 import com.huiju.estateagents.common.CommConstant;
12
-import com.huiju.estateagents.common.JWTUtils;
13
 import com.huiju.estateagents.common.SMSUtils;
13
 import com.huiju.estateagents.common.SMSUtils;
14
 import com.huiju.estateagents.common.StringUtils;
14
 import com.huiju.estateagents.common.StringUtils;
15
-import com.huiju.estateagents.entity.*;
15
+import com.huiju.estateagents.entity.TaChannel;
16
+import com.huiju.estateagents.entity.TaChannelPerson;
17
+import com.huiju.estateagents.entity.TaPerson;
18
+import com.huiju.estateagents.entity.TaPersonBuilding;
16
 import com.huiju.estateagents.service.ITaPersonBuildingService;
19
 import com.huiju.estateagents.service.ITaPersonBuildingService;
17
 import com.huiju.estateagents.service.ITaPersonService;
20
 import com.huiju.estateagents.service.ITaPersonService;
18
 import com.huiju.estateagents.service.TaChannelPersonService;
21
 import com.huiju.estateagents.service.TaChannelPersonService;
19
 import com.huiju.estateagents.service.TaChannelService;
22
 import com.huiju.estateagents.service.TaChannelService;
20
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
23
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
21
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
24
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
22
-import org.checkerframework.checker.units.qual.A;
23
-import org.checkerframework.checker.units.qual.C;
24
 import org.springframework.beans.factory.annotation.Autowired;
25
 import org.springframework.beans.factory.annotation.Autowired;
25
 import org.springframework.web.bind.annotation.*;
26
 import org.springframework.web.bind.annotation.*;
26
-
27
-import com.huiju.estateagents.base.BaseController;
28
 import org.springframework.web.client.RestTemplate;
27
 import org.springframework.web.client.RestTemplate;
29
 
28
 
30
 import javax.servlet.http.HttpServletRequest;
29
 import javax.servlet.http.HttpServletRequest;
159
             return ResponseBean.error("您已经成为置业顾问",ResponseBean.ERROR_UNAVAILABLE);
158
             return ResponseBean.error("您已经成为置业顾问",ResponseBean.ERROR_UNAVAILABLE);
160
         }
159
         }
161
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
160
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
162
-        queryWrapper.eq("phone",person.getTel()).or().eq("phone",person.getPhone());
161
+        queryWrapper.nested(query -> query.eq("phone", person.getTel()).or().eq("phone", person.getPhone()));
163
         queryWrapper.eq("org_id",orgId);
162
         queryWrapper.eq("org_id",orgId);
164
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
163
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
165
         queryWrapper.eq("is_consultant",true);
164
         queryWrapper.eq("is_consultant",true);

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java Dosyayı Görüntüle

671
                     if (null != realtyConsultant) {
671
                     if (null != realtyConsultant) {
672
                         List<TaBuilding> taBuildings = taPersonBuildingMapper.getBuildingsOf(realtyConsultant);
672
                         List<TaBuilding> taBuildings = taPersonBuildingMapper.getBuildingsOf(realtyConsultant);
673
                         taRecommendCustomer.setRealtyConsultant(realtyConsultant);
673
                         taRecommendCustomer.setRealtyConsultant(realtyConsultant);
674
-                        taRecommendCustomer.setCreateDate(LocalDateTime.now());
675
                         if (taBuildings != null && taBuildings.size() > 0) {
674
                         if (taBuildings != null && taBuildings.size() > 0) {
676
                             TaBuilding taBuilding = taBuildings.get(0);
675
                             TaBuilding taBuilding = taBuildings.get(0);
677
                             taRecommendCustomer.setBuildingId(taBuilding.getBuildingId());
676
                             taRecommendCustomer.setBuildingId(taBuilding.getBuildingId());
680
                     }
679
                     }
681
                 }
680
                 }
682
 
681
 
682
+                taRecommendCustomer.setVerifyDate(LocalDateTime.now());
683
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)) {
683
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)) {
684
 
684
 
685
                     // 审核通过增加积分
685
                     // 审核通过增加积分

+ 2
- 0
src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java Dosyayı Görüntüle

149
 
149
 
150
     private LocalDateTime arrivalDate;
150
     private LocalDateTime arrivalDate;
151
 
151
 
152
+    private LocalDateTime verifyDate;
153
+
152
     @DateTimeFormat("yyyy年MM月dd日")
154
     @DateTimeFormat("yyyy年MM月dd日")
153
     private LocalDateTime createDate;
155
     private LocalDateTime createDate;
154
 
156
 

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java Dosyayı Görüntüle

57
 
57
 
58
     TaRecommendCustomer newByPerson(TaPerson person);
58
     TaRecommendCustomer newByPerson(TaPerson person);
59
 
59
 
60
-    ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId);
60
+    ResponseBean consultantAssist(TaUser taUser, String customerId, Integer orgId);
61
 
61
 
62
     ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId);
62
     ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId);
63
 
63
 

+ 25
- 10
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Dosyayı Görüntüle

160
      */
160
      */
161
     @Override
161
     @Override
162
     public List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
162
     public List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
163
-        return taRecommendCustomerMapper.getConsultantCustomerList(userId,personId,buildingId,orgId);
163
+        return taRecommendCustomerMapper.getConsultantCustomerList(userId, personId, buildingId, orgId);
164
     }
164
     }
165
 
165
 
166
     @Override
166
     @Override
833
     }
833
     }
834
 
834
 
835
     @Override
835
     @Override
836
-    public ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId) {
837
-        TaPerson taPerson = taPersonMapper.getById(personId);
838
-
839
-        TaPerson recommendPerson = taPersonMapper.selectById(personId);
836
+    public ResponseBean consultantAssist(TaUser taUser, String customerId, Integer orgId) {
840
 
837
 
838
+        // 1.校验置业顾问
841
         QueryWrapper<TaUser> queryWrapper = new QueryWrapper();
839
         QueryWrapper<TaUser> queryWrapper = new QueryWrapper();
842
         queryWrapper.eq("user_id", taUser.getUserId());
840
         queryWrapper.eq("user_id", taUser.getUserId());
843
         TaUser userInfo = taUserMapper.selectOne(queryWrapper);
841
         TaUser userInfo = taUserMapper.selectOne(queryWrapper);
846
         taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
844
         taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
847
         TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(taPersonBuildingQueryWrapper);
845
         TaPersonBuilding taPersonBuilding = taPersonBuildingMapper.selectOne(taPersonBuildingQueryWrapper);
848
 
846
 
849
-        if (null == userInfo || userInfo.getStatus() != CommConstant.STATUS_NORMAL) {
847
+        if (null == userInfo || CommConstant.STATUS_NORMAL != userInfo.getStatus() ) {
850
             return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
848
             return ResponseBean.error("置业顾问不存在或已被注销", ResponseBean.ERROR_UNAVAILABLE);
851
         }
849
         }
852
 
850
 
851
+        // 2.根据customerId获取personId
852
+        TaRecommendCustomer recommendCustomerInfo = taRecommendCustomerMapper.selectById(customerId);
853
+        if(recommendCustomerInfo == null){
854
+            return ResponseBean.error("分配客户失败",ResponseBean.ERROR_UNAVAILABLE);
855
+        }
856
+
857
+        // 3.判断是否有buildingId,有则直接更新数据
858
+        if(!StringUtils.isEmpty(recommendCustomerInfo.getBuildingId()) && StringUtils.isEmpty(recommendCustomerInfo.getRealtyConsultant())){
859
+            log.error("公客添加置业顾问 customer:" + JSONObject.toJSONString(recommendCustomerInfo));
860
+            recommendCustomerInfo.setRealtyConsultant(userInfo.getUserId().toString());
861
+            return ResponseBean.success(taRecommendCustomerMapper.updateById(recommendCustomerInfo));
862
+        }
863
+
864
+        // 4.无buildingId,新增一条私客数据
865
+        TaPerson taPerson = taPersonMapper.getById(recommendCustomerInfo.getPersonId());
866
+        if(taPerson == null){
867
+            return ResponseBean.error("分配客户失败",ResponseBean.ERROR_UNAVAILABLE);
868
+        }
869
+
853
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
870
         TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
854
         taRecommendCustomer.setOrgId(orgId);
871
         taRecommendCustomer.setOrgId(orgId);
855
         taRecommendCustomer.setName(taPerson.getNickname());
872
         taRecommendCustomer.setName(taPerson.getNickname());
867
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
884
         taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
868
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
885
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
869
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
886
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
870
-        taRecommendCustomer.setPersonId(personId);
871
-        taRecommendCustomer.setRecommendPerson(recommendPerson == null ? "" : recommendPerson.getRecommendPerson());
887
+        taRecommendCustomer.setPersonId(taPerson.getPersonId());
888
+        taRecommendCustomer.setRecommendPerson(taPerson.getRecommendPerson());
872
 
889
 
873
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
890
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
874
         if (row < 1) {
891
         if (row < 1) {
875
             return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
892
             return ResponseBean.error("分配客户失败", ResponseBean.ERROR_UNAVAILABLE);
876
         }
893
         }
877
-
878
         return ResponseBean.success(taRecommendCustomer);
894
         return ResponseBean.success(taRecommendCustomer);
879
-
880
     }
895
     }
881
 
896
 
882
     private List<TaRecommendCustomer> getCustomerByPhone(String phone, Integer orgId) {
897
     private List<TaRecommendCustomer> getCustomerByPhone(String phone, Integer orgId) {

+ 1
- 0
src/main/resources/mapper/TaRecommendCustomerMapper.xml Dosyayı Görüntüle

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