提交

house-auth/src/main/java/com/ljq/house/auth/utils/ShiroUtils.java

@@ -0,0 +1,27 @@
+package com.ljq.house.auth.utils;
+
+import com.ljq.house.biz.model.TmAdmin;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.session.Session;
+import org.apache.shiro.subject.Subject;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2020/10/23 10:55
+ * 4
+ */
+public class ShiroUtils {
+
+    public static Session getSession() {
+        return SecurityUtils.getSubject().getSession();
+    }
+
+    public static Subject getSubject() {
+        return SecurityUtils.getSubject();
+    }
+
+    public static TmAdmin getAdmin(){
+        return (TmAdmin) SecurityUtils.getSubject().getPrincipal();
+    }
+
+}

house-auth/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+version=0.0.1-SNAPSHOT
+groupId=com.ljq.house
+artifactId=house-auth

house-biz/src/main/java/com/ljq/house/biz/dao/TmAdminDao.java

@@ -3,13 +3,9 @@ package com.ljq.house.biz.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ljq.house.biz.model.SysUser;
 import com.ljq.house.biz.model.TmAdmin;
-import com.ljq.house.biz.model.TmHouse;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author abnerhou

house-biz/src/main/java/com/ljq/house/biz/dao/TmAgencyDao.java

@@ -1,39 +1,29 @@
 package com.ljq.house.biz.dao;
 
-import com.ljq.house.biz.model.TmAgency;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ljq.house.biz.model.TmEstate;
-import com.ljq.house.biz.vo.request.TmAgencyReqVo;
-import com.ljq.house.biz.vo.request.TmEstateReqVo;
-import com.ljq.house.biz.vo.response.TmAgencyRspVo;
-import com.ljq.house.biz.vo.response.TmEstateRspVo;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ljq.house.biz.model.TmAgency;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
- * <p>
- * 经纪人信息表 Mapper 接口
- * </p>
- *
- * @author anthor
- * @since 2021-06-07
+ * @author abnerhou
+ * @date 2020/4/24 11:08
+ * @desciption
  */
-public interface TmAgencyDao extends BaseMapper<TmAgency> {
-
-    public List<TmAgencyRspVo> getList(@Param("cm") TmAgencyReqVo tmAgencyReqVo);
-
-    public Long countAll();
 
-    public int insert(@Param("cm") TmAgency tmAgency);
-
-    public int update(@Param("cm") TmAgency tmAgency);
-
-    public int del(@Param("agencyId") String agencyId, @Param("updateUserId") String updateUserId);
-
-    TmAgency selectTmAgencyById(@Param("agencyUserId") String agencyUserId);
-
-    //根据房源ID 获取经纪人
-    TmAgency selectTmAgencyByHouseId(@Param("estateId") String estateId);
+@Mapper
+public interface TmAgencyDao extends BaseMapper<TmAgency> {
 
+    public  List<TmAgency> selectTmAgencyByHouseId(@Param("houseId") String houseId);
+    public  TmAgency selectTmAgencyById(@Param("agencyUserId") String agencyUserId);
+    public Long countAll(@Param("deptId") Long deptId);
+    public int delete(@Param("agencyUserId") String agencyUserId);
+    public int updateByIdSelectively(@Param("tmAgency") TmAgency tmAgency);
+    public TmAgency setectAgencyByCondition(@Param("tmAgency") TmAgency tmAgency);
+    public IPage<Map<String ,Object>> queryAgencyList(IPage<TmAgency> page , @Param("ew") QueryWrapper<TmAgency> queryWrapper);
 }

house-biz/src/main/java/com/ljq/house/biz/dao/TmBuyingpointDao.java

@@ -1,34 +0,0 @@
-package com.ljq.house.biz.dao;
-
-import com.ljq.house.biz.model.TmBuyingpoint;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ljq.house.biz.model.TmEstate;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 物业特色 Mapper 接口
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-public interface TmBuyingpointDao extends BaseMapper<TmBuyingpoint> {
-
-    public List<TmBuyingpoint> getList(@Param("id") String id);
-
-    public Long countAll();
-
-    public int insert(@Param("cm") TmBuyingpoint tmBuyingpoint);
-
-    public int update(@Param("cm") TmBuyingpoint tmBuyingpoint);
-
-    public int del(@Param("buyingpointId") String buyingpointId);
-
-    public int delEstateId(@Param("estateId") String estateId);
-
-
-
-}

house-biz/src/main/java/com/ljq/house/biz/dao/TmCustomerInformationDao.java

@@ -0,0 +1,30 @@
+package com.ljq.house.biz.dao;
+
+import com.ljq.house.biz.model.TmCustomerInformation;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ljq.house.biz.vo.request.TmCustomerInformationReqVo;
+import com.ljq.house.biz.vo.response.TmCustomerInformationRspVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 客户信息管理 Mapper 接口
+ * </p>
+ *
+ * @author anthor
+ * @since 2021-06-08
+ */
+public interface TmCustomerInformationDao extends BaseMapper<TmCustomerInformation> {
+
+    public List<TmCustomerInformationRspVo> getList(@Param("cm") TmCustomerInformationReqVo tmCustomerInformationReqVo);
+
+    public Long countAll();
+
+    public int insert(@Param("cm") TmCustomerInformation tmCustomerInformation);
+
+    public int update(@Param("cm") TmCustomerInformation tmCustomerInformation);
+
+    public int del(@Param("customerInformationId") String customerInformationId, @Param("updateUserId") String updateUserId);
+}

house-biz/src/main/java/com/ljq/house/biz/dao/TmEstateDao.java

@@ -1,34 +0,0 @@
-package com.ljq.house.biz.dao;
-
-import com.ljq.house.biz.model.TmEstate;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ljq.house.biz.vo.request.TmEstateReqVo;
-import com.ljq.house.biz.vo.response.TmEstateRspVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 房源管理 Mapper 接口
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-public interface TmEstateDao extends BaseMapper<TmEstate> {
-
-    public List<TmEstateRspVo> getList(@Param("cm") TmEstateReqVo tmEstateReqVo);
-    public Long countAll();
-
-    public int insert(@Param("cm") TmEstate tmEstate);
-
-    public int update(@Param("cm") TmEstate tmEstate);
-
-    public int del(@Param("estateId") String estateId);
-
-    List<TmEstate> findAgencyEstate(@Param("agencyUserId") String agencyUserId);
-
-    Integer findAgencyNum(@Param("agencyUserId") String agencyUserId);
-
-}

house-biz/src/main/java/com/ljq/house/biz/dao/TmFeedbackDao.java

@@ -2,7 +2,6 @@ package com.ljq.house.biz.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ljq.house.biz.model.TmFeedback;
-import com.ljq.house.biz.model.TmHouse;
 import org.apache.ibatis.annotations.Param;
 
 /**

house-biz/src/main/java/com/ljq/house/biz/dao/TmHouseAgencyRelationDao.java

@@ -1,7 +1,6 @@
 package com.ljq.house.biz.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ljq.house.biz.model.TmHouse;
 import com.ljq.house.biz.model.TmHouseAgencyRelation;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

house-biz/src/main/java/com/ljq/house/biz/dao/TmHouseDao.java

@@ -3,10 +3,9 @@ package com.ljq.house.biz.dao;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ljq.house.biz.model.*;
+import com.ljq.house.biz.model.TmHouse;
 import org.apache.ibatis.annotations.Param;
 
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -25,8 +24,8 @@ public interface TmHouseDao extends BaseMapper<TmHouse> {
     public TmHouse selectHouseById(@Param("houseId") String houseId);
 
     public List<TmHouse> selectHouseListByIds(@Param("ids") List<String>  ids);
-    public Long countAll();
-    public Long countSceneAll();
+    public Long countAll(@Param("deptId") Long deptId);
+    public Long countSceneAll(@Param("deptId") Long deptId);
     //这个加了limit 10
     public List<TmHouse> selectAll();
 
@@ -40,4 +39,5 @@ public interface TmHouseDao extends BaseMapper<TmHouse> {
 
 
 
+
 }

house-biz/src/main/java/com/ljq/house/biz/dao/TmRegionDao.java

@@ -2,10 +2,7 @@ package com.ljq.house.biz.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ljq.house.biz.model.TmHouse;
 import com.ljq.house.biz.model.TmRegion;
-import javafx.scene.control.Pagination;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

house-biz/src/main/java/com/ljq/house/biz/dao/TmStoreDao.java

@@ -3,7 +3,6 @@ package com.ljq.house.biz.dao;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.ljq.house.biz.model.TmAgency;
 import com.ljq.house.biz.model.TmStore;
 import org.apache.ibatis.annotations.Param;
 

house-biz/src/main/java/com/ljq/house/biz/dao/TmUserDao.java

@@ -1,7 +1,6 @@
 package com.ljq.house.biz.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ljq.house.biz.model.TmHouse;
 import com.ljq.house.biz.model.TmUser;
 import org.apache.ibatis.annotations.Param;
 
@@ -28,4 +27,6 @@ public interface TmUserDao extends BaseMapper<TmUser> {
 
     public long selectTmUserCount();
 
+    List<TmUser> setectUserlist(@Param("user") TmUser user);
+
 }

house-biz/src/main/java/com/ljq/house/biz/dao/custom/MyTmAdminDao.java

@@ -0,0 +1,19 @@
+package com.ljq.house.biz.dao.custom;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ljq.house.biz.model.TmAdmin;
+import com.ljq.house.biz.vo.response.TmAdminVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * @author abnerhou
+ * @date 2020/4/23 14:31
+ * @desciption
+ */
+public interface MyTmAdminDao extends BaseMapper<TmAdmin> {
+
+   IPage<TmAdminVo> getAdminList(IPage<TmAdmin> page, @Param("ew") QueryWrapper<TmAdmin> queryWrapper);
+
+}

house-biz/src/main/java/com/ljq/house/biz/model/LoginVo.java

@@ -30,4 +30,28 @@ public class LoginVo  implements Serializable {
     @ApiModelProperty(value="微信登录数据解密的初始变量",name="iv",example="dfsdfsfxxfdsfddfasdaffa")
     private String iv;
 
+    //微信加密的敏感数据
+    @ApiModelProperty(value="微信加密的敏感数据",name="encryptedData",example="dfsdfsfxxfdsfddfasdaffa")
+    private String encryptedData;
+
+    //不包括敏感信息的原始数据字符串，用于计算签名
+    @ApiModelProperty(value="不包括敏感信息的原始数据字符串，用于计算签名",name="rawData",example="dfsdfsfxxfdsfddfasdaffa")
+    private String rawData;
+
+    //使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息
+    @ApiModelProperty(value="使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息",name="signature",example="dfsdfsfxxfdsfddfasdaffa")
+    private String signature;
+
+    @Override
+    public String toString() {
+        return "LoginVo{" +
+                "wxCode='" + wxCode + '\'' +
+                ", phoneNum='" + phoneNum + '\'' +
+                ", iv='" + iv + '\'' +
+                ", encryptedData='" + encryptedData + '\'' +
+                ", rawData='" + rawData + '\'' +
+                ", signature='" + signature + '\'' +
+                '}';
+    }
+
 }

house-biz/src/main/java/com/ljq/house/biz/model/SysAdminRole.java

@@ -32,5 +32,7 @@ public class SysAdminRole {
      */
     private Long roleId;
 
+    private Integer enable;
+
 
 }

house-biz/src/main/java/com/ljq/house/biz/model/SysDept.java

@@ -2,6 +2,7 @@ package com.ljq.house.biz.model;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -18,26 +19,27 @@ public class SysDept{
     private static final long serialVersionUID=1L;
 
     @TableId(value = "dept_id", type = IdType.AUTO)
+    @ApiModelProperty(value = "dept_id")
     private Long deptId;
 
-    /**
-     * 上级部门ID，一级部门为0
-     */
+
+    @ApiModelProperty(value = "上级部门ID，一级部门为0")
     private Long parentId;
 
-    /**
-     * 部门名称
-     */
+
+    @ApiModelProperty(value = "部门名称")
     private String name;
 
     /**
-     * 排序
+     *
      */
+    @ApiModelProperty(value = "排序")
     private Integer orderNum;
 
     /**
      * 是否删除  -1：已删除  0：正常
      */
+    @ApiModelProperty(value = "是否删除  -1：已删除  0：正常")
     private Integer delFlag;
 
 

house-biz/src/main/java/com/ljq/house/biz/model/TmAdmin.java

@@ -28,6 +28,7 @@ public class TmAdmin extends BaseEntity implements Serializable {
     private String passwd;
     private String avatar;
     private Integer enable;
+    private Long deptId;
 
 
 }

house-biz/src/main/java/com/ljq/house/biz/model/TmAgency.java

@@ -1,88 +1,127 @@
 package com.ljq.house.biz.model;
 
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.time.LocalDateTime;
 import java.io.Serializable;
-import java.util.Date;
 
 /**
- * <p>
- * 经纪人信息表
- * </p>
- *
- * @author anthor
- * @since 2021-06-07
+ * @author abnerhou
+ * @date 2020/4/24 10:55
+ * @desciption
  */
 @Data
-public class TmAgency extends Model<TmAgency> {
+@ApiModel(value = "经纪人对象" , description = "经纪人对象")
+public class TmAgency extends BaseEntity implements Serializable {
 
-    private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "经纪用户id")
     @JsonProperty("agency_user_id")
     private String agencyUserId;
 
-    @ApiModelProperty(value = "头像图片地址")
-    private String avatar;
+    @ApiModelProperty(value="微信openId",name="wx_open_id",example="dfsdfsfx443vfdsf")
+    @JsonProperty("wx_open_id")
+    private String wxOpenId;
 
-    @ApiModelProperty(value = "姓名")
+    @ApiModelProperty(value="名字",name="name",example="张三")
     private String name;
 
-    @ApiModelProperty(value = "姓英文姓名")
-    private String nameEn;
+    @ApiModelProperty(value="电话号码",name="phone",example="123454656")
+    private String phone;
 
-    @ApiModelProperty(value = "经纪人身份")
-    private String agencyIdentity;
-
-    @ApiModelProperty(value = "联系方式")
+    @ApiModelProperty(value="固话",name="tel",example="0756-454656")
     private String tel;
 
-    @ApiModelProperty(value = "门店id")
-    private Integer storeId;
+    @ApiModelProperty(value="邮箱",name="email",example="0756@qq.com")
+    private String email;
+
+    @JsonIgnore
+    @ApiModelProperty(value="密码(MD5之后)",name="passwd",example="fdasfdsaxxefsa")
+    private String passwd;
 
-    @ApiModelProperty(value = "代理公司")
-    private String agencyCompany;
+    @ApiModelProperty(value="头像图片地址",name="avatar",example="http://4dkankan.com/icon.jpg")
+    private String avatar;
 
-    @ApiModelProperty(value = "执照号码")
-    private String licenseNumber;
+    @ApiModelProperty(value="经纪公司id",name="agency_id",example="122")
+    @JsonProperty("agency_id")
+    private String agencyId;
 
-    @ApiModelProperty(value = "支持语言")
-    private String supportLanguage;
+    @ApiModelProperty(value="门店地址",name="store",example="金湾店")
+    private String store;
 
-    @ApiModelProperty(value = "电子邮箱")
-    private String email;
+    @ApiModelProperty(value="门店Id",name="store_id",example="123")
+    @JsonProperty("store_id")
+    private String storeId;
+
+    @ApiModelProperty(value="是否启用 1:启动，0：不启用",name="enable",example="1")
+    private Integer enable;
+
+    @ApiModelProperty(value="是否认证 1:认证，0：未认证",name="auth_state",example="1")
+    @JsonProperty("auth_state")
+    private String authState;
+
+    @ApiModelProperty(value="标签",name="tag",example="金牌经纪人")
+    private String tag;
 
-    @ApiModelProperty(value = "工作证图片地址")
+    @ApiModelProperty(value="经纪人公司名称",name="agency_company_name",example="珠海链家")
+    @JsonProperty("agency_company_name")
+    private String agencyCompanyName;
+
+    @ApiModelProperty(value="半年成交量",name="volume_half_year",example="30")
+    @JsonProperty("volume_half_year")
+    private int volumeHalfYear;
+
+    @ApiModelProperty(value="平均成交周期（天）",name="deal_average_period",example="20.1")
+    @JsonProperty("deal_average_period")
+    private double dealAveragePeriod;
+
+    @ApiModelProperty(value="近30天带看（套）",name="recent_recommend_vrs",example="20.1")
+    @JsonProperty("recent_recommend_vrs")
+    private int recentRecommendVrs;
+
+    @ApiModelProperty(value="工作证图片地址",name="work_pass_image",example="http://4dkankan.com/icon.jpg")
+    @JsonProperty("work_pass_image")
     private String workPassImage;
 
-    @ApiModelProperty(value = "A:正常 I:删除")
-    private String recStatus;
+    private String reserve1;
+
+    private String reserve2;
+
+    @ApiModelProperty(value="经纪人类型",name="type",example="买卖经纪人")
+    private String type;
+
+    @ApiModelProperty(value="经纪人标签图标地址",name="tag_image",example="http://4dkankan.com/icon.jpg")
+    @JsonProperty("tag_image")
+    private String tagImage;
 
-    @ApiModelProperty(value = "创建者id")
+    @ApiModelProperty(value = "创建者ID", name = "create_user_id", example = "1")
+    @JsonProperty("create_user_id")
     private String createUserId;
 
-    @ApiModelProperty(value = "创建者部门id")
+    @ApiModelProperty(value = "创建者部门ID", name = "create_user_dept_id", example = "1")
+    @JsonProperty("create_user_dept_id")
     private Long createUserDeptId;
 
-    @ApiModelProperty(value = "创建日期")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新者id")
+    @ApiModelProperty(value = "更新者ID", name = "update_user_id", example = "1")
+    @JsonProperty("update_user_id")
     private String updateUserId;
 
-    @ApiModelProperty(value = "更新日期")
-    private Date updateTime;
+    @ApiModelProperty(value="名字",name="name",example="张三")
+    @JsonProperty("e_name")
+    private String ename;
 
-    @ApiModelProperty(value="是否启用 1:启动，0：不启用",name="enable",example="1")
-    private Integer enable;
+    @ApiModelProperty(value="经纪人公司ID",name="agency_company_name",example="珠海链家")
+    @JsonProperty("agency_company_id")
+    private String agencyCompanyId;
 
-    @ApiModelProperty(value="微信openId",name="wx_open_id",example="dfsdfsfx443vfdsf")
-    @JsonProperty("wx_open_id")
-    private String wxOpenId;
+    @ApiModelProperty(value="支持语言",name="language",example="支持语言")
+    @JsonProperty("language")
+    private String language;
 
+    @ApiModelProperty(value="执照号码",name="business_id",example="执照号码")
+    @JsonProperty("business_id")
+    private String businessId;
 
 }

house-biz/src/main/java/com/ljq/house/biz/model/TmBuyingpoint.java

@@ -1,70 +0,0 @@
-package com.ljq.house.biz.model;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * <p>
- * 物业特色
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-@Data
-public class TmBuyingpoint extends Model<TmBuyingpoint> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 物业特色id
-     */
-    private String buyingpointId;
-
-    /**
-     * 房源id
-     */
-    private String estateId;
-
-    /**
-     * 房源名称
-     */
-    private String title;
-
-    /**
-     * 物业编号
-     */
-    private String content;
-
-    private String rec_status;
-
-    /**
-     * 创建者id
-     */
-    private String createUserId;
-
-    /**
-     * 创建者部门id
-     */
-    private Long createUserDeptId;
-
-    /**
-     * 创建日期
-     */
-    private Date createTime;
-
-    /**
-     * 更新者id
-     */
-    private String updateUserId;
-
-    /**
-     * 创建日期
-     */
-    private Date updateTime;
-
-
-
-}

house-biz/src/main/java/com/ljq/house/biz/model/TmCustomerInformation.java

@@ -0,0 +1,64 @@
+package com.ljq.house.biz.model;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 客户信息管理
+ * </p>
+ *
+ * @author anthor
+ * @since 2021-06-08
+ */
+@Data
+public class TmCustomerInformation extends Model<TmCustomerInformation> {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "经纪用户id")
+    private String customerInformationId;
+
+    @ApiModelProperty(value = "头像图片地址")
+    private String avatar;
+
+    @ApiModelProperty(value = "ID")
+    private String account;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "联系方式")
+    private String tel;
+
+    @ApiModelProperty(value = "授权时间")
+    private Date privilegedTime;
+
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "状态 A:正常 I:删除",hidden = true)
+    private String recStatus;
+
+    @ApiModelProperty(value = "创建者id")
+    private String createUserId;
+
+    @ApiModelProperty(value = " 创建者部门id")
+    private Long createUserDeptId;
+
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新者id")
+    private String updateUserId;
+
+    @ApiModelProperty(value = "创建日期")
+    private Date updateTime;
+
+
+}

