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

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -321,4 +321,14 @@ public class CommConstant {
     public static final Integer RECOMMEND_CUSTOMER_STATUS_PRE_ORDER = 2;
     // ------- 推荐客户状态 end -------
 
+
+    // ------- 客户推荐报备状态 start -------
+    // 未报备，未推荐
+    public static final Integer READY = 0;
+    // 已报备
+    public static final Integer REPORTED = 1;
+    // 已推荐
+    public static final Integer RECOMMENDED = 2;
+    // ------- 客户推荐报备状态 end -------
+
 }

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

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -209,33 +210,37 @@ public class MiniAppController {
         taPersonService.updateById(person);
         QueryWrapper<TaRecommendCustomer> cus= new QueryWrapper<>();
         cus.eq("phone",phoneNoInfo.getPhoneNumber());
+        cus.orderByDesc("create_date");
         List<TaRecommendCustomer> customer = taRecommendCustomerService.list(cus);
         if (customer.size()>0){
-            TaRecommendCustomer customers = customer.get(0);
-            customers.setPersonId(person.getPersonId());
-            customers.setPicture(person.getAvatarurl());
-            customers.setCountry(person.getCountry());
-            customers.setCity(person.getCity());
-            customers.setProvince(person.getProvince());
-            if(!taRecommendCustomerService.updateById(customers)){
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-            if(null != customers.getRecommendPerson()&&!StringUtils.isEmpty(customers.getRecommendPerson())){
-                person.setRecommendPerson(customers.getRecommendPerson());
-                person.setRecommendPerson(customers.getRecommendPerson());
-                TaPerson recommender = taPersonService.getById(customers.getRecommendPerson());
-                if(null != recommender.getPersonType()&&!StringUtils.isEmpty(recommender.getPersonType())){
-                    person.setRecommendPersonType(recommender.getPersonType());
-                }
+            for(int i =0;i<customer.size();i++){
+                customer.get(i).setPersonId(person.getPersonId());
+                customer.get(i).setPicture(person.getAvatarurl());
+                customer.get(i).setCountry(person.getCountry());
+                customer.get(i).setCity(person.getCity());
+                customer.get(i).setProvince(person.getProvince());
             }
+//            TaRecommendCustomer customers = customer.get(0);
 
-            QueryWrapper<TaCustomerPerson> customerPersonQueryWrapper = new QueryWrapper<>();
-            customerPersonQueryWrapper.eq("person_id",person.getPersonId());
-            customerPersonQueryWrapper.eq("customer_id",customers.getCustomerId());
-            List<TaCustomerPerson> list = taCustomerPersonService.list(customerPersonQueryWrapper);
-            if(list.size()<=0){
-                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
+            if(!taRecommendCustomerService.updateBatchById(customer)){
+                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }
+//            if(null != customers.getRecommendPerson()&&!StringUtils.isEmpty(customers.getRecommendPerson())&& StringUtils.isEmpty(person.getRecommendPerson())){
+//                person.setRecommendPerson(customers.getRecommendPerson());
+//                person.setRecommendPerson(customers.getRecommendPerson());
+//                TaPerson recommender = taPersonService.getById(customers.getRecommendPerson());
+//                if(null != recommender.getPersonType()&&!StringUtils.isEmpty(recommender.getPersonType())){
+//                    person.setRecommendPersonType(recommender.getPersonType());
+//                }
+//            }
+
+//            QueryWrapper<TaCustomerPerson> customerPersonQueryWrapper = new QueryWrapper<>();
+//            customerPersonQueryWrapper.eq("person_id",person.getPersonId());
+//            customerPersonQueryWrapper.eq("customer_id",customers.getCustomerId());
+//            List<TaCustomerPerson> list = taCustomerPersonService.list(customerPersonQueryWrapper);
+//            if(list.size()<=0){
+//                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
+//            }
         } else{
             TaRecommendCustomer reCustomer = new TaRecommendCustomer();
             reCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
@@ -248,6 +253,8 @@ public class MiniAppController {
             reCustomer.setCity(person.getCity());
             reCustomer.setProvince(person.getProvince());
             reCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
+            reCustomer.setCreateDate(LocalDateTime.now());
+            reCustomer.setReportRecommendStatus(CommConstant.READY);
             if(!taRecommendCustomerService.save(reCustomer)){
                 return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
             }

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

@@ -98,7 +98,7 @@ public class TaRecommendCustomerController extends BaseController {
     @PostMapping("/wx/customer/recommend")
     public ResponseBean getUnSignedCustomerList ( @RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                  @RequestParam(value ="today",defaultValue = "false") String buildingId,
+                                                  @RequestParam(value ="buildingId") String buildingId,
                                                   HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);

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

@@ -53,5 +53,9 @@ public class TaBuildingProjectType implements Serializable {
      */
     private Integer status;
 
+    private Integer buildingTypeId;
+
+    private String buildingTypeName;
+
 
 }

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

@@ -1,169 +1,173 @@
-package com.huiju.estateagents.entity;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 推荐客户表
- * </p>
- *
- * @author jobob
- * @since 2019-05-10
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class TaRecommendCustomer implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户ID
-     */
-    @TableId(value = "customer_id", type = IdType.UUID)
-    private String customerId;
-
-    /**
-     * 姓名
-     */
-
-    @TableField(value = "`name`")
-    private String name;
-
-    /**
-     * 性别
-     */
-    private Integer sex;
-
-    /**
-     * 电话
-     */
-    private String phone;
-
-    /**
-     * 照片
-     */
-    private String picture;
-
-    /**
-     * 描述
-     */
-    @TableField(value = "`describe`")
-    private String describe;
-
-    /**
-     * 预约时间
-     */
-    private LocalDateTime appointmentTime;
-
-    /**
-     * 到访人数
-     */
-    private Integer visiteNum;
-
-    /**
-     * 意向项目
-     */
-    private String intention;
-
-    /**
-     * 项目ID
-     */
-    private String buildingId;
-
-    /**
-     * 物业类型
-     */
-    private String realtyManageType;
-
-    /**
-     * 需求类型
-     */
-    private String demandType;
-
-    /**
-     * 价格区间
-     */
-    private String priceRange;
-
-    /**
-     * 报备日期
-     */
-    private LocalDateTime reportDate;
-
-    /**
-     * 状态
-     */
-    @TableField(value = "`status`")
-    private String status;
-
-    /**
-     * 推荐人
-     */
-    private String recommendPerson;
-
-    private String personId;
-
-    /**
-     * 服务顾问
-     */
-    private String realtyConsultant;
-
-    /**
-     * 服务顾问
-     */
-    @TableField(exist = false)
-    private Map<String, Object> consultants;
-
-    @TableField(exist = false)
-    private String consultantName;
-
-    @TableField(exist = false)
-    private String consultTel;
-
-    private Integer verifyStatus;
-
-    private String verifyRemark;
-
-    private String country;
-
-    private String province;
-
-    private String city;
-
-    private String entryType;
-
-    @TableField(exist = false)
-    private List<TaPersonVisitRecord> visitRecords;
-
-    @TableField(exist = false)
-    private List<String> projects;
-
-    @TableField(exist = false)
-    private Integer duration;
-
-    @TableField(exist = false)
-    private LocalDateTime visitTime;
-
-    @TableField(exist = false)
-    private Integer visitTimes;
-
-    @TableField(exist = false)
-    private TaPerson consultant;
-
-    @TableField(exist = false)
-    private String recommendName;
-
-    @TableField(exist = false)
-    private String recommendTel;
-}
+package com.huiju.estateagents.entity;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 推荐客户表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaRecommendCustomer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+    @TableId(value = "customer_id", type = IdType.UUID)
+    private String customerId;
+
+    /**
+     * 姓名
+     */
+
+    @TableField(value = "`name`")
+    private String name;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+
+    /**
+     * 电话
+     */
+    private String phone;
+
+    /**
+     * 照片
+     */
+    private String picture;
+
+    /**
+     * 描述
+     */
+    @TableField(value = "`describe`")
+    private String describe;
+
+    /**
+     * 预约时间
+     */
+    private LocalDateTime appointmentTime;
+
+    /**
+     * 到访人数
+     */
+    private Integer visiteNum;
+
+    /**
+     * 意向项目
+     */
+    private String intention;
+
+    /**
+     * 项目ID
+     */
+    private String buildingId;
+
+    /**
+     * 物业类型
+     */
+    private String realtyManageType;
+
+    /**
+     * 需求类型
+     */
+    private String demandType;
+
+    /**
+     * 价格区间
+     */
+    private String priceRange;
+
+    /**
+     * 报备日期
+     */
+    private LocalDateTime reportDate;
+
+    /**
+     * 状态
+     */
+    @TableField(value = "`status`")
+    private String status;
+
+    /**
+     * 推荐人
+     */
+    private String recommendPerson;
+
+    private String personId;
+
+    /**
+     * 服务顾问
+     */
+    private String realtyConsultant;
+
+    /**
+     * 服务顾问
+     */
+    @TableField(exist = false)
+    private Map<String, Object> consultants;
+
+    @TableField(exist = false)
+    private String consultantName;
+
+    @TableField(exist = false)
+    private String consultTel;
+
+    private Integer verifyStatus;
+
+    private String verifyRemark;
+
+    private String country;
+
+    private String province;
+
+    private String city;
+
+    private String entryType;
+
+    private LocalDateTime createDate;
+
+    private Integer reportRecommendStatus;
+
+    @TableField(exist = false)
+    private List<TaPersonVisitRecord> visitRecords;
+
+    @TableField(exist = false)
+    private List<String> projects;
+
+    @TableField(exist = false)
+    private Integer duration;
+
+    @TableField(exist = false)
+    private LocalDateTime visitTime;
+
+    @TableField(exist = false)
+    private Integer visitTimes;
+
+    @TableField(exist = false)
+    private TaPerson consultant;
+
+    @TableField(exist = false)
+    private String recommendName;
+
+    @TableField(exist = false)
+    private String recommendTel;
+}

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

@@ -163,7 +163,10 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setPhone(params.getString("phone"));
         taRecommendCustomer.setSex(params.getInteger("sex"));
         taRecommendCustomer.setDescribe(params.getString("describe"));
-        taRecommendCustomer.setRealtyConsultant(params.getString("realtyConsultant"));
+        taRecommendCustomer.setRecommendPerson(params.getString("recommender"));
+        taRecommendCustomer.setBuildingId(params.getString("buildingId"));
+        taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
+        taRecommendCustomer.setCreateDate(LocalDateTime.now());
 
         // 时间格式 yyyy-MM-dd
         String at = params.getString("appointmentTime");