Преглед изворни кода

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

魏熙美 пре 5 година
родитељ
комит
52e584e403
23 измењених фајлова са 423 додато и 27 уклоњено
  1. 6
    3
      src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java
  2. 25
    3
      src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java
  3. 120
    0
      src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java
  4. 7
    3
      src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java
  5. 12
    0
      src/main/java/com/huiju/estateagents/entity/TaBuilding.java
  6. 3
    0
      src/main/java/com/huiju/estateagents/entity/TaBuildingApartment.java
  7. 23
    0
      src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java
  8. 17
    0
      src/main/java/com/huiju/estateagents/entity/TaPerson.java
  9. 27
    1
      src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java
  10. 2
    0
      src/main/java/com/huiju/estateagents/mapper/TaBuildingDynamicMapper.java
  11. 6
    0
      src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java
  12. 1
    1
      src/main/java/com/huiju/estateagents/mapper/TaPersonVisitRecordMapper.java
  13. 6
    0
      src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java
  14. 2
    2
      src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java
  15. 2
    0
      src/main/java/com/huiju/estateagents/service/ITaPersonService.java
  16. 11
    0
      src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java
  17. 36
    4
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java
  18. 10
    0
      src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java
  19. 54
    1
      src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java
  20. 13
    9
      src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java
  21. 6
    0
      src/main/resources/mapper/TaBuildingDynamicMapper.xml
  22. 14
    0
      src/main/resources/mapper/TaPersonMapper.xml
  23. 20
    0
      src/main/resources/mapper/TaRecommendCustomerMapper.xml

+ 6
- 3
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Прегледај датотеку

73
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
73
                                                @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
74
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
74
                                                @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
75
                                                HttpServletRequest request){
75
                                                HttpServletRequest request){
76
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId);
76
+        String openid = JWTUtils.getSubject(request);
77
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
77
         return responseBean;
78
         return responseBean;
78
     }
79
     }
79
 
80
 
85
      */
86
      */
86
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
87
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
87
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
88
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
88
-                                             @RequestParam("buildingId")Integer buildingId){
89
-        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId);
89
+                                             @RequestParam("buildingId")Integer buildingId,
90
+                                             HttpServletRequest request){
91
+        String openid = JWTUtils.getSubject(request);
92
+        ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
90
         return responseBean;
93
         return responseBean;
91
     }
94
     }
92
 
95
 

+ 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
 }

+ 7
- 3
src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java Прегледај датотеку

27
     /**
27
     /**
28
      * 报名ID
28
      * 报名ID
29
      */
29
      */
30
-    @TableId(value = "favor_id", type = IdType.AUTO)
30
+    @TableId(value = "enlist_id", type = IdType.AUTO)
31
     private Integer enlist_id;
31
     private Integer enlist_id;
32
 
32
 
33
     /**
33
     /**
34
      * 活动ID
34
      * 活动ID
35
      */
35
      */
36
-    private String dynamic_id;
36
+    private String dynamicId;
37
 
37
 
38
     /**
38
     /**
39
      * 姓名
39
      * 姓名
43
     /**
43
     /**
44
      * 楼盘id
44
      * 楼盘id
45
      */
45
      */
46
-    private String building_id;
46
+    private String buildingId;
47
 
47
 
48
     /**
48
     /**
49
      * 创建时间
49
      * 创建时间
55
      */
55
      */
56
     private String phone;
56
     private String phone;
57
 
57
 
58
+    /**
59
+     * favor_num
60
+     */
61
+
58
 
62
 
59
 }
63
 }

+ 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
      * 图片

+ 3
- 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;
74
 
77
 
75
     /**
78
     /**
76
      * 户型图片列表
79
      * 户型图片列表

+ 23
- 0
src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java Прегледај датотеку

118
     @TableField(exist = false)
118
     @TableField(exist = false)
119
     private  int count;
119
     private  int count;
120
 
120
 
121
+    /**
122
+     * 是否报名1为已报名,0为未报名
123
+     */
124
+    @TableField(exist = false)
125
+    private String isSing;
121
 
126
 
127
+    /**
128
+     * 分享活动
129
+     */
130
+    private int shareNum;
122
 
131
 
132
+    /**
133
+     * 阅读量
134
+     */
135
+    private  int pvNum;
136
+
137
+    /**
138
+     * 收藏量
139
+     */
140
+    private  int saveNum;
141
+
142
+    /**
143
+     * 点赞
144
+     */
145
+    private  int favorNum;
123
 }
