customer

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -162,4 +162,7 @@ public class TaUser implements Serializable {
     
     @TableField(exist = false)
     private String buildingId;
+
+    @TableField(exist = false)
+    private List<String> projects;
 }

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

@@ -75,6 +75,9 @@ public class TaBuildingDynamicController extends BaseController {
     @Autowired
     private ITaBuildingService iTaBuildingService;
 
+    @Autowired
+    private ITaRecommendCustomerService recommendCustomerService;
+
     @Autowired
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
 
@@ -290,6 +293,14 @@ public class TaBuildingDynamicController extends BaseController {
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
                    if (enlist.getIsCheckin().equals(CommConstant.STATUS_UNACCALIMED)){
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
+                       QueryWrapper<TaRecommendCustomer> customerQueryWrapper = new QueryWrapper<>();
+                       customerQueryWrapper.eq("person_id",enlist.getPersonId());
+                       customerQueryWrapper.eq("building_id",enlist.getBuildingId());
+                       TaRecommendCustomer recommendCustomer = recommendCustomerService.getOne(customerQueryWrapper);
+                       if (recommendCustomer.getStatus() < CommConstant.CUSTOMER_VISITE){
+                           recommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
+                           recommendCustomerService.updateById(recommendCustomer);
+                       }
                        responseBean.addSuccess(enlist);
                    }else {
                        responseBean.addError("您已签到过");

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

@@ -135,6 +135,42 @@ public class TaPersonController extends BaseController {
         return responseBean;
     }
 
+    @PutMapping("/wx/registerConsultantOneClick")
+    public ResponseBean registerConsultantOneClick(HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId =getOrgId(request);
+        String openid = getOpenId(request);
+        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson person = taPersons.get(0);
+        QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("is_consultant",true);
+        List<TaUser> users = taUserService.list(queryWrapper);
+        if(users.size()>0){
+            TaUser user = users.get(0);
+            person.setPersonType(CommConstant.PERSON_REALTY_CONSULTANT);
+            person.setUserId(user.getUserId());
+            person.setAvatarurl(user.getAvatar());
+            person.setCompany(user.getOrgName());
+            person.setTel(user.getPhone());
+            person.setName(user.getUserName());
+            person.setAddress(user.getAddress());
+            person.setIdNo(user.getIdNo());
+            person.setDepartment(user.getDepartment());
+            person.setPost(user.getPosition());
+            person.setPhoto(user.getPhoto());
+            taPersonService.updateById(person);
+            responseBean.addSuccess(person);
+        }else {
+            responseBean.addError("手机号不存在,请联系管理员维护。");
+        }
+        return responseBean;
+    }
+
     @PutMapping("/wx/registerAgent")
     public ResponseBean registerAgent(@RequestParam(required = false) String recommendAgentCode, @RequestParam(required = false) String channelCode,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -474,7 +474,7 @@ public class TaRecommendCustomerController extends BaseController {
 
 
     @GetMapping(value = "/admin/customer/recommend/get/{id}")
-    public ResponseBean getCutomerDetail(@PathVariable String id) {
+    public ResponseBean getCustomerDetail(@PathVariable String id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(taRecommendCustomerService.getCustomerDetail(id));
@@ -485,6 +485,18 @@ public class TaRecommendCustomerController extends BaseController {
         return responseBean;
     }
 
+    @GetMapping(value = "/admin/customer/recommend/public/get/{id}")
+    public ResponseBean getPublicCustomerDetail(@PathVariable String id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(taRecommendCustomerService.getPublicCustomerDetail(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     @GetMapping("/admin/customer/recommend/drift")
     public ResponseBean getDriftCustomerList (HttpServletRequest request,
                                               @RequestParam(value ="buildingId",defaultValue = "false") String buildingId,

src/main/java/com/huiju/estateagents/entity/PersonIntention.java

@@ -0,0 +1,37 @@
+package com.huiju.estateagents.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 收藏表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-07-25
+ */
+@Data
+public class PersonIntention implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+
+    private String personId;
+
+
+    private String buildingName;
+
+
+    private String buildingId;
+
+
+    private Integer intention;
+
+
+
+
+}

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -267,6 +267,11 @@ public class TaPerson implements Serializable {
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
 
+    @TableField(exist = false)
+    private List<PersonIntention> intentions;
+
+    @TableField(exist = false)
+    private Integer visitTimes;
     /**
      * 推广人
      */

src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java

@@ -10,6 +10,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -168,7 +169,7 @@ public class TaRecommendCustomer implements Serializable {
     private Integer visitTimes;
 
     @TableField(exist = false)
-    private TaPerson consultant;
+    private TaUser consultant;
 
     @TableField(exist = false)
     private String recommendName;
@@ -176,6 +177,9 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private String recommendTel;
 
+    @TableField(exist = false)
+    private List<PersonIntention> intentions;
+
     /**
      * 推广人
      */

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -38,7 +38,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
     TaPerson getById(@Param("personId") String personId);
 
 
-    List<String>getUserProjects(@Param("personId") String personId);
+    List<String>getUserProjects(@Param("personId") Integer personId);
 
     TaPerson selectByIdPerson(@Param("openid") String openid);
 

src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.PersonIntention;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -150,4 +151,6 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      */
     List<PrivateCustomerExport> getCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("building") String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("status")Integer status);
 
+    List<PersonIntention> getCustomerIntentions(@Param("personId")String personId);
+
 }

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

@@ -44,6 +44,8 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     TaRecommendCustomer getCustomerDetail(String customerId);
 
+    TaPerson getPublicCustomerDetail(String personId);
+
     TaRecommendCustomer getCustomerById(String customerId);
 
     IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId);

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

@@ -440,12 +440,31 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if(!StringUtils.isEmpty(personId)){
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
         }
         if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
             TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
-            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getPersonId()));
-            taRecommendCustomer.setConsultant(consultant);
+            TaUser user = new TaUser();
+            if(null == consultant){
+                user = userService.getById(taRecommendCustomer.getRealtyConsultant());
+            }else {
+                user = userService.getById(consultant.getUserId());
+            }
+            user.setProjects(taPersonMapper.getUserProjects(user.getUserId()));
+            taRecommendCustomer.setConsultant(user);
+        }
+        return taRecommendCustomer;
+    }
+
+    @Override
+    public TaPerson getPublicCustomerDetail(String personId){
+        TaPerson taRecommendCustomer = taPersonMapper.getById(personId);
+        if(!StringUtils.isEmpty(personId)){
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
         }
+
         return taRecommendCustomer;
     }
 

src/main/resources/mapper/TaPersonMapper.xml

@@ -108,7 +108,7 @@ WHERE
 FROM
 	ta_person_building a
 	LEFT JOIN ta_building b ON a.building_id = b.building_id
-	WHERE a.person_id = #{personId}
+	WHERE a.user_id = #{personId}
     </select>
 
     <select id="selectByIdPerson" resultType="com.huiju.estateagents.entity.TaPerson">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -210,7 +210,9 @@ FROM
         ta_person b
         <where>
             b.status > 0
+            and b.org_id = #{orgId}
             AND IFNULL(b.person_type, '') in ('estate agent', 'customer')
+            AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id ！= ''  )
             <if test="name != null and name !=''">
                 and b.nickname like CONCAT('%',#{name}, '%')
             </if>
@@ -223,9 +225,6 @@ FROM
             <if test="sex != null and sex !=''">
                 and b.sex = #{sex}
             </if>
-            <if test="orgId != null">
-                and b.org_id = #{orgId}
-            </if>
             <if test="consultTel != null and consultTel !=''">
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
@@ -533,4 +532,19 @@ FROM
         limit #{pageCode}, #{pageSize}
     </select>
 
+    <select id="getCustomerIntentions" resultType="com.huiju.estateagents.entity.PersonIntention">
+        SELECT
+	SUM( intention ) AS intention,
+	building_id,
+	building_name
+FROM
+	`ta_person_intention_record`
+WHERE
+	person_id = #{personId}
+GROUP BY
+	building_id
+ORDER BY
+	intention DESC
+    </select>
+
 </mapper>