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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v0.3.1</version>
+	<version>v0.3.2</version>
 	<name>estateagents</name>
 	<description>置业经纪人</description>
 

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

@@ -208,10 +208,7 @@ public class MiniAppController {
             customerPersonQueryWrapper.eq("customer_id",customers.getCustomerId());
             List<TaCustomerPerson> list = taCustomerPersonService.list(customerPersonQueryWrapper);
             if(list.size()<=0){
-                TaCustomerPerson customerPerson = new TaCustomerPerson();
-                customerPerson.setCustomerId(customers.getCustomerId());
-                customerPerson.setPersonId(person.getPersonId());
-                taCustomerPersonService.save(customerPerson);
+                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
             }
         }
 

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

@@ -234,11 +234,12 @@ public class TaBuildingDynamicController extends BaseController {
     }
 
     @RequestMapping(value = "/admin/buildingDynamic/delete", method = RequestMethod.DELETE)
-    public ResponseBean pageImdelect(@RequestParam(value = "id",required = false)String id) {
+    public ResponseBean buildingDynamicdelect(@RequestParam(value = "id",required = false)String id) {
         ResponseBean responseBean = iBuildingDynamicService.buildingDynamicDelete(id);
         return responseBean;
     }
 
+
     @RequestMapping(value = "/admin/buildingDynamic/send/{dynamicId}", method = RequestMethod.PUT)
     public ResponseBean send(@PathVariable String dynamicId) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -3,7 +3,9 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaCustomerPerson;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -15,5 +17,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TaCustomerPersonMapper extends BaseMapper<TaCustomerPerson> {
+    void insertBean(@Param("personId") String personId, @Param("customerId") String customerId);
 
 }

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

@@ -13,5 +13,6 @@ import com.huiju.estateagents.entity.TaCustomerPerson;
  * @since 2019-08-08
  */
 public interface ITaCustomerPersonService extends IService<TaCustomerPerson> {
+    void insertBean(String personId,String customerId);
 
 }

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

@@ -336,7 +336,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
             }
             return result;
         }else {
-            return null;
+            return page;
         }
     }
 }

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

@@ -18,4 +18,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaCustomerPersonServiceImpl extends ServiceImpl<TaCustomerPersonMapper, TaCustomerPerson> implements ITaCustomerPersonService {
 
+    public void insertBean(String personId,String customerId){
+
+    }
 }

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

@@ -213,9 +213,9 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
         injectType(taNewsIPage.getRecords());
         if (null != targets&&targets.size()<=0 && mine){
-            return null;
-        }else {
             return page;
+        }else {
+            return taNewsIPage;
         }
 
     }

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

@@ -102,6 +102,12 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             wrapper.eq("mini_openid", openid);
             wrapper.set("nickname", userInfo.getNickName());
             wrapper.set("avatarurl", userInfo.getAvatarUrl());
+            wrapper.set("gender",userInfo.getGender());
+            wrapper.set("city",userInfo.getCity());
+            wrapper.set("province",userInfo.getProvince());
+            wrapper.set("language",userInfo.getLanguage());
+            wrapper.set("union_id",userInfo.getUnionId());
+            wrapper.set("country",userInfo.getCountry());
             taPersonMapper.update(person, wrapper);
 
             person.setAvatarurl(userInfo.getAvatarUrl());

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

