浏览代码

customer &records

胡轶钦 5 年前
父节点
当前提交
c27cd2c42b

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaCheckinController.java 查看文件

78
      * @param activity 实体对象
78
      * @param activity 实体对象
79
      * @return
79
      * @return
80
      */
80
      */
81
-    @RequestMapping(value="/taCheckin/activity/{activity}",method= RequestMethod.POST)
81
+    @RequestMapping(value="/wx/taCheckin/activity/{activity}",method= RequestMethod.POST)
82
     public ResponseBean taCheckinAdd(@RequestBody String activity, HttpServletRequest request){
82
     public ResponseBean taCheckinAdd(@RequestBody String activity, HttpServletRequest request){
83
         ResponseBean responseBean = new ResponseBean();
83
         ResponseBean responseBean = new ResponseBean();
84
         String openid = JWTUtils.getSubject(request);
84
         String openid = JWTUtils.getSubject(request);

+ 25
- 3
src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java 查看文件

5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.BaseController;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.JWTUtils;
9
+import com.huiju.estateagents.entity.TaPerson;
8
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
10
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
11
+import com.huiju.estateagents.service.ITaPersonService;
9
 import com.huiju.estateagents.service.ITaPersonVisitRecordService;
12
 import com.huiju.estateagents.service.ITaPersonVisitRecordService;
10
 import org.slf4j.Logger;
13
 import org.slf4j.Logger;
11
 import org.slf4j.LoggerFactory;
14
 import org.slf4j.LoggerFactory;
12
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.beans.factory.annotation.Autowired;
13
 import org.springframework.web.bind.annotation.*;
16
 import org.springframework.web.bind.annotation.*;
14
 
17
 
18
+import javax.servlet.http.HttpServletRequest;
19
+import java.time.LocalDateTime;
20
+import java.time.ZoneOffset;
21
+import java.util.List;
22
+
15
 
23
 
16
 /**
24
 /**
17
  * <p>
25
  * <p>
29
 
37
 
30
     @Autowired
38
     @Autowired
31
     public ITaPersonVisitRecordService iTaPersonVisitRecordService;
39
     public ITaPersonVisitRecordService iTaPersonVisitRecordService;
40
+    @Autowired
41
+    public ITaPersonService taPersonService;
32
 
42
 
33
 
43
 
34
     /**
44
     /**
61
      * @param taPersonVisitRecord 实体对象
71
      * @param taPersonVisitRecord 实体对象
62
      * @return
72
      * @return
63
      */
73
      */
64
-    @RequestMapping(value="/taPersonVisitRecord",method= RequestMethod.POST)
65
-    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord){
74
+    @RequestMapping(value="/wx/taPersonVisitRecord",method= RequestMethod.POST)
75
+    public ResponseBean taPersonVisitRecordAdd(@RequestBody TaPersonVisitRecord taPersonVisitRecord, HttpServletRequest request){
66
         ResponseBean responseBean = new ResponseBean();
76
         ResponseBean responseBean = new ResponseBean();
77
+        String openid = JWTUtils.getSubject(request);
78
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
79
+        if (null == taPersons || taPersons.size() != 1) {
80
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
81
+        }
82
+        TaPerson person = taPersons.get(0);
83
+        taPersonVisitRecord.setPersonId(person.getPersonId());
84
+        taPersonVisitRecord.setVisitTime(LocalDateTime.now());
67
         try {
85
         try {
68
             if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
86
             if (iTaPersonVisitRecordService.save(taPersonVisitRecord)){
69
                 responseBean.success(taPersonVisitRecord);
87
                 responseBean.success(taPersonVisitRecord);
104
      * @param taPersonVisitRecord 实体对象
122
      * @param taPersonVisitRecord 实体对象
105
      * @return
123
      * @return
106
      */
124
      */
107
-    @RequestMapping(value="/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
125
+    @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
108
     public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id,
126
     public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id,
109
                                         @RequestBody TaPersonVisitRecord taPersonVisitRecord){
127
                                         @RequestBody TaPersonVisitRecord taPersonVisitRecord){
110
         ResponseBean responseBean = new ResponseBean();
128
         ResponseBean responseBean = new ResponseBean();
129
+        taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
130
+        taPersonVisitRecord.setRecordId(id);
131
+        Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
132
+        taPersonVisitRecord.setVisitDuration(duation.intValue());
111
         try {
133
         try {
112
             if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)){
134
             if (iTaPersonVisitRecordService.updateById(taPersonVisitRecord)){
113
                 responseBean.success(taPersonVisitRecord);
135
                 responseBean.success(taPersonVisitRecord);

+ 120
- 0
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java 查看文件

3
 
3
 
4
 import com.huiju.estateagents.base.ResponseBean;
4
 import com.huiju.estateagents.base.ResponseBean;
5
 import com.huiju.estateagents.common.JWTUtils;
5
 import com.huiju.estateagents.common.JWTUtils;
6
+import com.huiju.estateagents.entity.TaPerson;
7
+import com.huiju.estateagents.entity.TaRecommendCustomer;
8
+import com.huiju.estateagents.service.ITaPersonService;
6
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
9
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
7
 import org.springframework.beans.factory.annotation.Autowired;
10
 import org.springframework.beans.factory.annotation.Autowired;
8
 import org.springframework.web.bind.annotation.*;
11
 import org.springframework.web.bind.annotation.*;
10
 import com.huiju.estateagents.base.BaseController;
13
 import com.huiju.estateagents.base.BaseController;
11
 
14
 
12
 import javax.servlet.http.HttpServletRequest;
15
 import javax.servlet.http.HttpServletRequest;
16
+import java.util.List;
13
 
17
 
14
 /**
18
 /**
15
  * <p>
19
  * <p>
25
 
29
 
26
     @Autowired
30
     @Autowired
27
     ITaRecommendCustomerService taRecommendCustomerService;
31
     ITaRecommendCustomerService taRecommendCustomerService;
32
+    @Autowired
33
+    ITaPersonService taPersonService;
28
 
34
 
29
     /**
35
     /**
30
      * 我的客户列表
36
      * 我的客户列表
79
         String openid = JWTUtils.getSubject(request);
85
         String openid = JWTUtils.getSubject(request);
80
         return taRecommendCustomerService.recommendCust(paramStr, openid);
86
         return taRecommendCustomerService.recommendCust(paramStr, openid);
81
     }
87
     }
88
+
89
+    @PostMapping("/wx/customer/recommend")
90
+    public ResponseBean getUnSignedCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize,HttpServletRequest request){
91
+        ResponseBean responseBean = new ResponseBean();
92
+        String openid = JWTUtils.getSubject(request);
93
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
94
+        if (null == taPersons || taPersons.size() != 1) {
95
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
96
+        }
97
+        TaPerson person = taPersons.get(0);
98
+        String buildingId = "";
99
+        try{
100
+            responseBean.success(taRecommendCustomerService.getUnSignedCustomerList(pageNumber,pageSize,buildingId,person.getPersonId()));
101
+        }catch (Exception e){
102
+            e.printStackTrace();
103
+            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
104
+        }
105
+        return responseBean;
106
+    }
107
+
108
+    @PostMapping("/customer/recommend")
109
+    public ResponseBean getCustomerList (@RequestParam int pageNumber, @RequestParam int pageSize){
110
+        ResponseBean responseBean = new ResponseBean();
111
+        try{
112
+            String buildingId="";
113
+            responseBean.success(taRecommendCustomerService.getCustomerList(pageNumber,pageSize,buildingId));
114
+        }catch (Exception e){
115
+            e.printStackTrace();
116
+            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
117
+        }
118
+        return responseBean;
119
+    }
120
+
121
+    @PostMapping("/customer/recommend/{customerId}")
122
+    public ResponseBean getCustomersIRecommended (@RequestParam int pageNumber, @RequestParam int pageSize,String customerId){
123
+        ResponseBean responseBean = new ResponseBean();
124
+        String buildingId="";
125
+        try{
126
+            responseBean.success(taRecommendCustomerService.getCustomersIRecommended(pageNumber,pageSize,customerId,buildingId));
127
+        }catch (Exception e){
128
+            e.printStackTrace();
129
+            responseBean.error(e.getMessage(),ResponseBean.ERROR_UNAVAILABLE);
130
+        }
131
+        return responseBean;
132
+    }
133
+
134
+        /**
135
+     * 修改对象
136
+     * @param taRecommendCustomer 实体对象
137
+     * @return
138
+     */
139
+    @RequestMapping(value="/wx/customer/recommend/edit/{id}",method= RequestMethod.PUT)
140
+    public ResponseBean taRecommendCustomerUpdateWx(@PathVariable String id,
141
+                                        @RequestBody TaRecommendCustomer taRecommendCustomer){
142
+        ResponseBean responseBean = new ResponseBean();
143
+        taRecommendCustomer.setCustomerId(id);
144
+        try {
145
+            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
146
+                responseBean.addSuccess(taRecommendCustomer);
147
+            }else {
148
+                responseBean.addError("fail");
149
+            }
150
+        }catch (Exception e){
151
+            e.printStackTrace();
152
+            responseBean.addError(e.getMessage());
153
+        }
154
+        return responseBean;
155
+    }
156
+    /**
157
+     * 修改对象
158
+     * @param taRecommendCustomer 实体对象
159
+     * @return
160
+     */
161
+    @RequestMapping(value="/customer/recommend/edit/{id}",method= RequestMethod.PUT)
162
+    public ResponseBean taRecommendCustomerUpdate(@PathVariable String id,
163
+            @RequestBody TaRecommendCustomer taRecommendCustomer){
164
+        ResponseBean responseBean = new ResponseBean();
165
+        taRecommendCustomer.setCustomerId(id);
166
+        try {
167
+            if (taRecommendCustomerService.updateById(taRecommendCustomer)){
168
+                responseBean.addSuccess(taRecommendCustomer);
169
+            }else {
170
+                responseBean.addError("fail");
171
+            }
172
+        }catch (Exception e){
173
+            e.printStackTrace();
174
+            responseBean.addError(e.getMessage());
175
+        }
176
+        return responseBean;
177
+    }
178
+
179
+    @RequestMapping(value = "/wx/customer/recommend/get/{id}")
180
+    public ResponseBean getSingleCustomer(String customerId) {
181
+        ResponseBean responseBean = new ResponseBean();
182
+        try {
183
+            responseBean.addSuccess(taRecommendCustomerService.getById(customerId));
184
+        }catch (Exception e){
185
+            e.printStackTrace();
186
+            responseBean.addError(e.getMessage());
187
+        }
188
+        return responseBean;
189
+    }
190
+
191
+    @RequestMapping(value = "/customer/recommend/get/{id}")
192
+    public ResponseBean getCutomerDetail(String id) {
193
+        ResponseBean responseBean = new ResponseBean();
194
+        try {
195
+            responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
196
+        }catch (Exception e){
197
+            e.printStackTrace();
198
+            responseBean.addError(e.getMessage());
199
+        }
200
+        return responseBean;
201
+    }
82
 }
202
 }

+ 12
- 0
src/main/java/com/huiju/estateagents/entity/TaBuilding.java 查看文件

144
      */
144
      */
145
     private String poster;
145
     private String poster;
146
 
146
 
147
+    private String buildingTransport;
148
+
149
+    private String buildingMall;
150
+
151
+    private String buildingEdu;
152
+
153
+    private String buildingHospital;
154
+
155
+    private String buildingBank;
156
+
157
+    private String buildingRestaurant;
158
+
147
 
159
 
148
     /**
160
     /**
149
      * 图片
161
      * 图片

+ 6
- 0
src/main/java/com/huiju/estateagents/entity/TaBuildingApartment.java 查看文件

71
 
71
 
72
     private String buildingArea;
72
     private String buildingArea;
73
 
73
 
74
+    private String apartmentPrice;
75
+
76
+    private String apartmentDescription;
77
+
78
+    private String apartmentImg;
79
+
74
 
80
 
75
     /**
81
     /**
76
      * 户型图片列表
82
      * 户型图片列表

+ 17
- 0
src/main/java/com/huiju/estateagents/entity/TaPerson.java 查看文件

204
     @TableField(exist = false)
204
     @TableField(exist = false)
205
     private LocalDateTime visitTime;
205
     private LocalDateTime visitTime;
206
 
206
 
207
+    private String personTags;
208
+
209
+    private String personDescription;
210
+
211
+    private String gender;
212
+
213
+    private String unionId;
214
+
215
+    private String country;
216
+
217
+    private String province;
218
+
219
+    private String city;
220
+
221
+    private String language;
222
+
223
+
207
 }
224
 }

+ 27
- 1
src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java 查看文件

2
 
2
 
3
 import java.time.LocalDateTime;
3
 import java.time.LocalDateTime;
4
 import java.io.Serializable;
4
 import java.io.Serializable;
5
+import java.util.List;
5
 import java.util.Map;
6
 import java.util.Map;
6
 
7
 
7
 import com.baomidou.mybatisplus.annotation.IdType;
8
 import com.baomidou.mybatisplus.annotation.IdType;
120
      * 服务顾问
121
      * 服务顾问
121
      */
122
      */
122
     @TableField(exist = false)
123
     @TableField(exist = false)
123
-    private Map<String, Object> consultant;
124
+    private Map<String, Object> consultants;
125
+
126
+    private String verifyStatus;
127
+
128
+    private String verifyRemark;
129
+
130
+    private String country;
131
+
132
+    private String province;
133
+
134
+    private String city;
135
+
136
+    @TableField(exist = false)
137
+    private List<TaPersonVisitRecord> visitRecords;
138
+
139
+    @TableField(exist = false)
140
+    private List<String> projects;
141
+
142
+    @TableField(exist = false)
143
+    private Integer duration;
144
+
145
+    @TableField(exist = false)
146
+    private LocalDateTime visitTime;
147
+
148
+    @TableField(exist = false)
149
+    private TaPerson consultant;
124
 }
150
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java 查看文件

33
     IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
33
     IPage<TaPerson> selectCustomer(IPage<TaPerson> page);
34
 
34
 
35
     TaPerson getById(@Param("personId") String personId);
35
     TaPerson getById(@Param("personId") String personId);
36
+
37
+    List<String>getUserProjects(@Param("personId") String personId);
36
 }
38
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java 查看文件

20
  */
20
  */
21
 @Mapper
21
 @Mapper
22
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
22
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
23
-//    List<TaPersonVisitRecord>visitRecordByPersonId(@Param("personId") String personId);
23
+    List<TaPersonVisitRecord>visitRecordByPersonId(@Param("personId") String personId);
24
 
24
 
25
 
25
 
26
 }
26
 }

+ 6
- 0
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java 查看文件

17
 public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustomer> {
17
 public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustomer> {
18
 
18
 
19
     Integer getMyCutsomerNum(@Param("personId") String personId);
19
     Integer getMyCutsomerNum(@Param("personId") String personId);
20
+
21
+    String getCustomerPersonId(@Param("customerId")String customerId);
22
+
23
+    TaRecommendCustomer getCustomerDetail(@Param("customerId")String customerId);
24
+
25
+
20
 }
26
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/service/ITaPersonService.java 查看文件

51
     Map<String,Object> getExtraInfo(String personId);
51
     Map<String,Object> getExtraInfo(String personId);
52
 
52
 
53
     List<TaPerson> getPersonsByOpenId(String openid);
53
     List<TaPerson> getPersonsByOpenId(String openid);
54
+
55
+    IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building);
54
 }
56
 }