146
 }

+ 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/TaBuildingDynamicMapper.java Прегледај датотеку

53
      */
53
      */
54
     @Update("UPDATE ta_building_dynamic  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE dynamic_id = #{newsId}")
54
     @Update("UPDATE ta_building_dynamic  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE dynamic_id = #{newsId}")
55
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
55
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
56
+
57
+    void updateTaBuildingDynamic(@Param("dynamicId") String dynamicId, @Param("sum") String sum);
56
 }
58
 }

+ 6
- 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
+
38
+    List<String>getUserProjects(@Param("personId") String personId);
39
+
40
+    TaPerson selectByIdPerson(@Param("openid") String openid);
41
+
36
 }
42
 }

+ 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
- 2
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Прегледај датотеку

34
      * 微信小程序 项目动态管理列表
34
      * 微信小程序 项目动态管理列表
35
      * @return
35
      * @return
36
      */
36
      */
37
-    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId);
37
+    ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid);
38
 
38
 
39
     /**
39
     /**
40
      * 微信小程序 项目详情
40
      * 微信小程序 项目详情
41
      * @param dynamicId
41
      * @param dynamicId
42
      * @return
42
      * @return
43
      */
43
      */
44
-    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId);
44
+    ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid);
45
 
45
 
46
     /**
46
     /**
47
      * 动态管理添加
47
      * 动态管理添加

+ 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
 }

+ 36
- 4
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Прегледај датотеку

10
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
10
 import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
11
 import com.huiju.estateagents.entity.TaBuilding;
11
 import com.huiju.estateagents.entity.TaBuilding;
12
 import com.huiju.estateagents.entity.TaBuildingDynamic;
12
 import com.huiju.estateagents.entity.TaBuildingDynamic;
13
+import com.huiju.estateagents.entity.TaPerson;
13
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
14
 import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
14
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
15
 import com.huiju.estateagents.mapper.TaBuildingDynamicMapper;
15
 import com.huiju.estateagents.mapper.TaBuildingMapper;
16
 import com.huiju.estateagents.mapper.TaBuildingMapper;
17
+import com.huiju.estateagents.mapper.TaPersonMapper;
16
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
18
 import com.huiju.estateagents.service.ITaBuildingDynamicService;
17
 import org.springframework.beans.factory.annotation.Autowired;
19
 import org.springframework.beans.factory.annotation.Autowired;
18
 import org.springframework.beans.propertyeditors.CustomDateEditor;
20
 import org.springframework.beans.propertyeditors.CustomDateEditor;
51
     @Autowired
53
     @Autowired
52
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
54
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
53
 
55
 
56
+    @Autowired
57
+    private TaPersonMapper taPersonMapper;
58
+
54
 
59
 
55
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
60
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
56
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
61
         DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
81
     }
86
     }
82
 
87
 
83
     @Override
88
     @Override
84
-    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId) {
89
+    public ResponseBean getWxBuildingDynamiceList(Integer pageNum, Integer pageSize,Integer buildingId,String openid) {
85
         Page<TaBuildingDynamic> page = new Page<>();
90
         Page<TaBuildingDynamic> page = new Page<>();
86
         page.setCurrent(pageNum);
91
         page.setCurrent(pageNum);
87
         page.setSize(pageSize);
92
         page.setSize(pageSize);
93
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
98
         List<TaBuildingDynamic> records = buildingDynamicIPage.getRecords();
94
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间),2:未开始(展示活动报名时间),3:结束(不展示)
99
         // 判断换当前列表活动状态—1:进行中(展示活动报名截止时间),2:未开始(展示活动报名时间),3:结束(不展示)
95
         for (TaBuildingDynamic taBuildingDynamic:records){
100
         for (TaBuildingDynamic taBuildingDynamic:records){
101
+            QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
102
+            TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
103
+            if (null == taPerson){
104
+                return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
105
+            }
106
+            activityDynamicEnlist.eq("phone", taPerson.getPhone());
107
+            TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
108
+            if (null == taActivityDynamicEnlistPhone){
109
+                taBuildingDynamic.setIsSing("1");
110
+            }
96
             // 获取当前时间状态
111
             // 获取当前时间状态
97
             taBuildingDynamic= timeCondition(taBuildingDynamic);
112
             taBuildingDynamic= timeCondition(taBuildingDynamic);
98
         }
113
         }
105
     }
120
     }
106
 
121
 
107
     @Override
122
     @Override
108
-    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId) {
123
+    public ResponseBean getWxBuildingDynamiceInfo(String dynamicId,Integer buildingId,String openid) {
124
+
109
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
125
         QueryWrapper<TaBuildingDynamic> buildingDynamicQueryWrapper = new QueryWrapper<>();
110
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
126
         buildingDynamicQueryWrapper.eq("dynamic_id", dynamicId);
111
         buildingDynamicQueryWrapper.eq("status",1);
127
         buildingDynamicQueryWrapper.eq("status",1);
128
+        TaBuildingDynamic tabuildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
129
+        // 当前阅读量加1
130
+
131
+        buildingDynamicMapper.updateById( tabuildingDynamic.setSaveNum(tabuildingDynamic.getSaveNum()+1));
112
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
132
         TaBuildingDynamic buildingDynamic = buildingDynamicMapper.selectOne(buildingDynamicQueryWrapper);
133
+        TaPerson taPerson = taPersonMapper.selectByIdPerson(openid);
134
+        if (null == taPerson){
135
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
136
+        }
137
+        // 查询是否报名
138
+        QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlist = new QueryWrapper<>();
139
+        activityDynamicEnlist.eq("phone", taPerson.getPhone());
140
+        TaActivityDynamicEnlist taActivityDynamicEnlistPhone= taActivityDynamicEnlistMapper.selectOne(activityDynamicEnlist);
141
+        if (null == taActivityDynamicEnlistPhone){
142
+            buildingDynamic.setIsSing("1");
143
+        }
113
         // 获取报名总数
144
         // 获取报名总数
114
         QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
145
         QueryWrapper<TaActivityDynamicEnlist> taActivityDynamicEnlist = new QueryWrapper<>();
115
         taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
146
         taActivityDynamicEnlist.eq("dynamic_id", dynamicId);
118
         buildingDynamic.setCount(applyCount);
149
         buildingDynamic.setCount(applyCount);
119
         // 获取当前时间状态
150
         // 获取当前时间状态
120
         buildingDynamic = timeCondition(buildingDynamic);
151
         buildingDynamic = timeCondition(buildingDynamic);
152
+
121
         return ResponseBean.success(buildingDynamic);
153
         return ResponseBean.success(buildingDynamic);
122
     }
154
     }
123
 
155
 
180
     @Override
212
     @Override
181
     public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
213
     public ResponseBean taActivityDynamicEnlistAdd(TaActivityDynamicEnlist taActivityDynamicEnlist) {
182
         // 查询当前活动属于哪个楼盘
214
         // 查询当前活动属于哪个楼盘
183
-        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamic_id());
215
+        TaBuildingDynamic taBuildingDynamic= buildingDynamicMapper.iBuildingDynamicSelectId(taActivityDynamicEnlist.getDynamicId());
184
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
216
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
185
-                               .setBuilding_id(taBuildingDynamic.getDynamicId());
217
+                               .setBuildingId(taBuildingDynamic.getDynamicId());
186
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
218
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
187
         return ResponseBean.success(state);
219
         return ResponseBean.success(state);
188
     }
220
     }

+ 10
- 0
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java Прегледај датотеку

243
         result.put("unReadNum", 0);
243
         result.put("unReadNum", 0);
244
         result.put("projects", buildings);
244
         result.put("projects", buildings);
245
         result.put("address", person.getAddress());
245
         result.put("address", person.getAddress());
246
+        result.put("personTags",person.getPersonTags());
246
 
247
 
247
         // 当前人员
248
         // 当前人员
248
         List<TaPerson> taPersonList = getPersonsByOpenId(openid);
249
         List<TaPerson> taPersonList = getPersonsByOpenId(openid);
605
         queryWrapper.eq("person_id", personId);
606
         queryWrapper.eq("person_id", personId);
606
         return taPersonBuildingMapper.selectList(queryWrapper);
607
         return taPersonBuildingMapper.selectList(queryWrapper);
607
     }
608
     }
609
+
610
+    @Override
611
+    public IPage<TaPerson> getDriftCustomerList (int pageNumber, int pageSize,String building){
612
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
613
+        queryWrapper.isNull("person_type");
614
+        queryWrapper.eq("building_id",building);
615
+        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
616
+        return taPersonMapper.selectPage(page,queryWrapper);
617
+    }
608
 }
618
 }

+ 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
 }

+ 13
- 9
src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java Прегледај датотеку

9
 import com.huiju.estateagents.base.ResponseBean;
9
 import com.huiju.estateagents.base.ResponseBean;
10
 import com.huiju.estateagents.common.CommConstant;
10
 import com.huiju.estateagents.common.CommConstant;
11
 import com.huiju.estateagents.common.StringUtils;
11
 import com.huiju.estateagents.common.StringUtils;
12
-import com.huiju.estateagents.entity.TaPerson;
13
-import com.huiju.estateagents.entity.TaPointsRecords;
14
-import com.huiju.estateagents.entity.TaShare;
15
-import com.huiju.estateagents.entity.TdPointsRules;
16
-import com.huiju.estateagents.mapper.TaPersonMapper;
17
-import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
18
-import com.huiju.estateagents.mapper.TaShareMapper;
19
-import com.huiju.estateagents.mapper.TdPointsRulesMapper;
12
+import com.huiju.estateagents.entity.*;
13
+import com.huiju.estateagents.mapper.*;
20
 import com.huiju.estateagents.service.ITaShareService;
14
 import com.huiju.estateagents.service.ITaShareService;
21
 import org.springframework.beans.factory.annotation.Autowired;
15
 import org.springframework.beans.factory.annotation.Autowired;
22
 import org.springframework.stereotype.Service;
16
 import org.springframework.stereotype.Service;
46
     @Autowired
40
     @Autowired
47
     private TaPointsRecordsMapper taPointsRecordsMapper;
41
     private TaPointsRecordsMapper taPointsRecordsMapper;
48
 
42
 
43
+    @Autowired
44
+    private TaBuildingDynamicMapper taBuildingDynamicMapper;
45
+
49
     @Override
46
     @Override
50
     public ResponseBean saveData(String openid, String typeOf, String id) {
47
     public ResponseBean saveData(String openid, String typeOf, String id) {
51
         List<TaPerson> persons = getPersonsByOpenId(openid);
48
         List<TaPerson> persons = getPersonsByOpenId(openid);
54
         }
51
         }
55
 
52
 
56
         TaPerson taPerson = persons.get(0);
53
         TaPerson taPerson = persons.get(0);
54
+        // 如果是分享活动, 则活动 + 1
55
+        if (typeOf.equals(CommConstant.FAVOR_ACTIVITY)) {
56
+            QueryWrapper<TaBuildingDynamic> taBuildingDynamicQuery= new QueryWrapper<>();
57
+            taBuildingDynamicQuery.eq("dynamic_id",id);
58
+            TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQuery);
59
+            taBuildingDynamicMapper.updateById( taBuildingDynamic.setShareNum(taBuildingDynamic.getShareNum()+1));
60
+            return ResponseBean.success("成功");
61
+        }
57
 
62
 
58
         QueryWrapper<TaShare> queryWrapper = new QueryWrapper<>();
63
         QueryWrapper<TaShare> queryWrapper = new QueryWrapper<>();
59
         queryWrapper.eq("person_id", taPerson.getPersonId());
64
         queryWrapper.eq("person_id", taPerson.getPersonId());
103
             wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
108
             wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
104
             taPersonMapper.update(new TaPerson(), wrapper);
109
             taPersonMapper.update(new TaPerson(), wrapper);
105
         }
110
         }
106
-
107
         return ResponseBean.success("");
111
         return ResponseBean.success("");
108
     }
112
     }
109
 
113
 

+ 6
- 0
src/main/resources/mapper/TaBuildingDynamicMapper.xml Прегледај датотеку

75
         </set>
75
         </set>
76
         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
76
         where dynamic_id = #{dynamicId,jdbcType=VARCHAR}
77
     </update>
77
     </update>
78
+    <select id="updateTaBuildingDynamic">
79
+        UPDATE ta_building_dynamic
80
+        SET  share_num = #{sum}
81
+        WHERE
82
+	      dynamic_id = #{dynamicId}
83
+    </select>
78
 
84
 
79
 </mapper>
85
 </mapper>

+ 14
- 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
+
95
+    <select id="getUserProjects" resultType="java.lang.String">
96
+        SELECT
97
+	b.building_name
98
+FROM
99
+	ta_person_building a
100
+	LEFT JOIN ta_building b ON a.building_id = b.building_id
101
+	WHERE a.person_id = #{personId}
102
+    </select>
103
+
104
+    <select id="selectByIdPerson" resultType="com.huiju.estateagents.entity.TaPerson">
105
+        select * from ta_person where mini_openid = #{openid};
106
+
107
+    </select>
94
 </mapper>
108
 </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>