傅行帆 5 年之前
父節點
當前提交
efc74bd42b

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

196
      * @return
196
      * @return
197
      */
197
      */
198
     @PostMapping("/wx/customer/report")
198
     @PostMapping("/wx/customer/report")
199
-    public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
199
+    public ResponseBean reportCust(@RequestParam(value ="tips",required = false) Boolean tips, @RequestBody String paramStr, HttpServletRequest request) {
200
         String openid = getOpenId(request);
200
         String openid = getOpenId(request);
201
         Integer orgId = getOrgId(request);
201
         Integer orgId = getOrgId(request);
202
-        return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
202
+        return taRecommendCustomerService.reportCust(paramStr, openid,orgId,tips);
203
     }
203
     }
204
 
204
 
205
     @PostMapping("/wx/customer/recommend")
205
     @PostMapping("/wx/customer/recommend")

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

30
 
30
 
31
     ResponseBean recommendCust(String paramStr, String openid,Integer orgId);
31
     ResponseBean recommendCust(String paramStr, String openid,Integer orgId);
32
 
32
 
33
-    ResponseBean reportCust(String paramStr, String openid,Integer orgId);
33
+    ResponseBean reportCust(String paramStr, String openid,Integer orgId,Boolean tips);
34
 
34
 
35
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
35
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
36
 
36
 

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

774
             return ResponseBean.error("当前人员不存在",ResponseBean.ERROR_UNAVAILABLE);
774
             return ResponseBean.error("当前人员不存在",ResponseBean.ERROR_UNAVAILABLE);
775
         }
775
         }
776
         Map<String,Object> map = new HashMap<>();
776
         Map<String,Object> map = new HashMap<>();
777
-        map.put("name", StringUtils.isEmpty(person.getName()) ? person.getNickname() : person.getName());
778
-        map.put("avatar", StringUtils.isEmpty(person.getPhoto()) ? person.getAvatarurl() : person.getPhoto());
777
+        map.put("name", person.getName());
778
+        map.put("avatar", person.getPhoto());
779
+        map.put("wxname", person.getNickname());
780
+        map.put("wxavatar", person.getAvatarurl());
779
         map.put("tel", StringUtils.isEmpty(person.getTel()) ? person.getPhone() : person.getTel());
781
         map.put("tel", StringUtils.isEmpty(person.getTel()) ? person.getPhone() : person.getTel());
780
         map.put("personType", person.getPersonType());
782
         map.put("personType", person.getPersonType());
781
         map.put("personId", person.getPersonId());
783
         map.put("personId", person.getPersonId());

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

293
 
293
 
294
 
294
 
295
     @Override
295
     @Override
296
-    public ResponseBean reportCust(String paramStr, String openid,Integer orgId) {
296
+    public ResponseBean reportCust(String paramStr, String openid,Integer orgId,Boolean tips) {
297
         JSONObject params = JSONObject.parseObject(paramStr);
297
         JSONObject params = JSONObject.parseObject(paramStr);
298
         if (null == params) {
298
         if (null == params) {
299
-            return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
299
+            return ResponseBean.error(tips ? "" : "解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
300
         }
300
         }
301
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
301
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
302
         if (null == taPersons || taPersons.size() != 1) {
302
         if (null == taPersons || taPersons.size() != 1) {
303
-            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
303
+            return ResponseBean.error(tips ? "" : "验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
304
         }
304
         }
305
         TaPerson taPerson = taPersons.get(0);
305
         TaPerson taPerson = taPersons.get(0);
306
 
306
 
355
         TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
355
         TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
356
         if(null != currentPerson){
356
         if(null != currentPerson){
357
             if (currentPerson.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
357
             if (currentPerson.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
358
-                return ResponseBean.error("置业顾问不可以绑定置业顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
358
+                return ResponseBean.error(tips ? "" : "置业顾问不可以绑定置业顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
359
             }
359
             }
360
             taRecommendCustomer.setPersonId(currentPerson.getPersonId());
360
             taRecommendCustomer.setPersonId(currentPerson.getPersonId());
361
         }
361
         }
391
 
391
 
392
                 }
392
                 }
393
             }
393
             }
394
-            return ResponseBean.error("您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
394
+            return ResponseBean.error(tips ? "" : "您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
395
         }
395
         }
396
 
396
 
397
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
397
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
398
         if (row < 1) {
398
         if (row < 1) {
399
-            return ResponseBean.error("报备客户失败", ResponseBean.ERROR_UNAVAILABLE);
399
+            return ResponseBean.error(tips ? "" : "报备客户失败", ResponseBean.ERROR_UNAVAILABLE);
400
         }
400
         }
401
 
401
 
402
         // 找到销售经理,并推送消息
402
         // 找到销售经理,并推送消息