house-biz/src/main/java/com/ljq/house/biz/model/TmEstate.java

@@ -1,190 +0,0 @@
-package com.ljq.house.biz.model;
-
-import java.math.BigDecimal;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 房源管理
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-@Data
-@Table(name = "tm_estate")
-public class TmEstate extends Model<TmEstate> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 房源id
-     */
-    @Column(name = "estate_id")
-    private String estateId;
-
-    /**
-     * 房源名称
-     */
-    private String estateName;
-
-    /**
-     * 物业编号
-     */
-    private String propertyNumber;
-
-    /**
-     * 总售价
-     */
-    private String totalPrice;
-
-    /**
-     * 地址
-     */
-    private String address;
-
-    /**
-     * 卧室数量
-     */
-    private String bedroomAmount;
-
-    /**
-     * 浴室
-     */
-    private String showerroomAmount;
-
-    /**
-     * 建筑面积
-     */
-    private BigDecimal buildingArea;
-
-    /**
-     * 占地面积
-     */
-    private BigDecimal floorSpace;
-
-    /**
-     * 建设年份
-     */
-    private String constructionYear;
-
-    /**
-     * 单位价格
-     */
-    private BigDecimal unitPrice;
-
-    /**
-     * 房源标签  0:云看房 1:随时可看
-     */
-    private String houseLabel;
-
-    /**
-     * 配套设施
-     */
-    private String ancillaryFacility;
-
-    /**
-     * 是否关联经纪人  1：关联  0：不关联
-     */
-    private String isAgentRelation;
-
-    /**
-     * 经纪人 id
-     */
-    private String agencyUserId;
-
-    /**
-     * 售卖状态  1：在售  0：停售
-     */
-    private String sellType;
-
-    /**
-     * 场景地址
-     */
-    private String sceneAddress;
-
-    /**
-     * 附加信息图地址
-     */
-    @TableField("ADDITIONS_IMAGES")
-    private String additionsImages;
-
-    /**
-     * 房源封面照片地址
-     */
-    private String coverImage;
-
-    /**
-     * 房源照片地址
-     */
-    private String hourseImage;
-
-    /**
-     * 视频简介封面照片地址
-     */
-    private String videoCoverImage;
-
-    /**
-     * 视频简介地址
-     */
-    private String introduceVideo;
-
-    /**
-     * 视频简介描述
-     */
-    private String introduceVideoDesc;
-
-    /**
-     * 标题
-     */
-    private String title;
-
-    /**
-     * 内容介绍
-     */
-    private String contentIntroduce;
-
-    private String recStatus;
-
-    /**
-     * 创建者id
-     */
-    private String createUserId;
-
-    /**
-     * 创建者部门id
-     */
-    private Long createUserDeptId;
-
-    /**
-     * 创建日期
-     */
-    private Date createTime;
-
-    /**
-     * 更新者id
-     */
-    private String updateUserId;
-
-    /**
-     * 创建日期
-     */
-    private Date updateTime;
-
-    /**
-     * 卖点
-     */
-    private List<TmBuyingpoint> tmBuyingpoint;
-
-
-
-}

house-biz/src/main/java/com/ljq/house/biz/model/TmHouse.java