+ 11
- 0
src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java 查看文件

1
 package com.huiju.estateagents.service;
1
 package com.huiju.estateagents.service;
2
 
2
 
3
+import com.baomidou.mybatisplus.core.metadata.IPage;
3
 import com.huiju.estateagents.base.ResponseBean;
4
 import com.huiju.estateagents.base.ResponseBean;
4
 import com.huiju.estateagents.entity.TaRecommendCustomer;
5
 import com.huiju.estateagents.entity.TaRecommendCustomer;
5
 import com.baomidou.mybatisplus.extension.service.IService;
6
 import com.baomidou.mybatisplus.extension.service.IService;
21
     ResponseBean updateCustByJSON(String paramStr);
22
     ResponseBean updateCustByJSON(String paramStr);
22
 
23
 
23
     ResponseBean recommendCust(String paramStr, String openid);
24
     ResponseBean recommendCust(String paramStr, String openid);
25
+
26
+    IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
27
+
28
+    IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize, String building);
29
+
30
+    TaRecommendCustomer getCustomerDetail(String customerId);
31
+
32
+    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building);
33
+
34
+
24
 }
35
 }

+ 9
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java 查看文件

554
         queryWrapper.eq("person_id", personId);
554
         queryWrapper.eq("person_id", personId);
555
         return taPersonBuildingMapper.selectList(queryWrapper);