@@ -1,345 +1,348 @@
-package com.huiju.estateagents.service.impl;
-
-import ch.qos.logback.core.status.StatusUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.DateUtils;
-import com.huiju.estateagents.common.StringUtils;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
-import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
-import com.huiju.estateagents.service.IMiniAppService;
-import com.huiju.estateagents.service.ITaRecommendCustomerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import javax.naming.spi.ResolveResult;
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 推荐客户表 服务实现类
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-@Service
-public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCustomerMapper, TaRecommendCustomer> implements ITaRecommendCustomerService {
-
-    @Autowired
-    TaPersonMapper taPersonMapper;
-
-    @Autowired
-    TaRecommendCustomerMapper taRecommendCustomerMapper;
-
-    @Autowired
-    IMiniAppService iMiniAppService;
-
-    @Autowired
-    TaPersonVisitRecordMapper taPersonVisitRecordMapper;
-
-    @Override
-    public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
-        List<TaPerson> taPersons = getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        TaPerson taPerson = taPersons.get(0);
-
-        IPage<TaRecommendCustomer> page = new Page<>();
-        page.setCurrent(pageNumber);
-        page.setSize(pageSize);
-
-        QueryWrapper<TaRecommendCustomer> query = new QueryWrapper<>();
-        query.eq("person_id", taPerson.getPersonId());
-        query.like(null != keywords && "".equals(keywords.trim()), "name", keywords);
-        query.orderByDesc("report_date");
-
-        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.selectPage(page, query);
-        return ResponseBean.success(result);
-    }
-
-    @Override
-    public ResponseBean getCustDetail(String id) {
-        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);
-
-        if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
-            TaPerson taPerson = taPersonMapper.selectById(taRecommendCustomer.getRealtyConsultant());
-            if (null != taPerson) {
-                taRecommendCustomer.setConsultants(new HashMap<String, Object>() {{
-                    put("name", taPerson.getName());
-                    put("phone", taPerson.getTel());
-                    put("photo", taPerson.getPhoto());
-                }});
-            }
-        }
-
-        return ResponseBean.success(taRecommendCustomer);
-    }
-
-    @Override
-    public ResponseBean updateCustByJSON(String paramStr) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        if (null == params) {
-            return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        String checkResult = checkCustomerParams(params);
-        if (null != checkResult) {
-            return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
-        }
-
-
-        UpdateWrapper<TaRecommendCustomer> wrapper = new UpdateWrapper<>();
-        wrapper.eq("customer_id", params.get("id"));
-        wrapper.set("name", params.get("name"));
-        wrapper.set("picture", params.get("picture"));
-        wrapper.set("phone", params.get("phone"));
-        wrapper.set("sex", params.get("sex"));
-        wrapper.set("describe", params.get("describe"));
-
-        String at = params.getString("appointmentTime");
-        if (!StringUtils.isEmpty(at)) {
-            wrapper.set("appointmentTime", DateUtils.day2LocalDateime(at));
-        }
-        wrapper.set("vistors", params.get("vistors"));
-        wrapper.set("explain", params.get("explain"));
-        wrapper.set("intention", params.get("intention"));
-        wrapper.set("realtyManageType", params.get("realtyManageType"));
-        wrapper.set("demandType", params.get("demandType"));
-        wrapper.set("priceRange", params.get("priceRange"));
-        wrapper.set("realtyConsultant", params.get("realtyConsultant"));
-
-        // todo 需要约定时间格式
-//        wrapper.set("reportDate", params.get("reportDate"));
-
-        String status = params.getString("status");
-        if (null != status) {
-            wrapper.set("status", params.get("status"));
-        }
-
-        int row = taRecommendCustomerMapper.update(new TaRecommendCustomer(), wrapper);
-        if (row <= 0) {
-            return ResponseBean.error("更新客户信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        return ResponseBean.success("更新客户信息成功");
-    }
-
-    @Override
-    public ResponseBean recommendCust(String paramStr, String openid) {
-        JSONObject params = JSONObject.parseObject(paramStr);
-        if (null == params) {
-            return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-        List<TaPerson> taPersons = getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        TaPerson taPerson = taPersons.get(0);
-
-        String checkResult = checkCustomerParams(params);
-        if (null != checkResult) {
-            return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
-        }
-
-        TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-
-        taRecommendCustomer.setName(params.getString("name"));
-        taRecommendCustomer.setPicture(params.getString("picture"));
-        taRecommendCustomer.setPhone(params.getString("phone"));
-        taRecommendCustomer.setSex(params.getInteger("sex"));
-        taRecommendCustomer.setDescribe(params.getString("describe"));
-        taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
-
-        // 时间格式 yyyy-MM-dd
-        String at = params.getString("appointmentTime");
-        if (!StringUtils.isEmpty(at)) {
-            taRecommendCustomer.setAppointmentTime(DateUtils.day2LocalDateime(at));
-        }
-
-//        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
-        taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
-        taRecommendCustomer.setIntention(params.getString("intention"));
-        taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
-        taRecommendCustomer.setDemandType(params.getString("demandType"));
-        taRecommendCustomer.setPriceRange(params.getString("priceRange"));
-
-        // 报备日期是今天
-        taRecommendCustomer.setReportDate(LocalDateTime.now());
-
-        String status = params.getString("status");
-        if (null == status) status = "1";
-        taRecommendCustomer.setStatus(status);
-        taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
-
-        // 报备有 10 天有效期
-        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("name", taRecommendCustomer.getName());
-        queryWrapper.eq("phone", taRecommendCustomer.getPhone());
-        queryWrapper.ge("report_date", LocalDateTime.now().minusDays(10));
-        List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
-        if (null != result && result.size() > 0) {
-            return ResponseBean.error("当前客户尚在保护期, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
-        int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
-        if (row < 1) {
-            return ResponseBean.error("推荐客户失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        // 找到销售经理，并推送消息
-        TaPerson saleMan = taPersonMapper.getSalesExecutive();
-        if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
-            // 发送消息
-            iMiniAppService.sendNewCustomerMessage(saleMan.getMiniOpenid(), CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
-        }
-
-        return ResponseBean.success(taRecommendCustomer);
-    }
-
-    String checkCustomerParams(JSONObject params) {
-        if (null == params.getString("name")) {
-            return "请设置客户姓名";
-        }
-        if (null == params.getString("phone")) {
-            return "请设置客户电话";
-        }
-        if (null == params.getInteger("sex")) {
-            return "请设置客户性别";
-        }
-        if (null == params.getString("intention")) {
-            return "请设置意向楼盘";
-        }
-
-        return null;
-    }
-
-
-
-
-    List<TaPerson> getPersonsByOpenId(String openid) {
-        return taPersonMapper.getPersonByOpenId(openid);
-    }
-
-    @Override
-    public IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize,String building,String personId){
-        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
-//        queryWrapper.eq("building_id",building);
-        queryWrapper.eq("realty_consultant",personId);
-        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
-    }
-
-    @Override
-    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus){
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus);
-    }
-
-    @Override
-    public TaRecommendCustomer getCustomerById(String customerId){
-        return taRecommendCustomerMapper.getCustomerById(customerId);
-    }
-
-
-    @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId){
-        String personId = taRecommendCustomerMapper.getCustomerPersonId(customerId);
-        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId);
-        if(!StringUtils.isEmpty(personId)){
-            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
-            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
-        }
-        if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
-            TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
-            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getPersonId()));
-            taRecommendCustomer.setConsultant(consultant);
-        }
-        return taRecommendCustomer;
-    }
-
-    @Override
-    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building){
-        String personId = taRecommendCustomerMapper.getCustomerPersonId(customerId);
-        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("person_id",personId);
-//        queryWrapper.eq("building_id",building);
-        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
-    }
-
-    @Override
-    public TaRecommendCustomer newByPerson(TaPerson person) {
-        // 没有手机号, 暂时不生成客户信息
-        String phone = StringUtils.ifNull(person.getTel(), person.getPhone());
-        if (StringUtils.isEmpty(phone)) {
-            return null;
-        }
-
-        // 已经存在的, 随机返回一条记录
-        List<TaRecommendCustomer> custs = getCustomerByPhone(phone);
-        if (null != custs && custs.size() > 0) {
-            return custs.get(0);
-        }
-
-        TaRecommendCustomer cust = new TaRecommendCustomer();
-        cust.setName(StringUtils.ifNull(person.getName(), person.getNickname()));
-        cust.setSex(null == person.getSex() ? str2Int(person.getGender()) : person.getSex());
-        cust.setPhone(phone);
-        cust.setPicture(StringUtils.ifNull(person.getPhoto(), person.getAvatarurl()));
-        cust.setCountry(person.getCountry());
-        cust.setCity(person.getCity());
-        cust.setProvince(person.getProvince());
-        // 审核同意
-        cust.setVerifyStatus(CommConstant.VERIFY_AGREE);
-        // 报备状态
-        cust.setStatus(CommConstant.CUSTOMER_REPORT);
-        // 当前日期
-        cust.setReportDate(LocalDateTime.now());
-
-        if (taRecommendCustomerMapper.insert(cust) > 0) {
-            return cust;
-        } else {
-            log.error("依据人员新增推荐客户失败");
-            return null;
-        }
-    }
-
-    private List<TaRecommendCustomer> getCustomerByPhone(String phone) {
-        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone", phone);
-        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
-        queryWrapper.orderByDesc("report_date");
-
-        List<TaRecommendCustomer> custs = taRecommendCustomerMapper.selectList(queryWrapper);
-        return custs;
-    }
-
-    private Integer str2Int(String str) {
-        if (null == str) {
-            return null;
-        }
-
-        try {
-            return Integer.valueOf(str);
-        } catch (Exception e) {
-            return 0;
-        }
-    }
-}
+package com.huiju.estateagents.service.impl;
+
+import ch.qos.logback.core.status.StatusUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaRecommendCustomer;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
+import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
+import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.service.ITaRecommendCustomerService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.naming.spi.ResolveResult;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 推荐客户表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Service
+public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCustomerMapper, TaRecommendCustomer> implements ITaRecommendCustomerService {
+
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    TaRecommendCustomerMapper taRecommendCustomerMapper;
+
+    @Autowired
+    IMiniAppService iMiniAppService;
+
+    @Autowired
+    TaPersonVisitRecordMapper taPersonVisitRecordMapper;
+
+    @Override
+    public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = taPersons.get(0);
+
+        IPage<TaRecommendCustomer> page = new Page<>();
+        page.setCurrent(pageNumber);
+        page.setSize(pageSize);
+
+        QueryWrapper<TaRecommendCustomer> query = new QueryWrapper<>();
+        query.eq("recommend_person", taPerson.getPersonId());
+        query.like(null != keywords && "".equals(keywords.trim()), "name", keywords);
+        query.orderByDesc("report_date");
+
+        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.selectPage(page, query);
+        return ResponseBean.success(result);
+    }
+
+    @Override
+    public ResponseBean getCustDetail(String id) {
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);
+
+        if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
+            TaPerson taPerson = taPersonMapper.selectById(taRecommendCustomer.getRealtyConsultant());
+            if (null != taPerson) {
+                taRecommendCustomer.setConsultants(new HashMap<String, Object>() {{
+                    put("name", taPerson.getName());
+                    put("phone", taPerson.getTel());
+                    put("photo", taPerson.getPhoto());
+                }});
+            }
+        }
+
+        return ResponseBean.success(taRecommendCustomer);
+    }
+
+    @Override
+    public ResponseBean updateCustByJSON(String paramStr) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        String checkResult = checkCustomerParams(params);
+        if (null != checkResult) {
+            return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+
+        UpdateWrapper<TaRecommendCustomer> wrapper = new UpdateWrapper<>();
+        wrapper.eq("customer_id", params.get("id"));
+        wrapper.set("name", params.get("name"));
+        wrapper.set("picture", params.get("picture"));
+        wrapper.set("phone", params.get("phone"));
+        wrapper.set("sex", params.get("sex"));
+        wrapper.set("describe", params.get("describe"));
+
+        String at = params.getString("appointmentTime");
+        if (!StringUtils.isEmpty(at)) {
+            wrapper.set("appointmentTime", DateUtils.day2LocalDateime(at));
+        }
+        wrapper.set("vistors", params.get("vistors"));
+        wrapper.set("explain", params.get("explain"));
+        wrapper.set("intention", params.get("intention"));
+        wrapper.set("realtyManageType", params.get("realtyManageType"));
+        wrapper.set("demandType", params.get("demandType"));
+        wrapper.set("priceRange", params.get("priceRange"));
+        wrapper.set("realtyConsultant", params.get("realtyConsultant"));
+
+        // todo 需要约定时间格式
+//        wrapper.set("reportDate", params.get("reportDate"));
+
+        String status = params.getString("status");
+        if (null != status) {
+            wrapper.set("status", params.get("status"));
+        }
+
+        int row = taRecommendCustomerMapper.update(new TaRecommendCustomer(), wrapper);
+        if (row <= 0) {
+            return ResponseBean.error("更新客户信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return ResponseBean.success("更新客户信息成功");
+    }
+
+    @Override
+    public ResponseBean recommendCust(String paramStr, String openid) {
+        JSONObject params = JSONObject.parseObject(paramStr);
+        if (null == params) {
+            return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        List<TaPerson> taPersons = getPersonsByOpenId(openid);
+        if (null == taPersons || taPersons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        TaPerson taPerson = taPersons.get(0);
+
+        String checkResult = checkCustomerParams(params);
+        if (null != checkResult) {
+            return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
+        }
+
+        TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+
+        taRecommendCustomer.setName(params.getString("name"));
+        taRecommendCustomer.setPicture(params.getString("picture"));
+        taRecommendCustomer.setPhone(params.getString("phone"));
+        taRecommendCustomer.setSex(params.getInteger("sex"));
+        taRecommendCustomer.setDescribe(params.getString("describe"));
+        taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
+
+        // 时间格式 yyyy-MM-dd
+        String at = params.getString("appointmentTime");
+        if (!StringUtils.isEmpty(at)) {
+            taRecommendCustomer.setAppointmentTime(DateUtils.day2LocalDateime(at));
+        }
+
+//        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
+        taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
+        taRecommendCustomer.setIntention(params.getString("intention"));
+        taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
+        taRecommendCustomer.setDemandType(params.getString("demandType"));
+        taRecommendCustomer.setPriceRange(params.getString("priceRange"));
+        taRecommendCustomer.setEntryType(CommConstant.ENTRY_INPUT);
+
+        // 报备日期是今天
+        taRecommendCustomer.setReportDate(LocalDateTime.now());
+
+        String status = params.getString("status");
+        if (null == status) status = "1";
+        taRecommendCustomer.setStatus(status);
+        taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
+
+        // 报备有 10 天有效期
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name", taRecommendCustomer.getName());
+        queryWrapper.eq("phone", taRecommendCustomer.getPhone());
+        queryWrapper.ge("report_date", LocalDateTime.now().minusDays(10));
+        List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
+        if (null != result && result.size() > 0) {
+            return ResponseBean.error("当前客户尚在保护期, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
+        if (row < 1) {
+            return ResponseBean.error("推荐客户失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 找到销售经理，并推送消息
+        TaPerson saleMan = taPersonMapper.getSalesExecutive();
+        if (null != saleMan && !StringUtils.isEmpty(saleMan.getMiniOpenid())) {
+            // 发送消息
+            iMiniAppService.sendNewCustomerMessage(saleMan.getMiniOpenid(), CommConstant.MINIAPP_INDEX, taRecommendCustomer.getName(), taRecommendCustomer.getPhone(), "", taPerson.getName());
+        }
+
+        return ResponseBean.success(taRecommendCustomer);
+    }
+
+    String checkCustomerParams(JSONObject params) {
+        if (null == params.getString("name")) {
+            return "请设置客户姓名";
+        }
+        if (null == params.getString("phone")) {
+            return "请设置客户电话";
+        }
+        if (null == params.getInteger("sex")) {
+            return "请设置客户性别";
+        }
+        if (null == params.getString("intention")) {
+            return "请设置意向楼盘";
+        }
+
+        return null;
+    }
+
+
+
+
+    List<TaPerson> getPersonsByOpenId(String openid) {
+        return taPersonMapper.getPersonByOpenId(openid);
+    }
+
+    @Override
+    public IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize,String building,String personId){
+        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+//        queryWrapper.eq("building_id",building);
+        queryWrapper.eq("realty_consultant",personId);
+        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
+        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+    }
+
+    @Override
+    public IPage<TaRecommendCustomer> getCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus){
+        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+        return taRecommendCustomerMapper.getCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus);
+    }
+
+    @Override
+    public TaRecommendCustomer getCustomerById(String customerId){
+        return taRecommendCustomerMapper.getCustomerById(customerId);
+    }
+
+
+    @Override
+    public TaRecommendCustomer getCustomerDetail(String customerId){
+        String personId = taRecommendCustomerMapper.getCustomerPersonId(customerId);
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId);
+        if(!StringUtils.isEmpty(personId)){
+            taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(personId));
+            taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(personId).size());
+        }
+        if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
+            TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
+            consultant.setProjects(taPersonMapper.getUserProjects(consultant.getPersonId()));
+            taRecommendCustomer.setConsultant(consultant);
+        }
+        return taRecommendCustomer;
+    }
+
+    @Override
+    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,String building){
+        String personId = taRecommendCustomerMapper.getCustomerPersonId(customerId);
+        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+        // todo
+        // 此处可能不是 person_id 而是 recommend_person
+        queryWrapper.eq("person_id",personId);
+//        queryWrapper.eq("building_id",building);
+        queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
+        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+    }
+
+    @Override
+    public TaRecommendCustomer newByPerson(TaPerson person) {
+        // 没有手机号, 暂时不生成客户信息
+        String phone = StringUtils.ifNull(person.getTel(), person.getPhone());
+        if (StringUtils.isEmpty(phone)) {
+            return null;
+        }
+
+        // 已经存在的, 随机返回一条记录
+        List<TaRecommendCustomer> custs = getCustomerByPhone(phone);
+        if (null != custs && custs.size() > 0) {
+            return custs.get(0);
+        }
+
+        TaRecommendCustomer cust = new TaRecommendCustomer();
+        cust.setName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        cust.setSex(null == person.getSex() ? str2Int(person.getGender()) : person.getSex());
+        cust.setPhone(phone);
+        cust.setPicture(StringUtils.ifNull(person.getPhoto(), person.getAvatarurl()));
+        cust.setCountry(person.getCountry());
+        cust.setCity(person.getCity());
+        cust.setProvince(person.getProvince());
+        // 审核同意
+        cust.setVerifyStatus(CommConstant.VERIFY_AGREE);
+        // 报备状态
+        cust.setStatus(CommConstant.CUSTOMER_REPORT);
+        // 当前日期
+        cust.setReportDate(LocalDateTime.now());
+
+        if (taRecommendCustomerMapper.insert(cust) > 0) {
+            return cust;
+        } else {
+            log.error("依据人员新增推荐客户失败");
+            return null;
+        }
+    }
+
+    private List<TaRecommendCustomer> getCustomerByPhone(String phone) {
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", phone);
+        queryWrapper.gt("status", CommConstant.STATUS_DELETE);
+        queryWrapper.orderByDesc("report_date");
+
+        List<TaRecommendCustomer> custs = taRecommendCustomerMapper.selectList(queryWrapper);
+        return custs;
+    }
+
+    private Integer str2Int(String str) {
+        if (null == str) {
+            return null;
+        }
+
+        try {
+            return Integer.valueOf(str);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+}

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

@@ -1,91 +1,99 @@
-package com.huiju.estateagents.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaUv;
-import com.huiju.estateagents.mapper.TaPersonMapper;
-import com.huiju.estateagents.mapper.TaUvMapper;
-import com.huiju.estateagents.service.ITaUvService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-/**
- * <p>
- * 用户访问表 服务实现类
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-@Service
-public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements ITaUvService {
-    @Autowired
-    TaPersonMapper taPersonMapper;
-
-    @Autowired
-    TaUvMapper taUvMapper;
-
-    @Override
-    public ResponseBean saveData(String openid, String typeOf, String id) {
-        List<TaPerson> persons = getPersonsByOpenId(openid);
-        if (null == persons || persons.size() != 1) {
-            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        TaPerson taPerson = persons.get(0);
-
-        QueryWrapper<TaUv> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("person_id", taPerson.getPersonId());
-        queryWrapper.eq("be_uv", id);
-        queryWrapper.eq("tagert_type", typeOf);
-        List<TaUv> uvs = taUvMapper.selectList(queryWrapper);
-        if (null != uvs && uvs.size() > 0) {
-            return ResponseBean.success("");
-        }
-
-        TaUv taUv = new TaUv();
-        taUv.setBeUv(id);
-        taUv.setCreateDate(LocalDateTime.now());
-        taUv.setNameOrnick(taPerson.getNickname());
-        taUv.setPersonId(taPerson.getPersonId());
-        taUv.setPhotoOravatar(taPerson.getAvatarurl());
-        taUv.setTagertType(typeOf);
-
-        int row = taUvMapper.insert(taUv);
-        if (row < 1) {
-            return ResponseBean.error("人气增加失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-
-        // 如果是点赞置业, 则人员点赞 + 1
-        if (typeOf == CommConstant.FAVOR_CONSULTANT) {
-            taPersonMapper.setFieldIncrement(id,"hot_num", 1);
-        }
-
-        return ResponseBean.success("");
-    }
-
-    @Override
-    public ResponseBean getListOf(String id, String typeOf, Integer pageNumber, Integer pageSize) {
-        IPage<TaUv> page = new Page(pageNumber, pageSize);
-        QueryWrapper<TaUv> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("be_uv", id);
-        queryWrapper.eq("tagert_type", typeOf);
-        queryWrapper.orderByDesc("create_date");
-
-        IPage<TaUv> result = taUvMapper.selectPage(page, queryWrapper);
-        return ResponseBean.success(result);
-    }
-
-
-    List<TaPerson> getPersonsByOpenId(String openid) {
-        return taPersonMapper.getPersonByOpenId(openid);
-    }
-}
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaUv;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaUvMapper;
+import com.huiju.estateagents.service.ITaUvService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 用户访问表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Service
+public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements ITaUvService {
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
+    @Autowired
+    TaUvMapper taUvMapper;
+
+    @Override
+    public ResponseBean saveData(String openid, String typeOf, String id) {
+        List<TaPerson> persons = getPersonsByOpenId(openid);
+        if (null == persons || persons.size() != 1) {
+            return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        TaPerson taPerson = persons.get(0);
+
+        QueryWrapper<TaUv> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", taPerson.getPersonId());
+        queryWrapper.eq("be_uv", id);
+        queryWrapper.eq("tagert_type", typeOf);
+        List<TaUv> uvs = taUvMapper.selectList(queryWrapper);
+        if (null != uvs && uvs.size() > 0) {
+            for(int i=0;i<uvs.size();i++){
+                uvs.get(i).setCreateDate(LocalDateTime.now());
+            }
+            if(this.updateBatchById(uvs)){
+                return ResponseBean.success("");
+            }else {
+                return ResponseBean.error("",ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+        }
+
+        TaUv taUv = new TaUv();
+        taUv.setBeUv(id);
+        taUv.setCreateDate(LocalDateTime.now());
+        taUv.setNameOrnick(taPerson.getNickname());
+        taUv.setPersonId(taPerson.getPersonId());
+        taUv.setPhotoOravatar(taPerson.getAvatarurl());
+        taUv.setTagertType(typeOf);
+
+        int row = taUvMapper.insert(taUv);
+        if (row < 1) {
+            return ResponseBean.error("人气增加失败", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 如果是点赞置业, 则人员点赞 + 1
+        if (typeOf == CommConstant.FAVOR_CONSULTANT) {
+            taPersonMapper.setFieldIncrement(id,"hot_num", 1);
+        }
+
+        return ResponseBean.success("");
+    }
+
+    @Override
+    public ResponseBean getListOf(String id, String typeOf, Integer pageNumber, Integer pageSize) {
+        IPage<TaUv> page = new Page(pageNumber, pageSize);
+        QueryWrapper<TaUv> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("be_uv", id);
+        queryWrapper.eq("tagert_type", typeOf);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaUv> result = taUvMapper.selectPage(page, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+
+    List<TaPerson> getPersonsByOpenId(String openid) {
+        return taPersonMapper.getPersonByOpenId(openid);
+    }
+}

src/main/resources/mapper/TaCustomerPersonMapper.xml

@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaCustomerPersonMapper">
+    <insert id="insertBean">
+        insert into ta_customer_person (person_id,customer_id)
+        values
+        (#{personId},#{customerId})
+    </insert>
 
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -7,7 +7,7 @@
         FROM
             ta_recommend_customer t
         WHERE
-            t.person_id = #{personId}
+            t.recommend_person = #{personId}
             AND t.status > -1
     </select>
     <select id="getCustomerPersonId" resultType="java.lang.String">