Przeglądaj źródła

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

魏熙美 5 lat temu
rodzic
commit
f5c9f2fc15

+ 12
- 4
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Wyświetl plik

7
 import com.baomidou.mybatisplus.core.metadata.IPage;
7
 import com.baomidou.mybatisplus.core.metadata.IPage;
8
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
8
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9
 import com.huiju.estateagents.base.ResponseBean;
9
 import com.huiju.estateagents.base.ResponseBean;
10
+import com.huiju.estateagents.center.taUser.entity.TaUser;
11
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
10
 import com.huiju.estateagents.common.CommConstant;
12
 import com.huiju.estateagents.common.CommConstant;
11
 import com.huiju.estateagents.common.DateUtils;
13
 import com.huiju.estateagents.common.DateUtils;
12
 import com.huiju.estateagents.common.StringUtils;
14
 import com.huiju.estateagents.common.StringUtils;
53
     @Autowired
55
     @Autowired
54
     TaPersonVisitRecordMapper taPersonVisitRecordMapper;
56
     TaPersonVisitRecordMapper taPersonVisitRecordMapper;
55
 
57
 
58
+    @Autowired
59
+    ITaUserService userService;
60
+
56
     @Override
61
     @Override
57
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
62
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
58
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
63
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
82
         if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
87
         if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
83
             TaPerson taPerson = taPersonMapper.selectById(taRecommendCustomer.getRealtyConsultant());
88
             TaPerson taPerson = taPersonMapper.selectById(taRecommendCustomer.getRealtyConsultant());
84
             if (null != taPerson) {
89
             if (null != taPerson) {
90
+                TaUser user = userService.getById(taPerson.getUserId());
85
                 taRecommendCustomer.setConsultants(new HashMap<String, Object>() {{
91
                 taRecommendCustomer.setConsultants(new HashMap<String, Object>() {{
86
-                    put("name", taPerson.getName());
87
-                    put("phone", taPerson.getTel());
88
-                    put("photo", taPerson.getPhoto());
92
+                    put("name", user.getUserName());
93
+                    put("phone", user.getPhone());
94
+                    put("photo", user.getPhoto());
89
                 }});
95
                 }});
90
             }
96
             }
91
         }
97
         }
168
         taRecommendCustomer.setDescribe(params.getString("describe"));
174
         taRecommendCustomer.setDescribe(params.getString("describe"));
169
         taRecommendCustomer.setRecommendPerson(params.getString("recommendPerson"));
175
         taRecommendCustomer.setRecommendPerson(params.getString("recommendPerson"));
170
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
176
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
177
+        taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
171
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
178
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
179
+        taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_READY);
172
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
180
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
173
         taRecommendCustomer.setReportDate(LocalDateTime.now());
181
         taRecommendCustomer.setReportDate(LocalDateTime.now());
174
         taRecommendCustomer.setOrgId(orgId);
182
         taRecommendCustomer.setOrgId(orgId);
252
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
260
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
253
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
261
         taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
254
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
262
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
255
-        taRecommendCustomer.setReportRecommendStatus(CommConstant.READY);
263
+        taRecommendCustomer.setReportRecommendStatus(CommConstant.VERIFY_AGREE);
256
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
264
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
257
         taRecommendCustomer.setReportDate(LocalDateTime.now());
265
         taRecommendCustomer.setReportDate(LocalDateTime.now());
258
         taRecommendCustomer.setPersonId(taPerson.getPersonId());
266
         taRecommendCustomer.setPersonId(taPerson.getPersonId());