555
         return taPersonBuildingMapper.selectList(queryWrapper);
556
     }
556
     }
557
+
558
+    @Override
559
+    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building){
560
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
561
+        queryWrapper.isNull("person_type");
562
+        queryWrapper.eq("building_id",building);
563
+        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
564
+        return taPersonMapper.selectPage(page,queryWrapper);
565
+    }
557
 }
566
 }

+ 54
- 1
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java 查看文件

1
 package com.huiju.estateagents.service.impl;
1
 package com.huiju.estateagents.service.impl;
2
 
2
 
3
+import ch.qos.logback.core.status.StatusUtil;
3
 import com.alibaba.fastjson.JSONObject;
4
 import com.alibaba.fastjson.JSONObject;
4
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
6
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
12
 import com.huiju.estateagents.entity.TaPerson;
13
 import com.huiju.estateagents.entity.TaPerson;
13
 import com.huiju.estateagents.entity.TaRecommendCustomer;
14
 import com.huiju.estateagents.entity.TaRecommendCustomer;
14
 import com.huiju.estateagents.mapper.TaPersonMapper;
15
 import com.huiju.estateagents.mapper.TaPersonMapper;
16
+import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
15
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
17
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
16
 import com.huiju.estateagents.service.IMiniAppService;
18
 import com.huiju.estateagents.service.IMiniAppService;