@@ -1,5 +1,6 @@
 package com.ljq.house.biz.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -200,4 +201,46 @@ public class TmHouse extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "微信小程序二维码链接", name = "wx_aqr_code", example = "xxx.com/1.jpg")
     @JsonProperty("wx_aqr_code")
     private String wxAqrCode;
+
+
+    @ApiModelProperty(value = "建筑面积")
+    private BigDecimal buildingArea;
+
+    @ApiModelProperty(value = "占地面积")
+    private BigDecimal floorSpace;
+
+    @ApiModelProperty(value = "建设年份")
+    private String constructionYear;
+
+    @ApiModelProperty(value = "物业编号")
+    private String propertyNumber;
+
+    @ApiModelProperty(value = "卧室数量")
+    private String bedroomAmount;
+
+    @ApiModelProperty(value = "浴室")
+    private String showerroomAmount;
+
+    @ApiModelProperty(value = "配套设施")
+    private String ancillaryFacility;
+
+    @ApiModelProperty(value = "房源标签  0:云看房 1:随时可看")
+    private String houseLabel;
+
+    @ApiModelProperty(value = "售卖状态  1：在售  0：停售")
+    private String sellType;
+
+    @ApiModelProperty(value = "视频简介描述")
+    @JsonProperty("introduce_video_desc")
+    private String introduceVideoDesc;
+
+    @TableField("ADDITIONS_IMAGES")
+    @ApiModelProperty(value = "附加信息图地址")
+    @JsonProperty("additions_images")
+    private String additionsImages;
+
+    @TableField("ADDITIONS_IMAGES")
+    @ApiModelProperty(value = "附加信息图地址 封面")
+    @JsonProperty("cover_additions_images ")
+    private String coverAdditionsImages;
 }

house-biz/src/main/java/com/ljq/house/biz/model/TmUser.java

