bug

src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java

@@ -196,10 +196,10 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @PostMapping("/wx/customer/report")
-    public ResponseBean reportCust(@RequestBody String paramStr, HttpServletRequest request) {
+    public ResponseBean reportCust(@RequestParam(value ="tips",required = false) Boolean tips, @RequestBody String paramStr, HttpServletRequest request) {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        return taRecommendCustomerService.reportCust(paramStr, openid,orgId);
+        return taRecommendCustomerService.reportCust(paramStr, openid,orgId,tips);
     }
 
     @PostMapping("/wx/customer/recommend")

src/main/java/com/huiju/estateagents/service/ITaRecommendCustomerService.java

@@ -30,7 +30,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     ResponseBean recommendCust(String paramStr, String openid,Integer orgId);
 
-    ResponseBean reportCust(String paramStr, String openid,Integer orgId);
+    ResponseBean reportCust(String paramStr, String openid,Integer orgId,Boolean tips);
 
     IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
 

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -774,8 +774,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             return ResponseBean.error("当前人员不存在",ResponseBean.ERROR_UNAVAILABLE);
         }
         Map<String,Object> map = new HashMap<>();
-        map.put("name", StringUtils.isEmpty(person.getName()) ? person.getNickname() : person.getName());
-        map.put("avatar", StringUtils.isEmpty(person.getPhoto()) ? person.getAvatarurl() : person.getPhoto());
+        map.put("name", person.getName());
+        map.put("avatar", person.getPhoto());
+        map.put("wxname", person.getNickname());
+        map.put("wxavatar", person.getAvatarurl());
         map.put("tel", StringUtils.isEmpty(person.getTel()) ? person.getPhone() : person.getTel());
         map.put("personType", person.getPersonType());
         map.put("personId", person.getPersonId());

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -293,14 +293,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public ResponseBean reportCust(String paramStr, String openid,Integer orgId) {
+    public ResponseBean reportCust(String paramStr, String openid,Integer orgId,Boolean tips) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
-            return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error(tips ? "" : "解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
         if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(tips ? "" : "验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson taPerson = taPersons.get(0);
 
@@ -355,7 +355,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
         if(null != currentPerson){
             if (currentPerson.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
-                return ResponseBean.error("置业顾问不可以绑定置业顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
+                return ResponseBean.error(tips ? "" : "置业顾问不可以绑定置业顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
             }
             taRecommendCustomer.setPersonId(currentPerson.getPersonId());
         }
@@ -391,12 +391,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
                 }
             }
-            return ResponseBean.error("您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error(tips ? "" : "您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
         if (row < 1) {
-            return ResponseBean.error("报备客户失败", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error(tips ? "" : "报备客户失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         // 找到销售经理，并推送消息