17
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
19
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
45
     @Autowired
47
     @Autowired
46
     IMiniAppService iMiniAppService;
48
     IMiniAppService iMiniAppService;
47
 
49
 
50
+    @Autowired
51
+    TaPersonVisitRecordMapper taPersonVisitRecordMapper;
52
+
48
     @Override
53
     @Override
49
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
54
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
50
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
55
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
74
         if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
79
         if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
75
             TaPerson taPerson = taPersonMapper.selectById(taRecommendCustomer.getRealtyConsultant());
80
             TaPerson taPerson = taPersonMapper.selectById(taRecommendCustomer.getRealtyConsultant());
76
             if (null != taPerson) {
81
             if (null != taPerson) {
77
-                taRecommendCustomer.setConsultant(new HashMap<String, Object>() {{
82
+                taRecommendCustomer.setConsultants(new HashMap<String, Object>() {{
78
                     put("name", taPerson.getName());
83
                     put("name", taPerson.getName());
79
                     put("phone", taPerson.getTel());
84
                     put("phone", taPerson.getTel());
80
                     put("photo", taPerson.getPhoto());
85
                     put("photo", taPerson.getPhoto());
224
     }
229
     }
225
 
230
 
226
 
231
 
232
+
233
+
227
     List<TaPerson> getPersonsByOpenId(String openid) {
234
     List<TaPerson> getPersonsByOpenId(String openid) {
228
         return taPersonMapper.getPersonByOpenId(openid);
235
         return taPersonMapper.getPersonByOpenId(openid);
229
     }
236
     }
237
+
238
+    @Override
239
+    public IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize,String building,String personId){
240
+        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
241
+//        queryWrapper.eq("building_id",building);
242
+        queryWrapper.eq("realty_consultant",personId);
243
+        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
244
+        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
245
+        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
246
+    }
247
+
248
+    @Override
249
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building){
250
+        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
251
+//        queryWrapper.eq("building_id",building);
252
+        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
253
+        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
254
+        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
255
+    }
256
+
257
+    @Override
258
+    public TaRecommendCustomer getCustomerDetail(String customerId){
259
+        String personId = taRecommendCustomerMapper.getCustomerPersonId(customerId);
260
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId);
261
+        if(!personId.equals("")&& null != personId){
262
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
263
+        }
264
+        if(!taRecommendCustomer.getRealtyConsultant().equals("")&&null != taRecommendCustomer.getRealtyConsultant()){
265
+            TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
266
+            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getPersonId()));
267
+            taRecommendCustomer.setConsultant(consultant);
268
+        }
269
+        return taRecommendCustomer;
270
+    }
271
+
272
+    @Override
273
+    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building){
274
+        String personId = taRecommendCustomerMapper.getCustomerPersonId(customerId);
275
+        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
276
+        queryWrapper.eq("person_id",personId);
277
+//        queryWrapper.eq("building_id",building);
278
+        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
279
+        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
280
+        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
281
+
282
+    }
230
 }