@@ -29,7 +29,7 @@ public class TmUser extends BaseEntity implements Serializable {
     @JsonIgnore
     private String passwd;
     private String avatar;
-    private String enable;
+    private Integer enable;
     private String salt;
     private String gender;
 

house-biz/src/main/java/com/ljq/house/biz/model/dto/WxUserInfoDto.java

@@ -0,0 +1,41 @@
+package com.ljq.house.biz.model.dto;
+
+import lombok.Data;
+
+/**
+ * @author abnerhou
+ * @date 2020/7/7 10:48
+ * @desciption
+ */
+@Data
+public class WxUserInfoDto {
+
+    /**
+     * openId : OPENID
+     * nickName : NICKNAME
+     * gender : GENDER
+     * city : CITY
+     * province : PROVINCE
+     * country : COUNTRY
+     * avatarUrl : AVATARURL
+     * unionId : UNIONID
+     * watermark : {"appid":"APPID","timestamp":"TIMESTAMP"}
+     */
+
+    @com.alibaba.fastjson.annotation.JSONField(name = "openId")
+    private String openId;
+    @com.alibaba.fastjson.annotation.JSONField(name = "nickName")
+    private String nickName;
+    @com.alibaba.fastjson.annotation.JSONField(name = "gender")
+    private Integer gender;
+    @com.alibaba.fastjson.annotation.JSONField(name = "city")
+    private String city;
+    @com.alibaba.fastjson.annotation.JSONField(name = "province")
+    private String province;
+    @com.alibaba.fastjson.annotation.JSONField(name = "country")
+    private String country;
+    @com.alibaba.fastjson.annotation.JSONField(name = "avatarUrl")
+    private String avatarUrl;
+    @com.alibaba.fastjson.annotation.JSONField(name = "unionId")
+    private String unionId;
+}

house-biz/src/main/java/com/ljq/house/biz/service/ITmAgencyService.java

@@ -1,37 +0,0 @@
-package com.ljq.house.biz.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ljq.house.biz.model.TmAgency;
-import com.ljq.house.biz.model.TmEstate;
-import com.ljq.house.biz.vo.request.TmAgencyReqVo;
-import com.ljq.house.biz.vo.request.TmEstateReqVo;
-import com.ljq.house.biz.vo.response.TmAgencyRspVo;
-import com.ljq.house.biz.vo.response.TmEstateRspVo;
-import com.ljq.house.biz.vo.util.Page;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 房源管理 服务类
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-public interface ITmAgencyService extends IService<TmEstate> {
-
-    public Page<TmAgencyRspVo> getList(TmAgencyReqVo tmAgencyReqVo);
-
-    public int insert(TmAgency tmAgency);
-
-    public int update(TmAgency tmAgency);
-
-    public int del(String agencyUserId);
-
-    TmAgency selectTmAgencyById( String agencyUserId);
-
-    //根据房源ID 获取经纪人
-    TmAgency selectTmAgencyByHouseId(String estateId);
-}

house-biz/src/main/java/com/ljq/house/biz/service/ITmBuyingpointService.java

@@ -1,33 +0,0 @@
-package com.ljq.house.biz.service;
-
-import com.ljq.house.biz.model.TmBuyingpoint;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ljq.house.biz.model.TmEstate;
-import com.ljq.house.biz.vo.request.TmEstateReqVo;
-import com.ljq.house.biz.vo.response.TmBuyingpointRspVo;
-import com.ljq.house.biz.vo.response.TmEstateRspVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 物业特色 服务类
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-public interface ITmBuyingpointService extends IService<TmBuyingpoint> {
-
-    public List<TmBuyingpoint> getList(@Param("id") String id);
-
-    public int insert(TmBuyingpoint tmBuyingpoint);
-
-    public int update(TmBuyingpoint tmBuyingpoint);
-
-    public int del(String buyingpointId);
-
-    public int delEstateId(String estateId);
-
-}

house-biz/src/main/java/com/ljq/house/biz/service/ITmCustomerInformationService.java

@@ -0,0 +1,28 @@
+package com.ljq.house.biz.service;
+
+import com.ljq.house.biz.model.TmCustomerInformation;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ljq.house.biz.vo.request.DeleteRequestVo;
+import com.ljq.house.biz.vo.request.TmCustomerInformationReqVo;
+import com.ljq.house.biz.vo.response.TmCustomerInformationRspVo;
+import com.ljq.house.biz.vo.util.Page;
+
+/**
+ * <p>
+ * 客户信息管理 服务类
+ * </p>
+ *
+ * @author anthor
+ * @since 2021-06-08
+ */
+public interface ITmCustomerInformationService extends IService<TmCustomerInformation> {
+
+    public Page<TmCustomerInformationRspVo> getList(TmCustomerInformationReqVo tmCustomerInformationReqVo);
+
+    public int insert(TmCustomerInformation tmCustomerInformation);
+
+    public int update(TmCustomerInformation tmCustomerInformation);
+
+    public int del(DeleteRequestVo requestVo);
+
+}

house-biz/src/main/java/com/ljq/house/biz/service/ITmEstateService.java

@@ -1,34 +0,0 @@
-package com.ljq.house.biz.service;
-
-import com.ljq.house.biz.model.TmEstate;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ljq.house.biz.vo.request.TmEstateReqVo;
-import com.ljq.house.biz.vo.response.TmEstateRspVo;
-import com.ljq.house.biz.vo.util.Page;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * <p>
- * 房源管理 服务类
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-public interface ITmEstateService extends IService<TmEstate> {
-
-    public Page<TmEstateRspVo> getList(TmEstateReqVo tmEstateReqVo);
-
-    public int insert(TmEstate tmEstate);
-
-    public int update(TmEstate tmEstate);
-
-    public int del(String agencyUserId);
-
-    List<TmEstate> findAgencyEstate(@Param("agencyUserId") String agencyUserId);
-
-    Integer findAgencyNum(@Param("agencyUserId") String agencyUserId);
-
-}

house-biz/src/main/java/com/ljq/house/biz/service/impl/TmAgencyServiceImpl.java

@@ -1,95 +0,0 @@
-package com.ljq.house.biz.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ljq.house.biz.dao.TmAgencyDao;
-import com.ljq.house.biz.dao.TmBuyingpointDao;
-import com.ljq.house.biz.dao.TmEstateDao;
-import com.ljq.house.biz.model.TmAgency;
-import com.ljq.house.biz.model.TmBuyingpoint;
-import com.ljq.house.biz.model.TmEstate;
-import com.ljq.house.biz.service.ITmAgencyService;
-import com.ljq.house.biz.service.ITmBuyingpointService;
-import com.ljq.house.biz.service.ITmEstateService;
-import com.ljq.house.biz.vo.request.TmAgencyReqVo;
-import com.ljq.house.biz.vo.request.TmEstateReqVo;
-import com.ljq.house.biz.vo.response.TmAgencyRspVo;
-import com.ljq.house.biz.vo.response.TmEstateRspVo;
-import com.ljq.house.biz.vo.util.IdStarterEnum2;
-import com.ljq.house.biz.vo.util.Page;
-import com.ljq.house.biz.vo.util.UUidGenerator2;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 房源管理 服务实现类
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-@Service
-public class TmAgencyServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> implements ITmAgencyService {
-
-    @Autowired
-    private TmAgencyDao tmAgencyDao;
-
-    @Autowired
-    private ITmEstateService iTmEstateService;
-
-
-    @Override
-    public Page<TmAgencyRspVo> getList(TmAgencyReqVo tmAgencyReqVo) {
-
-        tmAgencyReqVo.setLimit(tmAgencyReqVo.getPageSize());
-        tmAgencyReqVo.setOffset((tmAgencyReqVo.getCurrPage() - 1) * tmAgencyReqVo.getPageSize());
-
-        List<TmAgencyRspVo> tmAgencyRspVoList = tmAgencyDao.getList(tmAgencyReqVo);
-        if(tmAgencyRspVoList!=null && tmAgencyRspVoList.size()>0){
-            for(TmAgencyRspVo ter:tmAgencyRspVoList){
-                ter.setEstateNum(iTmEstateService.findAgencyNum(ter.getAgencyUserId()));
-            }
-        }
-
-        Long total = tmAgencyDao.countAll();
-        Page<TmAgencyRspVo> tmAgencyRspVoPage = new Page<>();
-        tmAgencyRspVoPage.setCurrentPage(tmAgencyReqVo.getCurrPage());
-        tmAgencyRspVoPage.setCurrentCount(tmAgencyReqVo.getPageSize());
-        tmAgencyRspVoPage.setTotalCount(total);
-        tmAgencyRspVoPage.setProductList(tmAgencyRspVoList);
-
-        return tmAgencyRspVoPage;
-    }
-
-    @Override
-    public int insert(TmAgency tmAgency) {
-
-        tmAgency.setAgencyUserId(UUidGenerator2.generatorUuid(IdStarterEnum2.AGENCY.getStarter()));
-        return tmAgencyDao.insert(tmAgency);
-    }
-
-    @Override
-    public int update(TmAgency tmAgency) {
-        return tmAgencyDao.update(tmAgency);
-    }
-
-    @Override
-    public int del(String agencyUserId) {
-        return tmAgencyDao.del(agencyUserId,"");
-    }
-
-    @Override
-    public TmAgency selectTmAgencyById(String agencyUserId){
-        return tmAgencyDao.selectTmAgencyById(agencyUserId);
-    }
-
-    //根据房源ID 获取经纪人
-    @Override
-    public TmAgency selectTmAgencyByHouseId(String estateId){
-        return tmAgencyDao.selectTmAgencyByHouseId(estateId);
-    }
-}

house-biz/src/main/java/com/ljq/house/biz/service/impl/TmBuyingpointServiceImpl.java

@@ -1,58 +0,0 @@
-package com.ljq.house.biz.service.impl;
-
-import com.ljq.house.biz.model.TmBuyingpoint;
-import com.ljq.house.biz.dao.TmBuyingpointDao;
-import com.ljq.house.biz.service.ITmBuyingpointService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ljq.house.biz.vo.util.IdStarterEnum2;
-import com.ljq.house.biz.vo.util.UUidGenerator2;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * <p>
- * 物业特色 服务实现类
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-@Service
-public class TmBuyingpointServiceImpl extends ServiceImpl<TmBuyingpointDao, TmBuyingpoint> implements ITmBuyingpointService {
-
-    @Autowired
-    private TmBuyingpointDao tmBuyingpointDao;
-
-    @Override
-    public List<TmBuyingpoint> getList(String id) {
-        return tmBuyingpointDao.getList(id);
-    }
-
-    @Override
-    public int insert(TmBuyingpoint tmBuyingpoint) {
-        tmBuyingpoint.setBuyingpointId(UUidGenerator2.generatorUuid(IdStarterEnum2.AGENCY.getStarter()));
-        tmBuyingpoint.setCreateTime(new Date());
-        tmBuyingpoint.setUpdateTime(new Date());
-        return tmBuyingpointDao.insert(tmBuyingpoint);
-    }
-
-    @Override
-    public int update(TmBuyingpoint tmBuyingpoint) {
-        return tmBuyingpointDao.update(tmBuyingpoint);
-    }
-
-    @Override
-    public int del(String buyingpointId) {
-        return tmBuyingpointDao.del(buyingpointId);
-    }
-
-    @Override
-    public int delEstateId(String estateId) {
-        return tmBuyingpointDao.delEstateId(estateId);
-    }
-
-
-}

house-biz/src/main/java/com/ljq/house/biz/service/impl/TmCustomerInformationServiceImpl.java

@@ -0,0 +1,70 @@
+package com.ljq.house.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ljq.house.biz.dao.TmCustomerInformationDao;
+import com.ljq.house.biz.model.TmCustomerInformation;
+import com.ljq.house.biz.service.ITmCustomerInformationService;
+import com.ljq.house.biz.vo.request.DeleteRequestVo;
+import com.ljq.house.biz.vo.request.TmCustomerInformationReqVo;
+import com.ljq.house.biz.vo.response.TmCustomerInformationRspVo;
+import com.ljq.house.biz.vo.util.IdStarterEnum2;
+import com.ljq.house.biz.vo.util.Page;
+import com.ljq.house.biz.vo.util.UUidGenerator2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 客户信息管理 服务实现类
+ * </p>
+ *
+ * @author anthor
+ * @since 2021-06-08
+ */
+@Service
+public class TmCustomerInformationServiceImpl extends ServiceImpl<TmCustomerInformationDao, TmCustomerInformation> implements ITmCustomerInformationService {
+
+    @Autowired
+    private TmCustomerInformationDao tmCustomerInformationDao;
+
+    @Override
+    public Page<TmCustomerInformationRspVo> getList(TmCustomerInformationReqVo tmCustomerInformationReqVo) {
+
+        tmCustomerInformationReqVo.setLimit(tmCustomerInformationReqVo.getPage_size());
+        tmCustomerInformationReqVo.setOffset((tmCustomerInformationReqVo.getPage_num() - 1) * tmCustomerInformationReqVo.getPage_size());
+        List<TmCustomerInformationRspVo> tmCustomerInformationRspVoList = tmCustomerInformationDao.getList(tmCustomerInformationReqVo);
+
+        Long total = tmCustomerInformationDao.countAll();
+        Integer totalPage = (int) (total / tmCustomerInformationReqVo.getPage_size() + ((total % tmCustomerInformationReqVo.getPage_size() == 0) ? 0 : 1));
+        Page<TmCustomerInformationRspVo> tmCustomerInformationRspVoPage = new Page<>();
+        tmCustomerInformationRspVoPage.setCurPage(tmCustomerInformationReqVo.getPage_num());
+        tmCustomerInformationRspVoPage.setTotalPageNum(totalPage);
+        tmCustomerInformationRspVoPage.setTotalNum(total);
+        tmCustomerInformationRspVoPage.setList(tmCustomerInformationRspVoList);
+
+        return tmCustomerInformationRspVoPage;
+    }
+
+    @Override
+    public int insert(TmCustomerInformation tmCustomerInformation) {
+        tmCustomerInformation.setCustomerInformationId(UUidGenerator2.generatorUuid(IdStarterEnum2.AGENCY.getStarter()));
+        return tmCustomerInformationDao.insert(tmCustomerInformation);
+    }
+
+    @Override
+    public int update(TmCustomerInformation tmCustomerInformation) {
+
+        return tmCustomerInformationDao.update(tmCustomerInformation);
+    }
+
+    @Override
+    public int del(DeleteRequestVo requestVo) {
+        List<String> estateIdList = requestVo.getStrIds();
+        for(String id:estateIdList){
+            tmCustomerInformationDao.del(id,"");
+        }
+        return 0;
+    }
+}

house-biz/src/main/java/com/ljq/house/biz/service/impl/TmEstateServiceImpl.java

@@ -1,119 +0,0 @@
-package com.ljq.house.biz.service.impl;
-
-import com.ljq.house.biz.dao.TmBuyingpointDao;
-import com.ljq.house.biz.model.TmBuyingpoint;
-import com.ljq.house.biz.model.TmEstate;
-import com.ljq.house.biz.dao.TmEstateDao;
-import com.ljq.house.biz.service.ITmBuyingpointService;
-import com.ljq.house.biz.service.ITmEstateService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ljq.house.biz.vo.request.TmEstateReqVo;
-import com.ljq.house.biz.vo.response.TmEstateRspVo;
-import com.ljq.house.biz.vo.util.Page;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * <p>
- * 房源管理 服务实现类
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-@Service
-public class TmEstateServiceImpl extends ServiceImpl<TmEstateDao, TmEstate> implements ITmEstateService {
-
-    @Autowired
-    private TmEstateDao tmEstateDao;
-
-    @Autowired
-    private TmBuyingpointDao tmBuyingpointDao;
-
-    @Autowired
-    private ITmBuyingpointService iTmBuyingpointService;
-
-
-    @Override
-    public Page<TmEstateRspVo> getList(TmEstateReqVo tmEstateReqVo) {
-
-        tmEstateReqVo.setLimit(tmEstateReqVo.getPageSize());
-        tmEstateReqVo.setOffset((tmEstateReqVo.getCurrPage() - 1) * tmEstateReqVo.getPageSize());
-
-        List<TmEstateRspVo> tmEstateRspVoList = tmEstateDao.getList(tmEstateReqVo);
-        List<TmBuyingpoint> tmBuyingpointList = new ArrayList<>();
-        if(tmEstateRspVoList!=null && tmEstateRspVoList.size()>0){
-            for(TmEstateRspVo ter:tmEstateRspVoList){
-                tmBuyingpointList = new ArrayList<>();
-                tmBuyingpointList = tmBuyingpointDao.getList(ter.getEstateId());
-                if(tmBuyingpointList !=null && tmBuyingpointList.size()>0){
-                    ter.setTmBuyingpoint(tmBuyingpointList);
-                }
-
-
-
-
-            }
-        }
-
-        Long total = tmEstateDao.countAll();
-        Page<TmEstateRspVo> tmEstateRspVoPage = new Page<>();
-        tmEstateRspVoPage.setCurrentPage(tmEstateReqVo.getCurrPage());
-        tmEstateRspVoPage.setCurrentCount(tmEstateReqVo.getPageSize());
-        tmEstateRspVoPage.setTotalCount(total);
-        tmEstateRspVoPage.setProductList(tmEstateRspVoList);
-
-        return tmEstateRspVoPage;
-    }
-
-    @Override
-    public int insert(TmEstate tmEstate) {
-
-        tmEstateDao.insert(tmEstate);
-
-        List<TmBuyingpoint> tmBuyingpointList = tmEstate.getTmBuyingpoint();
-        if(tmBuyingpointList!=null && tmBuyingpointList.size()>0){
-            for(TmBuyingpoint tbp:tmBuyingpointList){
-                tbp.setEstateId(tmEstate.getEstateId());
-                iTmBuyingpointService.insert(tbp);
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public int update(TmEstate tmEstate) {
-
-        if(tmEstate!=null && tmEstate.getTmBuyingpoint()!=null && tmEstate.getTmBuyingpoint().size()>0){
-            List<TmBuyingpoint> tmBuyingpointList = tmEstate.getTmBuyingpoint();
-            for(TmBuyingpoint tbp:tmBuyingpointList){
-                iTmBuyingpointService.update(tbp);
-            }
-        }
-        return tmEstateDao.update(tmEstate);
-    }
-
-    @Override
-    public int del(String estateId) {
-        iTmBuyingpointService.delEstateId(estateId);
-        return tmEstateDao.del(estateId);
-    }
-
-    @Override
-    public List<TmEstate> findAgencyEstate(String agencyUserId) {
-        return tmEstateDao.findAgencyEstate(agencyUserId);
-    }
-
-    @Override
-    public Integer findAgencyNum(String agencyUserId) {
-        Integer num = tmEstateDao.findAgencyNum(agencyUserId);
-        if(num == null ){
-            num = 0;
-        }
-        return num;
-    }
-}

house-biz/src/main/java/com/ljq/house/biz/vo/request/OpenApiRequestVo.java

@@ -0,0 +1,23 @@
+package com.ljq.house.biz.vo.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author abnerhou
+ * @date 2020/6/16 14:43
+ * @desciption
+ */
+@Data
+@ApiModel(value = "开放api通知请求实体" , description = "开放api通知请求实体")
+public class OpenApiRequestVo {
+
+    private String fromId;
+    private String toId;
+    private String appId;
+    private String sceneNum;
+    private String link;
+    private LocalDateTime time;
+}

house-biz/src/main/java/com/ljq/house/biz/vo/request/TmAgencyReqVo.java

@@ -3,6 +3,8 @@ package com.ljq.house.biz.vo.request;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class TmAgencyReqVo {
 
@@ -13,10 +15,13 @@ public class TmAgencyReqVo {
     private String gjz;
 
     @ApiModelProperty(value = "每页显示的条目数")
-    private Integer pageSize;
+    private Integer page_size;
+
+    @ApiModelProperty(value = "当前显示的页数")
+    private Integer page_num;
 
     @ApiModelProperty(value = "当前显示的页数")
-    private Integer currPage;
+    private Integer current;
 
     @ApiModelProperty(value = "",hidden = true)
     private Integer limit;
@@ -24,4 +29,7 @@ public class TmAgencyReqVo {
     @ApiModelProperty(value = "",hidden = true)
     private Integer offset;
 
+    @ApiModelProperty(value = "经纪人 id")
+    private List<String> agencyUserIdList;
+
 }

house-biz/src/main/java/com/ljq/house/biz/vo/request/TmBuyingpointReqVo.java

@@ -1,70 +0,0 @@
-package com.ljq.house.biz.vo.request;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 物业特色
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-@Data
-public class TmBuyingpointReqVo extends Model<TmBuyingpointReqVo> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 物业特色id
-     */
-    private String buyingpointId;
-
-    /**
-     * 房源id
-     */
-    private String estateId;
-
-    /**
-     * 房源名称
-     */
-    private String title;
-
-    /**
-     * 物业编号
-     */
-    private String content;
-
-    private String rec_status;
-
-    /**
-     * 创建者id
-     */
-    private String createUserId;
-
-    /**
-     * 创建者部门id
-     */
-    private Long createUserDeptId;
-
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者id
-     */
-    private String updateUserId;
-
-    /**
-     * 创建日期
-     */
-    private LocalDateTime updateTime;
-
-
-
-}

house-biz/src/main/java/com/ljq/house/biz/vo/request/TmCustomerInformationReqVo.java

@@ -0,0 +1,45 @@
+package com.ljq.house.biz.vo.request;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 客户信息管理
+ * </p>
+ *
+ * @author anthor
+ * @since 2021-06-08
+ */
+@Data
+public class TmCustomerInformationReqVo {
+
+
+    @ApiModelProperty(value = "ID")
+    private String account;
+
+    @ApiModelProperty(value = "每页显示的条目数")
+    private Integer page_size;
+
+    @ApiModelProperty(value = "当前显示的页数")
+    private Integer page_num;
+
+    @ApiModelProperty(value = "当前显示的页数")
+    private Integer current;
+
+    @ApiModelProperty(value = "",hidden = true)
+    private Integer limit;
+
+    @ApiModelProperty(value = "",hidden = true)
+    private Integer offset;
+
+
+    @ApiModelProperty(value = "客户管理 id")
+    private List<String> customerInformationIdList;
+
+
+}

house-biz/src/main/java/com/ljq/house/biz/vo/request/TmEstateReqVo.java

@@ -1,37 +0,0 @@
-package com.ljq.house.biz.vo.request;
-
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Table;
-
-@Data
-@Api(description = "")
-public class TmEstateReqVo {
-
-
-    @ApiModelProperty(value = "房源名称")
-    private String estateName;
-
-    @ApiModelProperty(value = "物业编号")
-    private String propertyNumber;
-
-    @ApiModelProperty(value = "每页显示的条目数")
-    private Integer pageSize;
-
-    @ApiModelProperty(value = "当前显示的页数")
-    private Integer currPage;
-
-    @ApiModelProperty(value = "",hidden = true)
-    private Integer limit;
-
-    @ApiModelProperty(value = "",hidden = true)
-    private Integer offset;
-
-
-
-
-}

house-biz/src/main/java/com/ljq/house/biz/vo/response/TmAdminVo.java

@@ -0,0 +1,40 @@
+package com.ljq.house.biz.vo.response;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import java.util.Date;
+
+/**
+ * 2 * @Author: Abner
+ * 3 * @Date: 2020/10/30 13:23
+ * 4
+ */
+@Data
+public class TmAdminVo {
+
+    private String adminId;
+
+    private Integer type;
+
+    private String name;
+    private String phone;
+    private String email;
+    private String passwd;
+    private String avatar;
+    private Integer enable;
+    //    @JsonProperty("dept_id")
+    private Long deptId;
+
+    private String deptName;
+
+    @Temporal(TemporalType.DATE)
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private Date lastModifyDatetime;
+}

house-biz/src/main/java/com/ljq/house/biz/vo/response/TmAgencyRspVo.java

@@ -1,20 +1,17 @@
 package com.ljq.house.biz.vo.response;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ljq.house.biz.model.TmAgency;
-import com.ljq.house.biz.model.TmEstate;
-import com.ljq.house.biz.model.TmStore;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class TmAgencyRspVo extends TmAgency {
 
 
-    @ApiModelProperty(value = "门店名称")
-    private TmStore tmStore;
+    @JsonProperty("house_num")
+    private Integer houseNum;
 
-    @ApiModelProperty(value = "房源数量")
-    private Integer estateNum;
+    @JsonProperty("user_num")
+    private Integer userNum;
 
 }

house-biz/src/main/java/com/ljq/house/biz/vo/response/TmBuyingpoint.java

@@ -1,4 +0,0 @@
-package com.ljq.house.biz.vo.response;
-
-public class TmBuyingpoint {
-}

house-biz/src/main/java/com/ljq/house/biz/vo/response/TmBuyingpointRspVo.java

@@ -1,70 +0,0 @@
-package com.ljq.house.biz.vo.response;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 物业特色
- * </p>
- *
- * @author anthor
- * @since 2021-06-03
- */
-@Data
-public class TmBuyingpointRspVo extends Model<TmBuyingpointRspVo> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 物业特色id
-     */
-    private String buyingpointId;
-
-    /**
-     * 房源id
-     */
-    private String estateId;
-
-    /**
-     * 房源名称
-     */
-    private String title;
-
-    /**
-     * 物业编号
-     */
-    private String content;
-
-    private String rec_status;
-
-    /**
-     * 创建者id
-     */
-    private String createUserId;
-
-    /**
-     * 创建者部门id
-     */
-    private Long createUserDeptId;
-
-    /**
-     * 创建日期
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 更新者id
-     */
-    private String updateUserId;
-
-    /**
-     * 创建日期
-     */
-    private LocalDateTime updateTime;
-
-    
-
-}

house-biz/src/main/java/com/ljq/house/biz/vo/response/TmCustomerInformationRspVo.java

@@ -0,0 +1,19 @@
+package com.ljq.house.biz.vo.response;
+
+import com.ljq.house.biz.model.TmCustomerInformation;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * <p>
+ * 客户信息管理
+ * </p>
+ *
+ * @author anthor
+ * @since 2021-06-08
+ */
+public class TmCustomerInformationRspVo extends TmCustomerInformation {
+
+    @ApiModelProperty(value = "账号名称")
+    private String account;
+
+}

house-biz/src/main/java/com/ljq/house/biz/vo/response/TmEstateRspVo.java

@@ -1,14 +0,0 @@
-package com.ljq.house.biz.vo.response;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.ljq.house.biz.model.TmEstate;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-public class TmEstateRspVo extends TmEstate {
-
-
-}

house-biz/src/main/java/com/ljq/house/biz/vo/util/Page.java

@@ -9,16 +9,16 @@ import java.util.List;
 @Data
 public class Page<T> {
     //当前页
-    private int currentPage;
-    //当前显示条数
-    private int currentCount;
+    private Integer curPage;
 
     //总条数
-    private long totalCount;
+    private long totalNum;
 
+    //总页数
+    private Integer totalPageNum;
 
     //每页显示的数据
-    private List<T> productList = new ArrayList();
+    private List<T> list = new ArrayList();
 
 
 

house-biz/src/main/resources/mapper/SysDeptDao.xml

@@ -2,4 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ljq.house.biz.dao.SysDeptDao">
 
+
+
+
+
+
 </mapper>

house-biz/src/main/resources/mapper/TmAgencyDap.xml

@@ -1,172 +0,0 @@
-<?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.ljq.house.biz.dao.TmAgencyDao">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ljq.house.biz.model.TmAgency">
-        <id column="agency_user_id" property="agencyUserId" />
-        <result column="avatar" property="avatar" />
-        <result column="name" property="name" />
-        <result column="name_en" property="nameEn" />
-        <result column="agency_identity" property="agencyIdentity" />
-        <result column="tel" property="tel" />
-        <result column="store_id" property="storeId" />
-        <result column="agency_company" property="agencyCompany" />
-        <result column="license_number" property="licenseNumber" />
-        <result column="support_language" property="supportLanguage" />
-        <result column="email" property="email" />
-        <result column="work_pass_image" property="workPassImage" />
-        <result column="rec_status" property="recStatus" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_user_dept_id" property="createUserDeptId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_user_id" property="updateUserId" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        agency_id, avatar, name, name_en, agency_identity, tel, store_id, agency_company, license_number, support_language, email, work_pass_image, rec_status, create_user_id, create_user_dept_id, create_time, update_user_id, update_time
-    </sql>
-
-
-    <select id="getList" resultType="com.ljq.house.biz.vo.response.TmAgencyRspVo">
-       SELECT *
-         FROM tm_agency
-        WHERE rec_status = 'A'
-          AND store_id = 11
-        <if test=" cm.gjz != null  and cm.gjz.trim!='' ">
-        AND (name LIKE CONCAT('%',#{gjz},'%')
-             OR name_en LIKE CONCAT('%',#{gjz},'%')
-             OR license_number LIKE CONCAT('%',#{gjz},'%'))
-        </if>
-        order by create_time desc
-        <if test=" cm.limit != null  and cm.offset != null ">
-            limit #{cm.limit} offset #{cm.offset}
-        </if>
-    </select>
-
-    <select id="countAll" resultType="java.lang.Long">
-        select count(*)
-        from tm_agency
-        where rec_status = 'A'
-    </select>
-
-
-    <select id="selectTmAgencyById" resultType="com.ljq.house.biz.model.TmAgency">
-        select *
-          from tm_agency
-        <where>
-            <if test="agencyUserId != null and agencyUserId.trim() != '' ">
-                and agency_user_id = #{agencyUserId}
-            </if>
-        </where>
-        limit 1
-    </select>
-
-    <insert id="insert" parameterType="com.ljq.house.biz.model.TmAgency">
-
-        INSERT INTO tm_agency
-        (
-         agencyUserId
-        ,avatar
-        ,name
-        ,name_en
-        ,agency_identity
-        ,tel
-        ,store_id
-        ,agency_company
-        ,license_number
-        ,support_language
-        ,email
-        ,work_pass_image
-        ,rec_status
-        ,create_user_id
-        ,create_user_dept_id
-        ,create_time
-        ,update_user_id
-        ,update_time
-        ,enable
-        ,wx_open_id
-        )
-        VALUES
-        (
-         #{cm.agencyUserId}
-        ,#{cm.avatar}
-        ,#{cm.name}
-        ,#{cm.nameEn}
-        ,#{cm.agencyIdentity}
-        ,#{cm.tel}
-        ,#{cm.storeId}
-        ,#{cm.agencyCompany}
-        ,#{cm.licenseNumber}
-        ,#{cm.supportLanguage}
-        ,#{cm.email}
-        ,#{cm.workPassImage}
-        ,#{cm.recStatus}
-        ,#{cm.createUserId}
-        ,#{cm.createUserDeptId}
-        ,#{cm.createTime}
-        ,#{cm.updateUserId}
-        ,#{cm.updateTime}
-        ,'A'
-        ,#{cm.createUserId}
-        ,#{cm.createUserDeptId}
-        ,now()
-        ,#{cm.updateUserId}
-        ,now()
-        ,#{enable}
-        ,#{wxOpenId}
-        )
-    </insert>
-
-
-    <update id="update" parameterType="com.ljq.house.biz.model.TmAgency">
-        update tm_agency
-        <set>
-            <if test="cm.avatar != null and cm.avatar.trim() != ''">avatar = #{cm.avatar},</if>
-            <if test="cm.name != null and cm.name.trim() != ''">name = #{cm.avatar},</if>
-            <if test="cm.nameEn != null and cm.nameEn.trim() != ''">name_en = #{cm.nameEn},</if>
-            <if test="cm.agencyIdentity != null and cm.agencyIdentity.trim() != ''">agency_identity = #{cm.agencyIdentity},</if>
-            <if test="cm.tel != null and cm.tel.trim() != ''">tel = #{cm.tel},</if>
-            <if test="cm.storeId != null">store_id = #{cm.storeId},</if>
-            <if test="cm.agencyCompany != null and cm.agencyCompany.trim() != ''">agency_company = #{cm.agencyCompany},</if>
-            <if test="cm.licenseNumber != null and cm.licenseNumber.trim() != ''">license_number = #{cm.licenseNumber},</if>
-            <if test="cm.supportLanguage != null and cm.supportLanguage.trim() != ''">support_language = #{cm.supportLanguage},</if>
-            <if test="cm.email != null and cm.email.trim() != ''">email = #{cm.email},</if>
-            <if test="cm.workPassImage != null and cm.workPassImage.trim() != ''">work_pass_image = #{cm.workPassImage},</if>
-            <if test="cm.updateUserId != null and cm.updateUserId.trim() != ''">update_user_id = #{cm.updateUserId},</if>
-            <if test="cm.enable != null">enable = #{enable},</if>
-            <if test="cm.wxOpenId != null and cm.wxOpenId.trim() != ''">wx_open_id = #{wxOpenId},</if>
-            update_time = now()
-        </set>
-        where `agency_user_id` = #{cm.agencyUserId}
-        limit 1
-    </update>
-
-    <update id="del">
-        update tm_agency
-        <set>
-            rec_status = 'I',
-            <if test=" updateUserId != null and updateUserId.trim() != ''">update_user_id = #{updateUserId},</if>
-            update_time = now()
-        </set>
-        where `agency_user_id` = #{cm.agencyUserId}
-        limit 1
-    </update>
-
-
-
-    <select id="selectTmAgencyByHouseId" resultType="com.ljq.house.biz.model.TmAgency">
-
-        SELECT *
-        FROM tm_agency M
-        LEFT JOIN tm_estate X on  M.agency_user_id = X.agency_user_id AND .rec_status = 'A'
-        WHERE M.rec_status = 'A'
-        <if test="estateId != null and estateId.trim() != '' ">
-            AND X.estate_id = #{estateId}
-        </if>
-        limit 1
-    </select>
-
-</mapper>

house-biz/src/main/resources/mapper/TmAgencyMapper.xml

@@ -0,0 +1,134 @@
+<?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.ljq.house.biz.dao.TmAgencyDao">
+    <resultMap id="getAgencyByHouseId" type="com.ljq.house.biz.model.TmAgency">
+        <id property="agencyUserId" column="agency_user_id" jdbcType="VARCHAR" />
+        <result property="wxOpenId" column="wx_open_id" jdbcType="VARCHAR" />
+        <result property="name" column="name" jdbcType="VARCHAR" />
+        <result property="phone" column="phone" jdbcType="VARCHAR" />
+        <result property="tel" column="tel" jdbcType="VARCHAR" />
+        <result property="email" column="email" jdbcType="VARCHAR" />
+        <result property="avatar" column="avatar" jdbcType="VARCHAR" />
+        <result property="agencyId" column="agency_id" jdbcType="VARCHAR" />
+        <result property="store" column="store" jdbcType="VARCHAR" />
+        <result property="authState" column="auth_state" jdbcType="VARCHAR" />
+        <result property="agencyCompanyName" column="agency_company_name" jdbcType="VARCHAR" />
+        <result property="tag" column="tag" jdbcType="VARCHAR" />
+        <result property="enable" column="enable" jdbcType="VARCHAR" />
+        <result property="volumeHalfYear" column="volume_half_year" jdbcType="INTEGER" />
+        <result property="dealAveragePeriod" column="deal_average_period" jdbcType="DOUBLE" />
+        <result property="recentRecommendVrs" column="recent_recommend_vrs" jdbcType="INTEGER" />
+        <result property="workPassImage" column="work_pass_image" jdbcType="VARCHAR" />
+
+        <result property="ename" column="e_name" jdbcType="VARCHAR" />
+        <result property="language" column="language" jdbcType="VARCHAR" />
+        <result property="businessId" column="business_id" jdbcType="VARCHAR" />
+        <result property="agencyCompanyId" column="agency_company_id" jdbcType="VARCHAR" />
+
+    </resultMap>
+
+    <select id="countAll" resultType="java.lang.Long">
+        select count(1) from tm_agency where enable = 1
+        <if test="deptId != null  ">
+            and CREATE_USER_DEPT_ID = #{deptId};
+        </if>
+    </select>
+
+    <select id="selectTmAgencyByHouseId" resultMap="getAgencyByHouseId">
+        select * from tm_house_agency_relation rel
+         left join tm_agency agency on rel.agency_user_id = agency.agency_user_id
+        <where>
+            <if test="houseId != null and houseId != '' ">
+                and house_id = #{houseId}
+            </if>
+        </where>
+        limit 1000
+    </select>
+
+
+    <select id="selectTmAgencyById" resultType="com.ljq.house.biz.model.TmAgency">
+        select * from tm_agency
+        <where>
+            <if test="agencyUserId != null and agencyUserId.trim() != '' ">
+                and agency_user_id = #{agencyUserId}
+            </if>
+        </where>
+        limit 1
+    </select>
+
+
+    <select id="setectAgencyByCondition" resultType="com.ljq.house.biz.model.TmAgency">
+        select * from tm_agency
+        <where>
+
+            <if test="tmAgency != null and tmAgency.wxOpenId != '' ">
+                and wx_open_id = #{tmAgency.wxOpenId}
+            </if>
+
+            <if test="tmAgency != null and tmAgency.phone != '' ">
+                and phone = #{tmAgency.phone}
+            </if>
+        </where>
+        limit 1
+    </select>
+
+
+    <select id="queryAgencyList" resultType="java.util.Map">
+      select
+        agency.avatar,
+        agency.agency_user_id,
+        agency.name,
+        agency.phone,
+        agency.store,
+        agency.type,
+        agency.create_time,
+        agency.enable,
+        count(house.house_id) as house_num ,
+        count(user.user_id) as user_num
+             from tm_agency agency
+            left  join tm_house_agency_relation house on house.agency_user_id = agency.agency_user_id and house.is_valid = 1
+            left  join tm_agency_user_relation user on user.agency_user_id = agency.agency_user_id and user.is_valid = 1
+
+        ${ew.customSqlSegment}
+
+    </select>
+
+
+    <delete id="delete">
+    delete from tm_agency
+    where agency_user_id=#{agency_user_id}
+   </delete>
+
+
+    <update id="updateByIdSelectively" parameterType="com.ljq.house.biz.model.TmAgency">
+        update tm_agency
+        <set>
+            <if test="tmAgency.wxOpenId != null and tmAgency.wxOpenId.trim() != ''">`wx_open_id` = #{tmAgency.wxOpenId},</if>
+            <if test="tmAgency.name != null and tmAgency.name.trim() != ''">`name` = #{tmAgency.name},</if>
+            <if test="tmAgency.phone != null and tmAgency.phone.trim() != ''">`phone` = #{tmAgency.phone},</if>
+            <if test="tmAgency.tel != null and tmAgency.tel.trim() != ''">`tel` = #{tmAgency.tel},</if>
+            <if test="tmAgency.email != null and tmAgency.email.trim() != ''">`email` = #{tmAgency.email},</if>
+            <if test="tmAgency.passwd != null and tmAgency.passwd.trim() != ''">`email` = #{tmAgency.passwd},</if>
+            <if test="tmAgency.avatar != null and tmAgency.avatar.trim() != ''">`avatar` = #{tmAgency.avatar},</if>
+            <if test="tmAgency.agency_id != null and tmAgency.agency_id.trim() != ''">`agency_id` = #{tmAgency.agencyId},</if>
+            <if test="tmAgency.store != null and tmAgency.store.trim() != ''">`store` = #{tmAgency.store},</if>
+            <if test="tmAgency.enable != null ">`enable` = #{tmAgency.enable},</if>
+            <if test="tmAgency.authState != null ">`auth_state` = #{tmAgency.authState},</if>
+            <if test="tmAgency.tag != null and tmAgency.tag.trim() != ''">`tag` = #{tmAgency.tag},</if>
+            <if test="tmAgency.agencyCompanyName != null and tmAgency.agencyCompanyName.trim() != ''">`agency_company_name` = #{tmAgency.agencyCompanyName},</if>
+            <if test="tmAgency.volumeHalfYear != null">`volume_half_year` = #{tmAgency.volumeHalfYear},</if>
+            <if test="tmAgency.dealAveragePeriod != null">`deal_average_period` = #{tmAgency.dealAveragePeriod},</if>
+            <if test="tmAgency.recentRecommendVrs != null">`recent_recommend_vrs` = #{tmAgency.recentRecommendVrs},</if>
+            <if test="tmAgency.reserve1 != null and tmAgency.reserve1.trim() != ''">`reserve1` = #{tmAgency.reserve1},</if>
+            <if test="tmAgency.reserve2 != null and tmAgency.reserve2.trim() != ''">`reserve2` = #{tmAgency.reserve2},</if>
+            <if test="tmAgency.businessId != null and tmAgency.businessId.trim() != ''">`business_id` = #{tmAgency.businessId},</if>
+            <if test="tmAgency.ename != null and tmAgency.ename.trim() != ''">`e_name` = #{tmAgency.ename},</if>
+            <if test="tmAgency.language != null and tmAgency.language.trim() != ''">`language` = #{tmAgency.language},</if>
+            <if test="tmAgency.agencyCompanyId != null">`agency_company_id` = #{tmAgency.agencyCompanyId},</if>
+            last_modify_datetime = now()
+        </set>
+        where `agency_user_id` = #{tmAgency.agencyUserId}
+        limit 1
+    </update>
+
+</mapper>

house-biz/src/main/resources/mapper/TmBuyingpointDao.xml

@@ -1,99 +0,0 @@
-<?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.ljq.house.biz.dao.TmBuyingpointDao">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ljq.house.biz.model.TmBuyingpoint">
-        <id column="buyingpoint_id" property="buyingpointId" />
-        <result column="estate_id" property="estateId" />
-        <result column="title" property="title" />
-        <result column="content" property="content" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_user_dept_id" property="createUserDeptId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_user_id" property="updateUserId" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        buyingpoint_id, estate_id, title, content, create_user_id, create_user_dept_id, create_time, update_user_id, update_time
-    </sql>
-
-    <select id="getList" resultType="com.ljq.house.biz.model.TmBuyingpoint">
-        select *
-        from tm_buyingpoint
-        where rec_status = 'A'
-          and estate_id = #{id}
-        order by create_time desc
-    </select>
-
-    <select id="countAll" resultType="java.lang.Long">
-        select count(*)
-        from tm_buyingpoint
-        where rec_status = 'A'
-    </select>
-
-    <insert id="insert" parameterType="com.ljq.house.biz.model.TmBuyingpoint">
-
-        INSERT INTO tm_buyingpoint
-        (
-         buyingpoint_id
-        ,estate_id
-        ,title
-        ,content
-        ,rec_status
-        ,create_user_id
-        ,create_user_dept_id
-        ,create_time
-        ,update_user_id
-        ,update_time
-        )
-        VALUES
-        (
-         #{cm.buyingpointId}
-        ,#{cm.estateId}
-        ,#{cm.title}
-        ,#{cm.content}
-        ,'A'
-        ,#{cm.createUserId}
-        ,#{cm.createUserDeptId}
-        ,now()
-        ,#{cm.updateUserId}
-        ,now()
-        )
-    </insert>
-
-
-    <update id="update" parameterType="com.ljq.house.biz.model.TmBuyingpoint">
-        update tm_buyingpoint
-        <set>
-            <if test="cm.title != null and cm.title.trim() != ''"> title = #{cm.title},</if>
-            <if test="cm.content != null and cm.content.trim() != ''"> content = #{cm.content},</if>
-            <if test="cm.cm.updateUserId != null and cm.cm.updateUserId.trim() != ''"> update_user_id = #{cm.updateUserId},</if>
-            update_time = now()
-        </set>
-        where `buyingpoint_id` = #{cm.buyingpointId}
-        limit 1
-    </update>
-
-    <update id="del">
-        update tm_buyingpoint
-        <set>
-            rec_status = 'I',
-            update_time = now()
-        </set>
-        where `buyingpoint_id` = #{buyingpointId}
-        limit 1
-    </update>
-
-    <update id="delEstateId">
-        update tm_buyingpoint
-        <set>
-            rec_status = 'I',
-            update_time = now()
-        </set>
-        where `estate_id` = #{estateId}
-        limit 1
-    </update>
-</mapper>

house-biz/src/main/resources/mapper/TmCustomerInformationDao.xml

@@ -0,0 +1,85 @@
+<?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.ljq.house.biz.dao.TmCustomerInformationDao">
+
+    <select id="getList" resultType="com.ljq.house.biz.vo.response.TmCustomerInformationRspVo">
+        select *
+        from tm_customer_information
+        where rec_status = 'A'
+        <if test=" cm.account != null  and cm.account.trim!='' ">
+            account = #{cm.account}
+        </if>
+        order by create_time desc
+
+        <if test=" cm.limit != null  and cm.offset != null ">
+            limit #{cm.limit} offset #{cm.offset}
+        </if>
+    </select>
+
+    <select id="countAll" resultType="java.lang.Long">
+        select count(*)
+        from tm_customer_information
+        where rec_status = 'A'
+    </select>
+
+    <insert id="insert" parameterType="com.ljq.house.biz.model.TmCustomerInformation">
+
+        INSERT INTO tm_customer_information
+        (
+          customer_information_id
+         ,avatar
+         ,account
+         ,name
+         ,tel
+         ,privileged_time
+         ,remarks
+         ,rec_status
+         ,create_user_id
+         ,create_user_dept_id
+         ,create_time
+         ,update_user_id
+         ,update_time)
+        VALUES (
+          #{cm.customerInformationId}
+         ,#{avatar}
+         ,#{account}
+         ,#{name}
+         ,#{tel}
+         ,#{privilegedTime}
+         ,#{remarks}
+         , 'A'
+         , #{cm.createUserId}
+         , #{cm.createUserDeptId}
+         , now()
+         , #{cm.updateUserId}
+         , now()
+        )
+    </insert>
+
+    <update id="update" parameterType="com.ljq.house.biz.model.TmCustomerInformation">
+        update tm_customer_information
+        <set>
+            <if test="cm.cm.avatar != null and cm.cm.avatar.trim() != ''">avatar = #{avatar}</if>
+            <if test="cm.cm.account != null and cm.cm.account.trim() != ''">account = #{account}</if>
+            <if test="cm.cm.name != null and cm.cm.name.trim() != ''">name = #{name}</if>
+            <if test="cm.cm.tel != null and cm.cm.tel.trim() != ''">tel = #{tel}</if>
+            <if test="cm.cm.privilegedTime != null and cm.cm.privilegedTime.trim() != ''">privileged_time = #{privilegedTime}</if>
+            <if test="cm.cm.remarks != null and cm.cm.remarks.trim() != ''">remarks = #{remarks}</if>
+            <if test="cm.cm.updateUserId != null and cm.cm.updateUserId.trim() != ''"> update_user_id = #{cm.updateUserId},</if>
+            update_time = now()
+        </set>
+        where `customer_information_id` = #{cm.customerInformationId}
+        limit 1
+    </update>
+
+    <update id="del">
+        update tm_customer_information
+        <set>
+            rec_status = 'I',
+            update_time = now()
+        </set>
+        where `customer_information_id` = #{customerInformationId}
+        limit 1
+    </update>
+
+</mapper>

house-biz/src/main/resources/mapper/TmEstateDao.xml

@@ -1,195 +0,0 @@
-<?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.ljq.house.biz.dao.TmEstateDao">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ljq.house.biz.model.TmEstate">
-        <id column="estate_id" property="estateId" />
-        <result column="estate_name" property="estateName" />
-        <result column="property_number" property="propertyNumber" />
-        <result column="total_price" property="totalPrice" />
-        <result column="address" property="address" />
-        <result column="bedroom_amount" property="bedroomAmount" />
-        <result column="showerroom_amount" property="showerroomAmount" />
-        <result column="building_area" property="buildingArea" />
-        <result column="floor_space" property="floorSpace" />
-        <result column="construction_year" property="constructionYear" />
-        <result column="unit_price" property="unitPrice" />
-        <result column="house_label" property="houseLabel" />
-        <result column="ancillary_facility" property="ancillaryFacility" />
-        <result column="is_agent_relation" property="isAgentRelation" />
-        <result column="agency_user_id" property="agencyUserId" />
-        <result column="sell_type" property="sellType" />
-        <result column="scene_address" property="sceneAddress" />
-        <result column="ADDITIONS_IMAGES" property="additionsImages" />
-        <result column="cover_image" property="coverImage" />
-        <result column="hourse_image" property="hourseImage" />
-        <result column="video_cover_image" property="videoCoverImage" />
-        <result column="introduce_video" property="introduceVideo" />
-        <result column="introduce_video_desc" property="introduceVideoDesc" />
-        <result column="title" property="title" />
-        <result column="content_introduce" property="contentIntroduce" />
-        <result column="create_user_id" property="createUserId" />
-        <result column="create_user_dept_id" property="createUserDeptId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_user_id" property="updateUserId" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        estate_id, estate_name, property_number, total_price, address, bedroom_amount, showerroom_amount, building_area, floor_space, construction_year, unit_price, house_label, ancillary_facility, is_agent_relation, agent_id, sell_type, scene_address, ADDITIONS_IMAGES, cover_image, hourse_image, video_cover_image, introduce_video, introduce_video_desc, title, content_introduce, create_user_id, create_user_dept_id, create_time, update_user_id, update_time
-    </sql>
-
-    <select id="getList" resultType="com.ljq.house.biz.vo.response.TmEstateRspVo">
-        select *
-        from tm_estate
-        where rec_status = 'A'
-        <if test=" cm.estateName != null  and cm.estateName.trim!='' ">
-            estate_name = #{cm.estateName}
-        </if>
-        <if test=" cm.propertyNumber != null  and cm.propertyNumber.trim!='' ">
-            property_number = #{cm.propertyNumber}
-        </if>
-
-        order by create_time desc
-
-        <if test=" cm.limit != null  and cm.offset != null ">
-            limit #{cm.limit} offset #{cm.offset}
-        </if>
-    </select>
-
-    <select id="countAll" resultType="java.lang.Long">
-        select count(*)
-        from tm_estate
-        where rec_status = 'A'
-     </select>
-
-    <insert id="insert" parameterType="com.ljq.house.biz.model.TmEstate">
-
-        INSERT INTO tm_estate
-        (estate_id,
-         estate_name,
-         property_number,
-         total_price,
-         address,
-         bedroom_amount,
-         showerroom_amount,
-         building_area,
-         floor_space,
-         construction_year,
-         unit_price,
-         house_label,
-         ancillary_facility,
-         is_agent_relation,
-         agency_user_id,
-         sell_type,
-         scene_address,
-         ADDITIONS_IMAGES,
-         cover_image,
-         hourse_image,
-         video_cover_image,
-         introduce_video,
-         introduce_video_desc,
-         title,
-         content_introduce,
-         rec_status,
-         create_user_id,
-         create_user_dept_id,
-         create_time,
-         update_user_id,
-         update_time)
-        VALUES ( #{cm.estateId}
-               , #{cm.estateName}
-               , #{cm.propertyNumber}
-               , #{cm.totalPrice}
-               , #{cm.address}
-               , #{cm.bedroomAmount}
-               , #{cm.showerroomAmount}
-               , #{cm.buildingArea}
-               , #{cm.floorSpace}
-               , #{cm.constructionYear}
-               , #{cm.unitPrice}
-               , #{cm.houseLabel}
-               , #{cm.ancillaryFacility}
-               , #{cm.isAgentRelation}
-               , #{cm.agencyUserId}
-               , #{cm.sellType}
-               , #{cm.sceneAddress}
-               , #{cm.additionsImages}
-               , #{cm.coverImage}
-               , #{cm.hourseImage}
-               , #{cm.videoCoverImage}
-               , #{cm.introduceVideo}
-               , #{cm.introduceVideoDesc}
-               , #{cm.title}
-               , #{cm.contentIntroduce}
-               , 'A'
-               , #{cm.createUserId}
-               , #{cm.createUserDeptId}
-               , now()
-               , #{cm.updateUserId}
-               , now()
-            )
-    </insert>
-
-    <update id="update" parameterType="com.ljq.house.biz.model.TmEstate">
-        update tm_estate
-        <set>
-            <if test="cm.estateName != null and cm.estateName.trim() != ''">estate_name = #{cm.estateName},</if>
-            <if test="cm.propertyNumber != null and cm.propertyNumber.trim() != ''">property_number = #{cm.propertyNumber},</if>
-            <if test="cm.totalPrice != null and cm.totalPrice.trim() != ''"> total_price = #{cm.totalPrice},</if>
-            <if test="cm.address != null and cm.address.trim() != ''"> address = #{cm.address},</if>
-            <if test="cm.bedroomAmount != null and cm.bedroomAmount.trim() != ''">bedroom_amount = #{cm.bedroomAmount},</if>
-            <if test="cm.showerroomAmount != null and cm.showerroomAmount.trim() != ''"> showerroom_amount = #{cm.showerroomAmount},</if>
-            <if test="cm.buildingArea != null"> building_area = #{cm.buildingArea},</if>
-            <if test="cm.floorSpace != null"> floor_space = #{cm.floorSpace},</if>
-            <if test="cm.constructionYear != null and cm.constructionYear.trim() != ''"> construction_year = #{cm.constructionYear},</if>
-            <if test="cm.unitPrice != null"> unit_price = #{cm.unitPrice},</if>
-            <if test="cm.houseLabel != null and cm.houseLabel.trim() != ''"> house_label = #{cm.houseLabel},</if>
-            <if test="cm.ancillaryFacility != null and cm.ancillaryFacility.trim() != ''"> ancillary_facility = #{cm.ancillaryFacility},</if>
-            <if test="cm.isAgentRelation != null and cm.isAgentRelation.trim() != ''"> is_agent_relation = #{cm.isAgentRelation},</if>
-            <if test="cm.agencyUserId != null and cm.agencyUserId.trim() != ''"> agency_user_id = #{cm.agencyUserId},</if>
-            <if test="cm.sellType != null and cm.sellType.trim() != ''"> sell_type = #{cm.sellType},</if>
-            <if test="cm.sceneAddress != null and cm.sceneAddress.trim() != ''"> scene_address = #{cm.sceneAddress},</if>
-            <if test="cm.additionsImages != null and cm.additionsImages.trim() != ''">additions_images = #{cm.additionsImages},</if>
-            <if test="cm.coverImage != null and cm.coverImage.trim() != ''"> cover_image =#{cm.coverImage},</if>
-            <if test="cm.hourseImage != null and cm.hourseImage.trim() != ''"> hourse_image = #{cm.hourseImage},</if>
-            <if test="cm.videoCoverImage != null and cm.videoCoverImage.trim() != ''"> video_cover_image = #{cm.videoCoverImage},</if>
-            <if test="cm.introduceVideo != null and cm.introduceVideo.trim() != ''"> introduce_video = #{cm.introduceVideo},</if>
-            <if test="cm.introduceVideoDesc != null and cm.introduceVideoDesc.trim() != ''"> introduce_video_desc = #{cm.introduceVideoDesc},</if>
-            <if test="cm.title != null and cm.title.trim() != ''"> title = #{cm.title},</if>
-            <if test="cm.contentIntroduce != null and cm.contentIntroduce.trim() != ''"> content_introduce = #{cm.contentIntroduce},</if>
-            <if test="cm.cm.updateUserId != null and cm.cm.updateUserId.trim() != ''"> update_user_id = #{cm.updateUserId},</if>
-            update_time = now()
-        </set>
-        where `estate_id` = #{cm.estateId}
-        limit 1
-    </update>
-
-    <update id="del">
-        update tm_estate
-        <set>
-            rec_status = 'I',
-            update_time = now()
-        </set>
-        where `estate_id` = #{estateId}
-        limit 1
-    </update>
-
-    <select id="findAgencyEstate" resultType="com.ljq.house.biz.model.TmEstate">
-        select *
-          from tm_estate
-         where rec_status = 'A'
-           and agency_user_id = #{cm.agencyUserId}
-      order by create_time desc
-    </select>
-
-    <select id="findAgencyNum" resultType="java.lang.Integer">
-        select count(*)
-        from tm_estate
-        where rec_status = 'A'
-          and agency_user_id = #{cm.agencyUserId}
-    </select>
-
-</mapper>

house-biz/src/main/resources/mapper/TmHouseMapper.xml

@@ -5,11 +5,17 @@
 
 
     <select id="countAll" resultType="java.lang.Long">
-        select count(1) from tm_house where enable = 1;
+        select count(1) from tm_house where enable = 1
+        <if test="deptId != null  ">
+            and CREATE_USER_DEPT_ID = #{deptId};
+        </if>
     </select>
 
     <select id="countSceneAll" resultType="java.lang.Long">
-        select count(distinct(scene_num)) from tm_house where enable = 1;
+        select count(distinct(scene_num)) from tm_house where enable = 1
+        <if test="deptId != null  ">
+            and CREATE_USER_DEPT_ID = #{deptId};
+        </if>
     </select>
 
     <select id="selectHouseListByIds" resultType="com.ljq.house.biz.model.TmHouse">
@@ -68,7 +74,7 @@
     </select>
 
     <select id="selectAgencyHouseList" resultType="com.ljq.house.biz.model.TmHouse">
-         select * from tm_house_agency_relation relation
+         select house.* from tm_house_agency_relation relation
            inner join tm_house house on house.house_id = relation.house_id and house.enable = 1
 
         ${ew.customSqlSegment}
@@ -122,6 +128,18 @@
             <if test="tmHouse.videoCoverImage != null and tmHouse.videoCoverImage.trim() != ''">`video_cover_image` = #{tmHouse.videoCoverImage},</if>
             <if test="tmHouse.reserve1 != null and tmHouse.reserve1.trim() != ''">`reserve1` = #{tmHouse.reserve1},</if>
             <if test="tmHouse.reserve2 != null and tmHouse.reserve2.trim() != ''">`reserve2` = #{tmHouse.reserve2},</if>
+
+            <if test="tmHouse.propertyNumber != null and tmHouse.propertyNumber.trim() != ''">property_number=#{tmHouse.propertyNumber},</if>
+            <if test="tmHouse.bedroomAmount != null and tmHouse.bedroomAmount.trim() != ''">bedroom_amount=#{tmHouse.bedroomAmount},</if>
+            <if test="tmHouse.showerroomAmount != null and tmHouse.showerroomAmount.trim() != ''">showerroom_amount=#{tmHouse.showerroomAmount},</if>
+            <if test="tmHouse.buildingArea != null">building_area=#{tmHouse.buildingArea},</if>
+            <if test="tmHouse.floorSpace != null">floor_space=#{tmHouse.floorSpace},</if>
+            <if test="tmHouse.ancillaryFacility != null and tmHouse.ancillaryFacility.trim() != ''">ancillary_facility=#{tmHouse.ancillaryFacility},</if>
+            <if test="tmHouse.houseLabel != null and tmHouse.houseLabel.trim() != ''">house_label=#{tmHouse.houseLabel},</if>
+            <if test="tmHouse.sellType != null and tmHouse.sellType.trim() != ''">sell_type=#{tmHouse.sellType},</if>
+            <if test="tmHouse.introduceVideoDesc != null and tmHouse.introduceVideoDesc.trim() != ''">introduce_video_desc=#{tmHouse.introduceVideoDesc},</if>
+            <if test="tmHouse.additionsImages != null and tmHouse.additionsImages.trim() != ''">additions_images=#{tmHouse.additionsImages},</if>
+            <if test="tmHouse.coverAdditionsImages != null and tmHouse.coverAdditionsImages.trim() != ''">cover_additions_images=#{tmHouse.coverAdditionsImages},</if>
             last_modify_datetime = now()
         </set>
         where `house_id` = #{tmHouse.houseId}

house-biz/src/main/resources/mapper/TmUserMapper.xml

@@ -60,6 +60,41 @@
         limit 1
     </select>
 
+    <select id="setectUserlist" resultType="com.ljq.house.biz.model.TmUser">
+        select * from tm_user
+        <where>
+            ENABLE = 1
+            <if test="user !=null and user.userId">
+                and user_id = #{user.userId}
+            </if>
+
+            <if test="user !=null and user.wxOpenId">
+                and wx_open_id = #{user.wxOpenId}
+            </if>
+
+            <if test="user !=null and user.name">
+                and name = #{user.name}
+            </if>
+
+            <if test="user !=null and user.phone">
+                and phone = #{user.phone}
+            </if>
+
+            <if test="user !=null and user.email">
+                and email = #{user.email}
+            </if>
+            <if test="user !=null and user.passwd">
+                and passwd = #{user.passwd}
+            </if>
+
+            <if test="user !=null and user.enable">
+                and enable = #{user.enable}
+            </if>
+
+        </where>
+        order by CREATE_TIME desc
+    </select>
+
 
 
     <insert id="insert">
@@ -86,7 +121,7 @@
                 #{user.email},
                 #{user.passwd},
                 #{user.avatar},
-                #{user.enable},
+                1,
                 #{user.salt},
                 #{user.gender},
                 #{user.phoneBelong},
@@ -130,5 +165,6 @@
     <select id="selectTmUserCount" resultType="long">
         select count(*)
         from tm_user
+        where ENABLE = 1
     </select>
 </mapper>

house-biz/target/classes/mapper/TmCustomerInformationDao.xml

@@ -0,0 +1,85 @@
+<?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.ljq.house.biz.dao.TmCustomerInformationDao">
+
+    <select id="getList" resultType="com.ljq.house.biz.vo.response.TmCustomerInformationRspVo">
+        select *
+        from tm_customer_information
+        where rec_status = 'A'
+        <if test=" cm.account != null  and cm.account.trim!='' ">
+            account = #{cm.account}
+        </if>
+        order by create_time desc
+
+        <if test=" cm.limit != null  and cm.offset != null ">
+            limit #{cm.limit} offset #{cm.offset}
+        </if>
+    </select>
+
+    <select id="countAll" resultType="java.lang.Long">
+        select count(*)
+        from tm_customer_information
+        where rec_status = 'A'
+    </select>
+
+    <insert id="insert" parameterType="com.ljq.house.biz.model.TmCustomerInformation">
+
+        INSERT INTO tm_customer_information
+        (
+          customer_information_id
+         ,avatar
+         ,account
+         ,name
+         ,tel
+         ,privileged_time
+         ,remarks
+         ,rec_status
+         ,create_user_id
+         ,create_user_dept_id
+         ,create_time
+         ,update_user_id
+         ,update_time)
+        VALUES (
+          #{cm.customerInformationId}
+         ,#{avatar}
+         ,#{account}
+         ,#{name}
+         ,#{tel}
+         ,#{privilegedTime}
+         ,#{remarks}
+         , 'A'
+         , #{cm.createUserId}
+         , #{cm.createUserDeptId}
+         , now()
+         , #{cm.updateUserId}
+         , now()
+        )
+    </insert>
+
+    <update id="update" parameterType="com.ljq.house.biz.model.TmCustomerInformation">
+        update tm_customer_information
+        <set>
+            <if test="cm.cm.avatar != null and cm.cm.avatar.trim() != ''">avatar = #{avatar}</if>
+            <if test="cm.cm.account != null and cm.cm.account.trim() != ''">account = #{account}</if>
+            <if test="cm.cm.name != null and cm.cm.name.trim() != ''">name = #{name}</if>
+            <if test="cm.cm.tel != null and cm.cm.tel.trim() != ''">tel = #{tel}</if>
+            <if test="cm.cm.privilegedTime != null and cm.cm.privilegedTime.trim() != ''">privileged_time = #{privilegedTime}</if>
+            <if test="cm.cm.remarks != null and cm.cm.remarks.trim() != ''">remarks = #{remarks}</if>
+            <if test="cm.cm.updateUserId != null and cm.cm.updateUserId.trim() != ''"> update_user_id = #{cm.updateUserId},</if>
+            update_time = now()
+        </set>
+        where `customer_information_id` = #{cm.customerInformationId}
+        limit 1
+    </update>
+
+    <update id="del">
+        update tm_customer_information
+        <set>
+            rec_status = 'I',
+            update_time = now()
+        </set>
+        where `customer_information_id` = #{customerInformationId}
+        limit 1
+    </update>
+
+</mapper>

house-biz/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+version=0.0.1-SNAPSHOT
+groupId=com.ljq.house
+artifactId=house-biz

house-biz/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -0,0 +1 @@
+com\ljq\house\biz\TestExample.class

house-biz/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -0,0 +1 @@
+E:\project\house_usa\house-biz\src\test\java\com\ljq\house\biz\TestExample.java

house-common/src/main/java/com/ljq/house/common/enums/AdminTypeEnum.java

@@ -12,6 +12,8 @@ public enum  AdminTypeEnum {
     SUPER_ADMIN(0 , "超级管理员"),
     NORMAL_ADMIN(1 , "普通管理员"),
     AGENCY(2 , "经纪人"),
+    SUB_NORMAL_ADMIN(3 , "二级普通管理员"),
+    DEFAULT(-1 , "未分配角色"),
     ;
     private Integer type;
     private String desc;

house-common/src/main/java/com/ljq/house/common/enums/MsgCodeTypeEnum.java

@@ -0,0 +1,29 @@
+package com.ljq.house.common.enums;
+
+/**
+ * @author abnerhou
+ * @date 2020/6/19 10:10
+ * @desciption
+ */
+public enum MsgCodeTypeEnum {
+
+    REGISTER(1 , "注册"),
+    CHANGE_PASSWORD(2 , "修改密码"),
+    ;
+
+    private int code;
+    private String desc;
+
+    MsgCodeTypeEnum(Integer code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

house-common/src/main/java/com/ljq/house/common/service/AgencyService.java

@@ -3,13 +3,12 @@ package com.ljq.house.common.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ljq.house.biz.dao.TmAgencyDao;
 import com.ljq.house.biz.model.TmAgency;
+import com.ljq.house.biz.model.TmUser;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import java.util.Random;
-
 /**
  * @author abnerhou
  * @date 2020/5/9 15:22
@@ -23,18 +22,14 @@ public class AgencyService {
     @Autowired
     private TmAgencyDao tmAgencyDao;
 
-    public TmAgency getAgencyByPhone(String phoneNum , String wxOpenId){
+    public TmAgency getAgencyByPhone(String wxOpenId){
 
-        if(StringUtils.isEmpty(phoneNum)){
+        if(org.apache.commons.lang3.StringUtils.isBlank(wxOpenId)){
             return null;
         }
         QueryWrapper<TmAgency> queryWrapper = new QueryWrapper<>();
-        if(org.apache.commons.lang3.StringUtils.isNotBlank(wxOpenId)){
-           queryWrapper.eq("wx_open_id" , wxOpenId);
-        }
-        if(org.apache.commons.lang3.StringUtils.isNotBlank(phoneNum)){
-           queryWrapper.eq("phone" , phoneNum);
-        }
+        queryWrapper.eq("wx_open_id" , wxOpenId);
+        queryWrapper.eq("enable" , 1);
         queryWrapper.last("limit 1");
         return tmAgencyDao.selectOne(queryWrapper);
     }

house-common/src/main/java/com/ljq/house/common/service/HouseHelperService.java

@@ -30,7 +30,7 @@ import java.util.Map;
 public class HouseHelperService {
 
     @Autowired
-    private TmEstateDao tmEstateDao;
+    private TmHouseDao tmHouseDao;
 
     @Autowired
     private TmUserDao tmUserDao;
@@ -42,16 +42,13 @@ public class HouseHelperService {
     private TmAgencyDao tmAgencyDao;
 
     @Autowired
-    private TmHouseDao tmHouseDao;
-
-    @Autowired
     private TmHouseAgencyRelationDao tmHouseAgencyRelationDao;
 
     public Map<String ,Object> getHouseInfoByHouse(TmHouse tmHouse , String userId, String roomId , String type , String callBackUrl){
-        QueryWrapper<TmEstate> estateQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<TmHouse> estateQueryWrapper = new QueryWrapper<>();
         estateQueryWrapper.eq("estate_id" , tmHouse.getEstateId());
         estateQueryWrapper.last("limit 1");
-        TmEstate tmEstate = tmEstateDao.selectOne(estateQueryWrapper);
+        TmHouse tmEstate = tmHouseDao.selectOne(estateQueryWrapper);
 
         QueryWrapper<TmHouseAgencyRelation> agencyRelationQuery = new QueryWrapper<>();
         agencyRelationQuery.eq("house_id" , tmHouse.getHouseId());
@@ -206,7 +203,7 @@ public class HouseHelperService {
     }
 
     public Map<String , Object> assembleOpenApiData(TmHouse tmHouse , TmAgency tmAgency ,
-                                                     TmUser tmUser , TmEstate tmEstate){
+                                                    TmUser tmUser , TmHouse tmEstate){
         Map<String , Object> result = new HashMap<>();
         if(null != tmHouse){
             result.put("houseId" , tmHouse.getHouseId());

house-common/src/main/java/com/ljq/house/common/service/UserService.java

@@ -61,7 +61,7 @@ public class UserService {
         if(StringUtils.isNotBlank(avatar)){
             user.setAvatar(avatar);
         }
-
+        user.setEnable(1);
         String userId =  UUidGenerator.generatorUuid(IdStarterEnum.USER.getStarter());
         user.setUserId(userId);
 
@@ -74,7 +74,7 @@ public class UserService {
 
     public int addUserToAgency(TmAgency tmAgency , TmUser tmUser){
         TmAgencyUserRelation tmAgencyUserRelation = new TmAgencyUserRelation();
-        tmAgencyUserRelation.setAgencyId(String.valueOf(tmAgency.getAgencyId()));
+        tmAgencyUserRelation.setAgencyId(tmAgency.getAgencyUserId());
         tmAgencyUserRelation.setUserId(tmUser.getUserId());
         tmAgencyUserRelation.setUserName(tmUser.getName());
         tmAgencyUserRelation.setUserPhone(tmUser.getPhone());
@@ -97,5 +97,17 @@ public class UserService {
         return true;
     }
 
+    public TmUser getUserByName(String name){
+        if(StringUtils.isBlank(name)){
+            return null;
+        }
+        QueryWrapper<TmUser> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("name" , name);
+        queryWrapper.eq("enable" , 1);
+        queryWrapper.last("limit 1");
+        return tmUserDao.selectOne(queryWrapper);
+
+    }
+
 
 }