283
 }

+ 8
- 0
src/main/resources/mapper/TaPersonMapper.xml 查看文件

91
 WHERE
91
 WHERE
92
 	a.person_id = #{personId}
92
 	a.person_id = #{personId}
93
     </select>
93
     </select>
94
+    <select id="getUserProjects" resultType="java.lang.String">
95
+        SELECT
96
+	b.building_name
97
+FROM
98
+	ta_person_building a
99
+	LEFT JOIN ta_building b ON a.building_id = b.building_id
100
+	WHERE a.person_id = #{personId}
101
+    </select>
94
 </mapper>
102
 </mapper>

+ 20
- 0
src/main/resources/mapper/TaRecommendCustomerMapper.xml 查看文件

9
         WHERE
9
         WHERE
10
             t.person_id = #{personId}
10
             t.person_id = #{personId}
11
     </select>
11
     </select>
12
+    <select id="getCustomerPersonId" resultType="java.lang.String">
13
+        SELECT
14
+	person_id
15
+FROM
16
+	ta_customer_person
17
+WHERE
18
+	customer_id = #{customerId}
19
+    </select>
20
+
21
+    <select id="getCustomerDetail" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
22
+        SELECT
23
+	a.*,
24
+	(select c.visit_time FROM ta_person_visit_record c where b.person_id = c.person_id ORDER BY c.visit_time desc LIMIT 1) as visitTime,
25
+	(SELECT SUM(d.visit_duration) FROM ta_person_visit_record d WHERE b.person_id = d.person_id) as duration
26
+FROM
27
+	ta_recommend_customer a
28
+	LEFT JOIN ta_customer_person b on a.customer_id = b.customer_id
29
+	LEFT JOIN ta_person_visit_record c ON b.person_id = c.person_id
30
+	where a.customer_id = #{customerId}
31
+    </select>
12
 </mapper>
32
 </mapper>