From b5f9186618b23ac963c64bb8c6628fd0d309d2e9 Mon Sep 17 00:00:00 2001 From: hanzhenchao Date: Wed, 22 Jun 2022 19:03:20 +0800 Subject: [PATCH] 1 --- .gitignore | 2 +- common/pom.xml | 5 + .../ywx/customer/common/enu/CrmFirmStatusEnum.java | 30 + .../trust/ywx/customer/common/enu/FirmErrEum.java | 1 + .../customer/common/enu/TempFirmStatusEnum.java | 12 +- .../trust/ywx/customer/common/model/PageBean.java | 118 ++ .../ywx/customer/common/model/PageBeanUtil.java | 23 + .../model/manager/request/TempFirmParam.java | 20 +- .../model/manager/request/TrustFirmInfoParam.java | 1 + .../model/manager/request/TrustFirmParam.java | 6 - .../common/model/manager/response/TempFirmDto.java | 34 +- .../model/manager/response/TrustFirmDto.java | 10 +- .../manager/response/TrustFirmDtoWithBLOBs.java | 28 - .../model/query/request/SearchCrmFirmParam.java | 18 +- .../model/query/request/SearchFirmParam.java | 11 +- .../model/query/request/SearchTrustFirmParam.java | 9 +- .../common/model/query/response/CrmFirmDto.java | 1 + customer/pom.xml | 156 ++- .../ywx/customer/commons/CatMybatisPlugin.java | 240 ++++ .../trust/ywx/customer/commons/ValidateUtil.java | 191 +++ .../com/trust/ywx/customer/dao/TempFirmDao.java | 50 +- .../com/trust/ywx/customer/dao/TrustFirmDao.java | 37 +- .../dao/datasource/MyBatisConfiguration.java | 27 +- .../com/trust/ywx/customer/dao/po/FirmInfo.java | 20 +- .../trust/ywx/customer/dao/po/FirmInfoTemp.java | 226 +--- .../ywx/customer/dao/po/FirmInfoTempExample.java | 1304 +++----------------- .../service/impl/FirmQueryServiceImpl.java | 265 ---- .../service/impl/FirmQueryServiceImpl_bak.java | 202 --- .../service/manager/TempFirmManagerService.java | 3 +- .../manager/impl/FirmManagerServiceImpl.java | 60 +- .../manager/impl/TempFirmManagerServiceImpl.java | 87 +- .../customer/service/query/FirmQueryService.java | 27 +- .../service/query/impl/FirmQueryServiceImpl.java | 283 +++++ .../query/impl/FirmQueryServiceImpl_bak.java | 202 +++ customer/src/main/resources.dev/jdbc.properties | 3 + customer/src/main/resources.dev/logback.xml | 85 ++ customer/src/main/resources.dev/redis.properties | 11 + customer/src/main/resources.dev/server.properties | 6 + customer/src/main/resources.on/jdbc.properties | 3 + customer/src/main/resources.on/pay.properties | 4 + customer/src/main/resources.on/redis.properties | 11 + customer/src/main/resources.on/server.properties | 6 + customer/src/main/resources.test/jdbc.properties | 3 + customer/src/main/resources.test/logback.xml | 85 ++ customer/src/main/resources.test/redis.properties | 11 + customer/src/main/resources.test/server.properties | 3 + customer/src/main/resources/application.properties | 11 +- customer/src/main/resources/dev/base.properties | 2 - customer/src/main/resources/dev/jdbc.properties | 3 - customer/src/main/resources/dev/redis.properties | 13 - customer/src/main/resources/dev/server.properties | 3 - customer/src/main/resources/generatorConfig.xml | 57 +- .../resources/mybatis/mapper/FirmInfoMapper.xml | 35 +- .../mybatis/mapper/FirmInfoTempMapper.xml | 409 +----- customer/src/main/resources/on/base.properties | 2 - customer/src/main/resources/on/jdbc.properties | 3 - customer/src/main/resources/on/redis.properties | 13 - customer/src/main/resources/on/server.properties | 2 - .../src/main/resources/spring/dubbo-provider.xml | 9 +- .../resources/spring/spring-applicationContext.xml | 3 +- customer/src/main/resources/test/base.properties | 2 - customer/src/main/resources/test/jdbc.properties | 3 - customer/src/main/resources/test/redis.properties | 12 - customer/src/main/resources/test/server.properties | 2 - .../com/trust/ywx/customer/FirmServiceTests.java | 24 +- .../trust/ywx/customer/TempFirmServiceTests.java | 98 ++ facade/pom.xml | 4 + .../service/manager/FirmManagerService.java | 56 + .../service/manager/TempFirmManagerService.java | 56 + .../customer/service/query/FirmQueryService.java | 84 ++ pom.xml | 53 +- 71 files changed, 2403 insertions(+), 2496 deletions(-) create mode 100644 common/src/main/java/com/trust/ywx/customer/common/enu/CrmFirmStatusEnum.java create mode 100644 common/src/main/java/com/trust/ywx/customer/common/model/PageBean.java create mode 100644 common/src/main/java/com/trust/ywx/customer/common/model/PageBeanUtil.java delete mode 100644 common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDtoWithBLOBs.java create mode 100644 customer/src/main/java/com/trust/ywx/customer/commons/CatMybatisPlugin.java create mode 100644 customer/src/main/java/com/trust/ywx/customer/commons/ValidateUtil.java delete mode 100644 customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl.java delete mode 100644 customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl_bak.java create mode 100644 customer/src/main/java/com/trust/ywx/customer/service/query/impl/FirmQueryServiceImpl.java create mode 100644 customer/src/main/java/com/trust/ywx/customer/service/query/impl/FirmQueryServiceImpl_bak.java create mode 100644 customer/src/main/resources.dev/jdbc.properties create mode 100644 customer/src/main/resources.dev/logback.xml create mode 100644 customer/src/main/resources.dev/redis.properties create mode 100644 customer/src/main/resources.dev/server.properties create mode 100644 customer/src/main/resources.on/jdbc.properties create mode 100644 customer/src/main/resources.on/pay.properties create mode 100644 customer/src/main/resources.on/redis.properties create mode 100644 customer/src/main/resources.on/server.properties create mode 100644 customer/src/main/resources.test/jdbc.properties create mode 100644 customer/src/main/resources.test/logback.xml create mode 100644 customer/src/main/resources.test/redis.properties create mode 100644 customer/src/main/resources.test/server.properties delete mode 100644 customer/src/main/resources/dev/base.properties delete mode 100644 customer/src/main/resources/dev/jdbc.properties delete mode 100644 customer/src/main/resources/dev/redis.properties delete mode 100644 customer/src/main/resources/dev/server.properties delete mode 100644 customer/src/main/resources/on/base.properties delete mode 100644 customer/src/main/resources/on/jdbc.properties delete mode 100644 customer/src/main/resources/on/redis.properties delete mode 100644 customer/src/main/resources/on/server.properties delete mode 100644 customer/src/main/resources/test/base.properties delete mode 100644 customer/src/main/resources/test/jdbc.properties delete mode 100644 customer/src/main/resources/test/redis.properties delete mode 100644 customer/src/main/resources/test/server.properties create mode 100644 customer/src/test/java/com/trust/ywx/customer/TempFirmServiceTests.java create mode 100644 facade/src/main/java/com/trust/ywx/customer/service/manager/FirmManagerService.java create mode 100644 facade/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java create mode 100644 facade/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java diff --git a/.gitignore b/.gitignore index a2a3040..45d67ae 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,6 @@ target/ /nbdist/ /.nb-gradle/ build/ - +logs/ ### VS Code ### .vscode/ diff --git a/common/pom.xml b/common/pom.xml index 958b2d1..945a756 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -25,5 +25,10 @@ com.51trust.rd common-model + + + com.github.pagehelper + pagehelper + \ No newline at end of file diff --git a/common/src/main/java/com/trust/ywx/customer/common/enu/CrmFirmStatusEnum.java b/common/src/main/java/com/trust/ywx/customer/common/enu/CrmFirmStatusEnum.java new file mode 100644 index 0000000..4459299 --- /dev/null +++ b/common/src/main/java/com/trust/ywx/customer/common/enu/CrmFirmStatusEnum.java @@ -0,0 +1,30 @@ +package com.trust.ywx.customer.common.enu; +/** + * ************************************************************************* + * 

+ * @文件名称:  FirmStatus.java
+ * @包   路   径：  cn.org.bjca.ywq.config.common.status
+ * @版权所有：北京数字认证股份有限公司 (C) 2017
+ *
+ * @类描述:  crm客户状态枚举
+ * @版本: V1.0
+ * @创建人： hudan
+ * @创建时间：2017年1月22日 上午10:42:38
+ * @修改记录：
+ */
+public enum CrmFirmStatusEnum {
+	UN_CONFIRM(0,"待确认"),
+	CONFIRM(1,"已确认"),
+	;
+
+	private int code;
+	private String dec;
+	private CrmFirmStatusEnum(int code, String dec) {
+		this.code = code;
+		this.dec = dec;
+	}
+	public int getCode() {
+		return code;
+	}
+
+}
diff --git a/common/src/main/java/com/trust/ywx/customer/common/enu/FirmErrEum.java b/common/src/main/java/com/trust/ywx/customer/common/enu/FirmErrEum.java
index 94d59cc..dfb89ba 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/enu/FirmErrEum.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/enu/FirmErrEum.java
@@ -91,6 +91,7 @@ public enum FirmErrEum {
 	CLIENT_ORG_CODE_NULL("008x006","客户的统一信用代码为空"),
 	SUPPORT_INFO_TOOLONG("008x007","实施支持内容及验收标准超长，仅支持最多300字符"),
 	CLIENT_ORG_CODE_CHECK_ERR("008x008","客户的统一信用代码已存在"),
+	EMAIL("008x009","邮箱格式错误"),
 	;
 
 	/**
diff --git a/common/src/main/java/com/trust/ywx/customer/common/enu/TempFirmStatusEnum.java b/common/src/main/java/com/trust/ywx/customer/common/enu/TempFirmStatusEnum.java
index 96c402a..09b5fb9 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/enu/TempFirmStatusEnum.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/enu/TempFirmStatusEnum.java
@@ -2,28 +2,20 @@ package com.trust.ywx.customer.common.enu;
 /**
  * *************************************************************************
  * 

- * @文件名称:  FirmStatus.java
+ * @文件名称:  TempFirmStatusEnum.java
  * @包   路   径：  cn.org.bjca.ywq.config.common.status
  * @版权所有：北京数字认证股份有限公司 (C) 2017
  *
- * @类描述:  厂商状态枚举
+ * @类描述:  临时客户状态枚举
  * @版本: V1.0
  * @创建人： hudan
  * @创建时间：2017年1月22日 上午10:42:38
  * @修改记录：
  */
 public enum TempFirmStatusEnum {
-
-	//可信任客户
-	FIRM_RIGHT(1,"正常"),
-	FIRM_STOP(3,"停用"),
-	FIRM_CREATE_STAMP(5,"已制章"),
-
-	// 临时客户
 	TEMP_UNAUTHEN(0,"未审核"),
 	TEMP_PASS(1,"审核通过"),
 	TEMP_REFUSE(2,"拒绝"),
-	TEMP_DEL(4, "删除")
 	;
 	
 	private int code;
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/PageBean.java b/common/src/main/java/com/trust/ywx/customer/common/model/PageBean.java
new file mode 100644
index 0000000..7aba6a1
--- /dev/null
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/PageBean.java
@@ -0,0 +1,118 @@
+package com.trust.ywx.customer.common.model;
+
+import com.github.pagehelper.Page;
+
+import java.io.Serializable;
+import java.util.List;
+
+/***************************************************************************
+ * 

+ * @文件名称: PageBean.java
+ * @包 路   径：  cn.org.bjca.ywq.common.base.mybatis
+ * @版权所有：北京数字认证股份有限公司 (C) 2016
+ *
+ * @类描述: 分页返回对象(消费者jar使用)
+ * @版本: V1.5
+ * @创建人： hudan
+ * @创建时间：2016年10月26日 上午9:35:49
+ *
+ * @修改记录：
+ ***/
+public class PageBean implements Serializable {
+    private static final long serialVersionUID = 1814051162533922236L;
+    private int pageNum;
+    private int pageSize;
+    private long total;
+    private int pages;
+    private List list;
+
+    private boolean isFirstPage;
+    private boolean isLastPage;
+    private boolean hasPreviousPage;
+    private boolean hasNextPage;
+
+    public PageBean(List list) {
+        if (list instanceof Page) {
+            Page page = (Page) list;
+            this.pageNum = page.getPageNum();
+            this.pageSize = page.getPageSize();
+            this.total = page.getTotal();
+            this.pages = page.getPages();
+
+            judgePageBoudary();
+        }
+        this.list = list;
+    }
+
+    public PageBean(List desclist, List orginalList) {
+        if (orginalList instanceof Page) {
+            Page page = (Page) orginalList;
+            this.pageNum = page.getPageNum();
+            this.pageSize = page.getPageSize();
+            this.total = page.getTotal();
+            this.pages = page.getPages();
+        }
+        this.list = desclist;
+    }
+
+    public int getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(int pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public long getTotal() {
+        return total;
+    }
+
+    public void setTotal(long total) {
+        this.total = total;
+    }
+
+    public int getPages() {
+        return pages;
+    }
+
+    public void setPages(int pages) {
+        this.pages = pages;
+    }
+
+    public List getList() {
+        return list;
+    }
+
+    public void setList(List list) {
+        this.list = list;
+    }
+
+    private void judgePageBoudary()
+        /*     */ {
+        /* 188 */
+        this.isFirstPage = (this.pageNum == 1);
+        /* 189 */
+        this.isLastPage = (this.pageNum == this.pages);
+        /* 190 */
+        this.hasPreviousPage = (this.pageNum > 1);
+        /* 191 */
+        this.hasNextPage = (this.pageNum < this.pages);
+        /*     */
+    }
+
+    @Override
+    public String toString() {
+        return "PageBean [pageNum=" + pageNum + ", pageSize=" + pageSize + ", total=" + total + ", pages=" + pages
+                + ", isFirstPage=" + isFirstPage + ", isLastPage=" + isLastPage + ", hasPreviousPage=" + hasPreviousPage
+                + ", hasNextPage=" + hasNextPage + "]";
+    }
+
+}
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/PageBeanUtil.java b/common/src/main/java/com/trust/ywx/customer/common/model/PageBeanUtil.java
new file mode 100644
index 0000000..7609f79
--- /dev/null
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/PageBeanUtil.java
@@ -0,0 +1,23 @@
+/**
+ *
+ */
+package com.trust.ywx.customer.common.model;
+
+import java.util.ArrayList;
+
+public class PageBeanUtil {
+
+    public static PageBean getEmptyPage(Integer pageNum, Integer pageSize) {
+        PageBean pageBean = new PageBean(new ArrayList());
+        if (pageSize != null) {
+            pageBean.setPageSize(pageSize);
+        }
+        if (pageNum != null) {
+            pageBean.setPageNum(pageNum);
+        }
+        pageBean.setPages(0);
+        pageBean.setTotal(0);
+        return pageBean;
+    }
+
+}
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TempFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TempFirmParam.java
index a7cd836..736bfa1 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TempFirmParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TempFirmParam.java
@@ -2,10 +2,6 @@ package com.trust.ywx.customer.common.model.manager.request;
 
 import lombok.Data;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
 import java.io.Serializable;
 
 @Data
@@ -19,30 +15,21 @@ public class TempFirmParam implements Serializable {
     /**
      * 客户名称
      */
-    @NotBlank(message = "客户名称不能为空")
-    @Size(max = 29, message = "客户名称最多29个字符")
     private String firmName;
 
     /**
      * 客户联系人
      */
-    @NotBlank(message = "客户联系人不能为空")
-    @Size(max = 10, message = "客户联系人最多10个字符")
     private String firmPerson;
 
     /**
      * 客户联系电话
      */
-    @NotBlank(message = "客户联系电话不能为空")
-    @Size(max = 11, message = "客户联系电话11位")
-    @Size(min = 11, message = "客户联系电话11位")
-    @Pattern(regexp = "1[0-9][0-9]\\d{8}", message = "手机号格式有误")
     private String firmPhone;
 
     /**
      * 客户邮箱
      */
-    @Email(message = "邮箱格式有误")
     private String firmEmail;
 
     /**
@@ -52,7 +39,9 @@ public class TempFirmParam implements Serializable {
 
     /**
      * 代理商ID
+     *
      */
+    @Deprecated
     private String agentClientId;
 
     /**
@@ -61,11 +50,6 @@ public class TempFirmParam implements Serializable {
     private String agentSaleId;
 
     /**
-     * 客户状态 0待审核 1审核通过 2审核拒绝 4删除
-     */
-    private String firmStatus;
-
-    /**
      * 医生端产品形态 支持app
      */
     private Boolean channelApp;
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmInfoParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmInfoParam.java
index 4766de4..34305b8 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmInfoParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmInfoParam.java
@@ -20,6 +20,7 @@ import java.util.Date;
  */
 @Data
 public class TrustFirmInfoParam implements Serializable {
+    private static final long serialVersionUID = -2412440392747736130L;
     /**
      * 客户主键
      */
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmParam.java
index 47a3b66..e2a6eb4 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmParam.java
@@ -1,6 +1,5 @@
 package com.trust.ywx.customer.common.model.manager.request;
 
-import com.trust.ywx.customer.common.model.manager.request.FirmPropParam;
 import lombok.Data;
 
 import java.util.Date;
@@ -81,11 +80,6 @@ public class TrustFirmParam extends FirmPropParam {
      */
 
     private Integer projectStatus;
-    /**
-     * 审核状态
-     * see com.trust.ywx.customer.common.enu.FirmStatusEnum
-     */
-    private Integer FirmStatus;
 
     /**
      * 信步云appid
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TempFirmDto.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TempFirmDto.java
index d13fc1f..c59e614 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TempFirmDto.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TempFirmDto.java
@@ -18,10 +18,8 @@ import java.io.Serializable;
  */
 @Data
 public class TempFirmDto implements Serializable {
-    /**
-     * 客户主键
-     */
-    private String uniqueid;
+
+    private static final long serialVersionUID = -1810636349149250285L;
     /**
      * 客户id
      */
@@ -34,5 +32,31 @@ public class TempFirmDto implements Serializable {
     /**
      * 审核状态
      */
-    private String firmStatus;
+    private String status;
+    /**
+     * 邮箱
+     */
+    private String firmEmail;
+    /**
+     * 联系人
+     */
+    private String firmPerson;
+    /**
+     * 联系电话
+     */
+    private String firmPhoto;
+    /**
+     * 客户logo
+     */
+    private String firmLogo;
+    /**
+     * 产品形态 支持app
+     */
+    private Boolean channelApp;
+
+    /**
+     * 产品形态 支持sdk
+     */
+    private Boolean channelSdk;
+
 }
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDto.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDto.java
index fd6b4a2..71fef56 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDto.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDto.java
@@ -2,6 +2,7 @@ package com.trust.ywx.customer.common.model.manager.response;
 
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -17,7 +18,8 @@ import java.util.Date;
  * @Modify：
  */
 @Data
-public class TrustFirmDto{
+public class TrustFirmDto implements Serializable {
+    private static final long serialVersionUID = -6279431833840706044L;
     /**
      * 客户主键
      */
@@ -34,7 +36,7 @@ public class TrustFirmDto{
     /**
      * 审核状态
      */
-    private String firmStatus;
+    private String status;
 
     /**
      * 第三方应用APP_SECRET
@@ -154,4 +156,8 @@ public class TrustFirmDto{
      */
     private Integer platAppId;
 
+    /**
+     * 客户图标
+     */
+    private String appIcon;
 }
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDtoWithBLOBs.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDtoWithBLOBs.java
deleted file mode 100644
index 520a054..0000000
--- a/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDtoWithBLOBs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.trust.ywx.customer.common.model.manager.response;
-
-import lombok.Data;
-
-/**
- * 

- *
- * @文件名称： CustomerWithBLOBs.java
- * @包 路  径： com.trust.ywx.customer.service.dto.response
- * @Copyright：北京数字医信责任有限公司 (C) 2022 *
- * @Description:
- * @Version: V1.0
- * @Author： hanzhenchao
- * @Date：2022/6/15 10:05
- * @Modify：
- */
-@Data
-public class TrustFirmDtoWithBLOBs extends TrustFirmDto {
-
-    /**
-     * 证书
-     */
-    private String appCert;
-    /**
-     * 客户图标
-     */
-    private String appIcon;
-}
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchCrmFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchCrmFirmParam.java
index 94f0692..4dfa155 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchCrmFirmParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchCrmFirmParam.java
@@ -3,6 +3,8 @@ package com.trust.ywx.customer.common.model.query.request;
 import com.fiftyonetrust.common.model.param.PageParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /***************************************************************************
  * 

  * @文件名称:  Search1FirmParam.java
@@ -15,7 +17,16 @@ import lombok.Data;
  * @创建时间：2017年3月13日 下午1:54:17
  */
 @Data
-public class SearchCrmFirmParam extends SearchFirmParam {
+public class SearchCrmFirmParam extends PageParam implements Serializable {
+	private static final long serialVersionUID = 112265601007415768L;
+	/**
+	 * 客户id
+	 */
+	private String clientId;
+	/**
+	 * 客户名称
+	 */
+	private String firmName;
 	/**
      * 申请人
 	 */
@@ -24,5 +35,10 @@ public class SearchCrmFirmParam extends SearchFirmParam {
 	 * 订单id
 	 */
 	private String orderId;
+	/**
+	 * 审核状态
+	 * see com.trust.ywx.customer.common.enu.CrmFirmStatusEnum
+	 */
+	private Integer status;
 
 }
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchFirmParam.java
index 6d61fde..dbc6b9d 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchFirmParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchFirmParam.java
@@ -3,6 +3,8 @@ package com.trust.ywx.customer.common.model.query.request;
 import com.fiftyonetrust.common.model.param.PageParam;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /***************************************************************************
  * 

  * @文件名称:  Search1FirmParam.java
@@ -15,7 +17,8 @@ import lombok.Data;
  * @创建时间：2017年3月13日 下午1:54:17
  */
 @Data
-public class SearchFirmParam extends PageParam {
+public class SearchFirmParam extends PageParam implements Serializable {
+	private static final long serialVersionUID = -2043152823582713056L;
 	/**
 	 * 客户id
 	 */
@@ -26,11 +29,13 @@ public class SearchFirmParam extends PageParam {
 	private String firmName;
 	/**
      * 代理商id
+	 * 废弃
 	 */
-	private String agentClientId;
+//	private String agentClientId;
 	/**
 	 * 审核状态
+	 * see com.trust.ywx.customer.common.enu.TempFirmStatusEnum
 	 */
-	private Integer firmStatus;
+	private Integer status;
 
 }
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchTrustFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchTrustFirmParam.java
index f8668ba..0ed8ce0 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchTrustFirmParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchTrustFirmParam.java
@@ -3,6 +3,9 @@ package com.trust.ywx.customer.common.model.query.request;
 import com.fiftyonetrust.common.model.param.PageParam;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+import java.io.Serializable;
+
 /***************************************************************************
  * 

  * @文件名称:  Search1FirmParam.java
@@ -15,7 +18,8 @@ import lombok.Data;
  * @创建时间：2017年3月13日 下午1:54:17
  */
 @Data
-public class SearchTrustFirmParam extends PageParam{
+public class SearchTrustFirmParam extends PageParam implements Serializable{
+	private static final long serialVersionUID = 3584593088828595491L;
 	/**
 	 * 客户id
 	 */
@@ -26,8 +30,9 @@ public class SearchTrustFirmParam extends PageParam{
 	private String firmName;
 	/**
 	 * 代理商id
+	 * 已废弃
 	 */
-	private String agentClientId;
+//	private String agentClientId;
 	/**
 	 * 审核状态
 	 */
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/query/response/CrmFirmDto.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/response/CrmFirmDto.java
index 2df8764..fd42171 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/model/query/response/CrmFirmDto.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/response/CrmFirmDto.java
@@ -20,6 +20,7 @@ import java.util.List;
  */
 @Data
 public class CrmFirmDto implements Serializable {
+    private static final long serialVersionUID = 3453284774140479038L;
     private String agentClientId;
     /*CRM订单id*/
     private String orderId;
diff --git a/customer/pom.xml b/customer/pom.xml
index 0322591..c968c77 100644
--- a/customer/pom.xml
+++ b/customer/pom.xml
@@ -29,7 +29,6 @@
         
             com.51trust.ywx
             ywx-customer-common
-            0.0.1-SNAPSHOT
         
 
 
@@ -65,16 +64,28 @@
             com.51trust.rd
             common-util
         
+        
+            com.51trust.rd
+            common-redis
+        
 
         
             org.hibernate.validator
             hibernate-validator
         
 
-
-
-
-
+        
+            com.github.pagehelper
+            pagehelper
+        
+        
+            com.dianping.cat
+            cat-client
+        
+        
+            commons-dbcp
+            commons-dbcp
+        
         
             com.alibaba
             druid-spring-boot-starter
@@ -104,6 +115,10 @@
                     dubbo-remoting-api
                     org.apache.dubbo
                 
+                
+                    fastjson
+                    com.alibaba
+                
             
         
         
@@ -116,15 +131,11 @@
             mysql-connector-java
 
         
-        
-
-
-
-
-
-
 
-        
+        
+            com.alibaba
+            fastjson
+        
 
         
             com.itfsw
@@ -197,56 +208,83 @@
                 
             
         
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+        
+            
+                src/main/resources.${deploy.type}
+            
+            
+                src/main/resources
+                
+                
+                
+                    logback.xml
+                    application.properties
+                
+                true
+            
+            
+                src/main/resources
+                
+                    spring/**
+                    mybatis/**
+                    META-INF/**
+                
+                false
+            
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+            
+                src/main/resources.${deploy.type}
+                
+                
+                
+                    logback.xml
+                    application.properties
+                
+                true
+            
+            
+                src/main/resources.${deploy.type}
+                
+                    spring/**
+                    mybatis/**
+                    base.properties
+                    server.properties
+                    redis.properties
+                    jdbc.properties
+                
+                false
+            
 
-
+        
 
     
+    
+        
+            local
+            
+                local
+            
+        
+        
+            dev
+            
+                dev
+                true
+            
+        
+        
+            test
+            
+                test
+            
+        
+        
+            on
+            
+                on
+            
+        
+    
 
     
     
diff --git a/customer/src/main/java/com/trust/ywx/customer/commons/CatMybatisPlugin.java b/customer/src/main/java/com/trust/ywx/customer/commons/CatMybatisPlugin.java
new file mode 100644
index 0000000..1f20e25
--- /dev/null
+++ b/customer/src/main/java/com/trust/ywx/customer/commons/CatMybatisPlugin.java
@@ -0,0 +1,240 @@
+package com.trust.ywx.customer.commons;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.dianping.cat.Cat;
+import com.dianping.cat.message.Message;
+import com.dianping.cat.message.Transaction;
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.type.TypeHandlerRegistry;
+import org.mybatis.spring.transaction.SpringManagedTransaction;
+import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+import org.springframework.util.ReflectionUtils;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.text.DateFormat;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+
+
+/**
+ * 对MyBatis进行拦截，添加Cat监控
+ * 目前仅支持RoutingDataSource和Druid组合配置的数据源
+ *
+ * @author Steven
+ */
+
+@Intercepts({
+        @Signature(method = "query", type = Executor.class, args = {
+                MappedStatement.class, Object.class, RowBounds.class,
+                ResultHandler.class}),
+        @Signature(method = "update", type = Executor.class, args = {MappedStatement.class, Object.class})
+})
+public class CatMybatisPlugin implements Interceptor {
+
+    private static Log logger = LogFactory.getLog(CatMybatisPlugin.class);
+
+    //缓存，提高性能
+    private static final Map sqlURLCache = new ConcurrentHashMap(256);
+
+    private static final String EMPTY_CONNECTION = "jdbc:mysql://unknown:3306/%s?useUnicode=true";
+
+    private Executor target;
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
+        //得到类名，方法
+        String[] strArr = mappedStatement.getId().split("\\.");
+        String methodName = strArr[strArr.length - 2] + "." + strArr[strArr.length - 1];
+
+        Transaction t = Cat.newTransaction("SQL", methodName);
+
+        //得到sql语句
+        Object parameter = null;
+        if (invocation.getArgs().length > 1) {
+            parameter = invocation.getArgs()[1];
+        }
+        BoundSql boundSql = mappedStatement.getBoundSql(parameter);
+        Configuration configuration = mappedStatement.getConfiguration();
+        String sql = showSql(configuration, boundSql);
+
+        //获取SQL类型
+        SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
+        Cat.logEvent("SQL.Method", sqlCommandType.name().toLowerCase(), Message.SUCCESS, sql);
+
+        String s = this.getSQLDatabase();
+        Cat.logEvent("SQL.Database", s);
+        Object returnObj = null;
+        try {
+            returnObj = invocation.proceed();
+            t.setStatus(Transaction.SUCCESS);
+        } catch (Exception e) {
+            Cat.logError(e);
+        } finally {
+            t.complete();
+        }
+
+        return returnObj;
+    }
+
+    private javax.sql.DataSource getDataSource() {
+        org.apache.ibatis.transaction.Transaction transaction = this.target.getTransaction();
+        if (transaction == null) {
+            logger.error(String.format("Could not find transaction on target [%s]", this.target));
+            return null;
+        }
+        if (transaction instanceof SpringManagedTransaction) {
+            String fieldName = "dataSource";
+            Field field = ReflectionUtils.findField(transaction.getClass(), fieldName, javax.sql.DataSource.class);
+
+            if (field == null) {
+                logger.error(String.format("Could not find field [%s] of type [%s] on target [%s]",
+                        fieldName, javax.sql.DataSource.class, this.target));
+                return null;
+            }
+
+            ReflectionUtils.makeAccessible(field);
+            javax.sql.DataSource dataSource = (javax.sql.DataSource) ReflectionUtils.getField(field, transaction);
+            return dataSource;
+        }
+
+        logger.error(String.format("---the transaction is not SpringManagedTransaction:%s", transaction.getClass().toString()));
+
+        return null;
+    }
+
+    private String getSqlURL() {
+        javax.sql.DataSource dataSource = this.getDataSource();
+
+        if (dataSource == null) {
+            return null;
+        }
+
+        if (dataSource instanceof AbstractRoutingDataSource) {
+            String methodName = "determineTargetDataSource";
+            Method method = ReflectionUtils.findMethod(AbstractRoutingDataSource.class, methodName);
+
+            if (method == null) {
+                logger.error(String.format("---Could not find method [%s] on target [%s]",
+                        methodName, dataSource));
+                return null;
+            }
+
+            ReflectionUtils.makeAccessible(method);
+            javax.sql.DataSource dataSource1 = (javax.sql.DataSource) ReflectionUtils.invokeMethod(method, dataSource);
+            if (dataSource1 instanceof DruidDataSource) {
+                DruidDataSource druidDataSource = (DruidDataSource) dataSource1;
+                return druidDataSource.getUrl();
+            } else {
+                logger.error("---only surpport DruidDataSource:" + dataSource1.getClass().toString());
+            }
+        } else if (dataSource instanceof BasicDataSource) {
+            return ((BasicDataSource) dataSource).getUrl();
+        }
+        return null;
+    }
+
+    private String getSQLDatabase() {
+//        String dbName = RouteDataSourceContext.getRouteKey();
+        String dbName = null; //根据设置的多数据源修改此处,获取dbname
+        if (dbName == null) {
+            dbName = "DEFAULT";
+        }
+        String url = CatMybatisPlugin.sqlURLCache.get(dbName);
+        if (url != null) {
+            return url;
+        }
+
+        url = this.getSqlURL();//目前监控只支持mysql ,其余数据库需要各自修改监控服务端
+        if (url == null) {
+            url = String.format(EMPTY_CONNECTION, dbName);
+        }
+        CatMybatisPlugin.sqlURLCache.put(dbName, url);
+        return url;
+    }
+
+    /**
+     * 解析sql语句
+     *
+     * @param configuration
+     * @param boundSql
+     * @return
+     */
+    public String showSql(Configuration configuration, BoundSql boundSql) {
+        Object parameterObject = boundSql.getParameterObject();
+        List parameterMappings = boundSql.getParameterMappings();
+        String sql = boundSql.getSql().replaceAll("[\\s]+", " ");
+        if (parameterMappings.size() > 0 && parameterObject != null) {
+            TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry();
+            if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
+                sql = sql.replaceFirst("\\?", Matcher.quoteReplacement(getParameterValue(parameterObject)));
+
+            } else {
+                MetaObject metaObject = configuration.newMetaObject(parameterObject);
+                for (ParameterMapping parameterMapping : parameterMappings) {
+                    String propertyName = parameterMapping.getProperty();
+                    if (metaObject.hasGetter(propertyName)) {
+                        Object obj = metaObject.getValue(propertyName);
+                        sql = sql.replaceFirst("\\?", Matcher.quoteReplacement(getParameterValue(obj)));
+                    } else if (boundSql.hasAdditionalParameter(propertyName)) {
+                        Object obj = boundSql.getAdditionalParameter(propertyName);
+                        sql = sql.replaceFirst("\\?", Matcher.quoteReplacement(getParameterValue(obj)));
+                    }
+                }
+            }
+        }
+        return sql;
+    }
+
+    /**
+     * 参数解析
+     *
+     * @param obj
+     * @return
+     */
+    private String getParameterValue(Object obj) {
+        String value = null;
+        if (obj instanceof String) {
+            value = "'" + obj.toString() + "'";
+        } else if (obj instanceof Date) {
+            DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.CHINA);
+            value = "'" + formatter.format(new Date()) + "'";
+        } else {
+            if (obj != null) {
+                value = obj.toString();
+            } else {
+                value = "";
+            }
+
+        }
+        return value;
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        if (target instanceof Executor) {
+            this.target = (Executor) target;
+            return Plugin.wrap(target, this);
+        }
+        return target;
+    }
+
+    @Override
+    public void setProperties(Properties properties) {
+    }
+
+}
diff --git a/customer/src/main/java/com/trust/ywx/customer/commons/ValidateUtil.java b/customer/src/main/java/com/trust/ywx/customer/commons/ValidateUtil.java
new file mode 100644
index 0000000..c94fbe1
--- /dev/null
+++ b/customer/src/main/java/com/trust/ywx/customer/commons/ValidateUtil.java
@@ -0,0 +1,191 @@
+package com.trust.ywx.customer.commons;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * 公用参数校验工具类。
+ *
+ * @Author hezhao
+ * @Date 2015年3月25日
+ */
+public class ValidateUtil {
+
+    private static final Pattern pip4 = Pattern.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}");// ip地址匹配192.168.1.3
+    private static final Pattern pdomain = Pattern.compile("[a-zA-Z0-9-\\u4e00-\\u9fa5]+(.[a-zA-Z0-9-]+)+");
+    private static final Pattern purl = Pattern.compile("(http|https):\\/\\/[\\w\\-_]+(\\.[\\w\\-_]+)+([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?");
+    private static final Pattern pserialno = Pattern.compile("[a-z0-9-_]+");
+    private static final String DOMAINS = ".com.cn|.net.cn|.org.cn|.gov.cn|.com|.net|.tv|.gd|.org|.cc|.vc|.mobi|.cd|.info|.name|.asia|.hk|.me|.la|.sh|.biz|.li|.kr|.in|.us|.io|.ac.cn|.bj.cn|.sh.cn|.tj.cn|.cq.cn|.he.cn|.sx.cn|.nm.cn|.ln.cn|.jl.cn|.hl.cn|.js.cn|.zj.cn|.ah.cn|.fj.cn|.jx.cn|.sd.cn|.ha.cn|.hb.cn|.hn.cn|.gd.cn|.gx.cn|.hi.cn|.sc.cn|.gz.cn|.yn.cn|.xz.cn|.sn.cn|.gs.cn|.qh.cn|.nx.cn|.xj.cn|.tw.cn|.hk.cn|.mo.cn|.cn";
+
+    private ValidateUtil() {
+        // 私有类构造方法
+    }
+
+    /**
+     * 校验字符串是否是英文字母，不分大小写
+     *
+     * @author yuanchangjian
+     * @return
+     */
+    public static boolean isEnglish(String value) {
+        if (StringUtils.isBlank(value)) {
+            return false;
+        }
+        Pattern pattern = Pattern.compile("^[A-Za-z]+$");
+        Matcher m = pattern.matcher(value);
+        return m.matches();
+    }
+
+    /**
+     * 校验电话号码（座机）
+     *
+     * @author yuanchangjian
+     * @return
+     */
+    public static boolean checkPhone(String value) {
+        if (StringUtils.isBlank(value)) {
+            return false;
+        }
+        Pattern pattern = Pattern.compile("^((\\d{3,4})\\-(\\d{8})|(\\d{4})\\-(\\d{7}))$");
+        Matcher m = pattern.matcher(value);
+        return m.matches();
+
+    }
+
+    /**
+     * 校验电话号码（手机）
+     *
+     * @author yuanchangjian
+     * @return
+     */
+    public static boolean checkMobile(String value) {
+        if (StringUtils.isBlank(value)) {
+            return false;
+        }
+        Pattern pattern = Pattern.compile("^1(4[0-9]|3[0-9]|5[0-9]|8[0-9]|7[0-9])\\d{8}$");
+        Matcher m = pattern.matcher(value);
+        return m.matches();
+    }
+
+    /**
+     * 运营商号段如下： 中国联通号码：130、131、132、145（无线上网卡）、155、156、185（iPhone5上市后开放）、186、176（4G号段）、 175（2015年9月10日正式启用，暂只对北京、上海和广东投放办理）
+     * 中国移动号码：134、135、136、137、138、139、147（无线上网卡）、150、151、152、157、158、159、182、183、187、188、178 中国电信号码：133、153、180、181、189、177、173、149 虚拟运营商：170、1718、1719 手机号前3位的数字包括： 1 :1 2 :3,4,5,7,8 3
+     * :0,1,2,3,4,5,6,7,8,9 总结： 目前java手机号码正则表达式有： a :"^1[3|4|5|7|8][0-9]\\d{4,8}$" 一般验证情况下这个就可以了 b :"^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$"
+     * Pattern和Matcher详解（字符串匹配和字节码）http://blog.csdn.net/u010700335/article/details/44616451
+     */
+    public static boolean checkMobileNo(String mobileNo) {
+        if (StringUtils.isBlank(mobileNo)) {
+            return false;
+        }
+        String regex = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
+        boolean isMatch = false;//默认不合格
+        try {
+            if (mobileNo.length() != 11) {
+                isMatch = false;
+            } else {
+                Pattern p = Pattern.compile(regex);
+                Matcher m = p.matcher(mobileNo);
+                isMatch = m.matches();
+            }
+        } catch (Exception e) {
+            isMatch = false;
+            e.printStackTrace();
+        }
+        return isMatch;
+    }
+
+    /**
+     * 校验电子邮箱
+     *
+     * @author yuanchangjian
+     * @return
+     */
+    public static boolean checkEmail(String value) {
+        if (StringUtils.isBlank(value)) {
+            return false;
+        }
+        Pattern pattern = Pattern.compile("^([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\\_|\\.]?)*[a-zA-Z0-9]+\\.[a-zA-Z]{2,3}$");
+        Matcher m = pattern.matcher(value);
+        return m.matches();
+    }
+
+    /**
+     * 是否是url地址
+     *
+     * @param str http://www.oppo.com url地址
+     * @return 是否是url地址
+     */
+    public static boolean checkURL(String str) {
+        if (StringUtils.isBlank(str)) {
+            return false;
+        }
+        Matcher m = purl.matcher(str);
+        return m.matches();
+    }
+
+    /**
+     * 是否是主域名如 baidu.com
+     *
+     * @param str 目标字符串
+     * @return 是否是主域名
+     */
+    public static boolean checkMainDomain(String str) {
+        if (StringUtils.isBlank(str)) {
+            return false;
+        }
+        String[] domains = DOMAINS.split("\\|");
+        for (String s : domains) {
+            if (null != s && !s.trim().equals("") && str.indexOf(s) > 0) {
+                str = str.replace(s, "");
+                if (checkSerialNo(str)) {
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        }
+        return false;
+    }
+
+    public static boolean checkDomain(String s) {
+        if (StringUtils.isBlank(s)) {
+            return false;
+        }
+        Matcher m = pdomain.matcher(s);
+        return m.matches();
+    }
+
+
+    /**
+     * 是不是IP地址
+     *
+     * @param s 目标字符串
+     * @return 是不是IP地址
+     */
+    public static boolean checkIP(String s) {
+        if (StringUtils.isBlank(s)) {
+            return false;
+        }
+        Matcher m = pip4.matcher(s);
+        return m.matches();
+    }
+
+    /**
+     * 校验编号, 只能是数字,字母, 下划线, 减号
+     *
+     * @param str 目标字符串 例如：http://www.oppo.com
+     * @return 是否是编号
+     */
+    public static boolean checkSerialNo(String str) {
+        if (StringUtils.isBlank(str)) {
+            return false;
+        }
+        str = str.toLowerCase().trim();
+
+        Matcher isSerialNo = pserialno.matcher(str);
+        return isSerialNo.matches();
+    }
+
+}
\ No newline at end of file
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/TempFirmDao.java b/customer/src/main/java/com/trust/ywx/customer/dao/TempFirmDao.java
index 8fef97c..c26aa41 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/TempFirmDao.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/TempFirmDao.java
@@ -1,12 +1,19 @@
 package com.trust.ywx.customer.dao;
 
+import com.github.pagehelper.PageHelper;
 import com.trust.ywx.customer.common.enu.TempFirmStatusEnum;
+import com.trust.ywx.customer.common.model.manager.response.TempFirmDto;
+import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
+import com.trust.ywx.customer.common.model.PageBean;
 import com.trust.ywx.customer.dao.mapper.FirmInfoTempMapper;
 import com.trust.ywx.customer.dao.po.FirmInfoTemp;
 import com.trust.ywx.customer.dao.po.FirmInfoTempExample;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -26,20 +33,22 @@ public class TempFirmDao {
     @Resource
     FirmInfoTempMapper tempMapper;
 
+    private List statusList = Arrays.asList(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode()+"",TempFirmStatusEnum.TEMP_REFUSE.getCode()+"");
+
     public FirmInfoTemp getByClientId(String clientId){
         FirmInfoTempExample example = new FirmInfoTempExample();
-        example.createCriteria().andClientIdEqualTo(clientId);
-        return tempMapper.selectOneByExample(example);
+        example.createCriteria().andClientIdEqualTo(clientId).andStatusIn(statusList);
+        return tempMapper.selectOneByExampleWithBLOBs(example);
     }
 
     public int auditPass(String clientId){
         // 将临时客户修改为已审核！
         FirmInfoTempExample example = new FirmInfoTempExample();
         example.createCriteria().andClientIdEqualTo(clientId).
-                andFirmStatusEqualTo(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode()+"");
+                andStatusEqualTo(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode()+"");
 
         FirmInfoTemp record = new FirmInfoTemp();
-        record.setFirmStatus(TempFirmStatusEnum.TEMP_PASS.getCode()+"");
+        record.setStatus(TempFirmStatusEnum.TEMP_PASS.getCode()+"");
         return tempMapper.updateByExampleSelective(record,example);
     }
 
@@ -47,10 +56,10 @@ public class TempFirmDao {
         // 将临时客户修改为审核拒绝！
         FirmInfoTempExample example = new FirmInfoTempExample();
         example.createCriteria().andClientIdEqualTo(clientId).
-                andFirmStatusEqualTo(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode()+"");
+                andStatusEqualTo(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode()+"");
 
         FirmInfoTemp record = new FirmInfoTemp();
-        record.setFirmStatus(TempFirmStatusEnum.TEMP_REFUSE.getCode()+"");
+        record.setStatus(TempFirmStatusEnum.TEMP_REFUSE.getCode()+"");
         return tempMapper.updateByExampleSelective(record,example);
     }
 
@@ -71,4 +80,33 @@ public class TempFirmDao {
         example.createCriteria().andClientIdEqualTo(temp.getClientId());
         return tempMapper.updateByExampleSelective(temp,example);
     }
+
+    public int deleteByClientId(String clientId) {
+        FirmInfoTempExample example = new FirmInfoTempExample();
+        example.createCriteria().andClientIdEqualTo(clientId);
+        return tempMapper.deleteByExample(example);
+    }
+
+    public PageBean getListByParam(SearchFirmParam param) {
+        PageHelper.startPage(param.getPageNo(),param.getPageSize());
+        FirmInfoTempExample example = new FirmInfoTempExample();
+        FirmInfoTempExample.Criteria where = example.createCriteria();
+
+        if(StringUtils.isNotBlank(param.getClientId())){
+            where.andClientIdEqualTo(param.getClientId());
+        }
+        if(StringUtils.isNotBlank(param.getFirmName())){
+            where.andFirmNameEqualTo(param.getFirmName());
+        }
+        if(null != param.getStatus()){
+            where.andStatusEqualTo(param.getStatus()+"");
+        }else{
+            // 查询待审核和审核拒绝的
+            where.andStatusIn(statusList);
+        }
+        example.setOrderByClause(FirmInfoTemp.Column.createTime.desc());
+
+        List list = tempMapper.selectByExample(example);
+        return new PageBean(new ArrayList<>(list),list);
+    }
 }
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/TrustFirmDao.java b/customer/src/main/java/com/trust/ywx/customer/dao/TrustFirmDao.java
index 96a6b8a..1acb5f2 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/TrustFirmDao.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/TrustFirmDao.java
@@ -1,13 +1,15 @@
 package com.trust.ywx.customer.dao;
 
+import com.github.pagehelper.PageHelper;
 import com.trust.ywx.customer.common.enu.FirmStatusEnum;
-import com.trust.ywx.customer.common.enu.ProjectStatusEnum;
+import com.trust.ywx.customer.common.model.PageBean;
 import com.trust.ywx.customer.dao.mapper.FirmInfoMapper;
 import com.trust.ywx.customer.dao.po.FirmInfo;
 import com.trust.ywx.customer.dao.po.FirmInfoExample;
 import org.springframework.stereotype.Repository;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,27 +30,39 @@ public class TrustFirmDao {
     @Resource
     private FirmInfoMapper firmInfoMapper;
 
-    public List getListByOrgCode(String orgCode){
+    public List getListByOrgCode(String orgCode) {
         FirmInfoExample example = new FirmInfoExample();
         example.createCriteria().andClientOrgCodeEqualTo(orgCode);
         return firmInfoMapper.selectByExample(example);
     }
-    public List getListByFirmName(String firmName){
+
+    public List getListByFirmName(String firmName) {
         FirmInfoExample example = new FirmInfoExample();
         example.createCriteria().andFirmNameEqualTo(firmName);
         return firmInfoMapper.selectByExample(example);
     }
 
-    public List getListByIds(List clientIdList, int pageSize, int pageNo) {
+    public PageBean getListByIds(List clientIdList, int pageNo,int pageSize) {
+        PageHelper.startPage(pageNo, pageSize);
+
         FirmInfoExample example = new FirmInfoExample();
-        example.createCriteria().andClientIdIn(clientIdList);
-        example.page(pageNo, pageSize);
-        return firmInfoMapper.selectByExample(example);
+        example.createCriteria().andClientIdIn(clientIdList).andStatusNotEqualTo(FirmStatusEnum.FIRM_SUB_DELETE.getCode());
+        List list = firmInfoMapper.selectByExample(example);
+        return new PageBean<>(new ArrayList<>(list),list);
+    }
+
+    public PageBean getList( int pageNo,int pageSize) {
+        PageHelper.startPage(pageNo, pageSize);
+        FirmInfoExample example = new FirmInfoExample();
+        example.createCriteria().andStatusNotEqualTo(FirmStatusEnum.FIRM_SUB_DELETE.getCode());
+        List list = firmInfoMapper.selectByExample(example);
+        return new PageBean<>(new ArrayList<>(list),list);
     }
 
     /**
      * 根据客户Id查询客户信息
      * 已删除的客户不对外暴露
+     *
      * @param clientId
      * @return
      */
@@ -60,7 +74,8 @@ public class TrustFirmDao {
 
     /**
      * 根据客户Id查询客户信息
-     *  已删除的客户不对外暴露
+     * 已删除的客户不对外暴露
+     *
      * @param clientId
      * @return
      */
@@ -76,15 +91,17 @@ public class TrustFirmDao {
         firmInfo.setUpdateTime(null);
         return firmInfoMapper.insertSelective(firmInfo);
     }
+
     public int update(FirmInfo firmInfo) {
         firmInfo.setUpdateTime(null);
         FirmInfoExample example = new FirmInfoExample();
         example.createCriteria().andClientIdEqualTo(firmInfo.getClientId());
-        return firmInfoMapper.updateByExampleSelective(firmInfo,example);
+        return firmInfoMapper.updateByExampleSelective(firmInfo, example);
     }
 
     /**
      * 根据客户id删除客户
+     *
      * @param clientId
      * @return
      */
@@ -94,6 +111,6 @@ public class TrustFirmDao {
         firmInfo.setStatus(FirmStatusEnum.FIRM_SUB_DELETE.getCode());
         FirmInfoExample example = new FirmInfoExample();
         example.createCriteria().andClientIdEqualTo(clientId);
-        return firmInfoMapper.updateByExampleSelective(firmInfo,example);
+        return firmInfoMapper.updateByExampleSelective(firmInfo, example);
     }
 }
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/datasource/MyBatisConfiguration.java b/customer/src/main/java/com/trust/ywx/customer/dao/datasource/MyBatisConfiguration.java
index 790ff46..078b3da 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/datasource/MyBatisConfiguration.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/datasource/MyBatisConfiguration.java
@@ -1,6 +1,8 @@
 package com.trust.ywx.customer.dao.datasource;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import com.github.pagehelper.PageHelper;
+import com.trust.ywx.customer.commons.CatMybatisPlugin;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionFactoryBean;
@@ -38,7 +40,7 @@ public class MyBatisConfiguration {
     @Resource
     private Environment env;
 
-    @Value("${spring.datasource.url}")
+    @Value("${jdbc.url}")
     private String dbUrl;
     @Value("${jdbc.username}")
     private String username;
@@ -122,6 +124,9 @@ public class MyBatisConfiguration {
     public SqlSessionFactory sqlSessionFactory(DataSource ds) throws Exception {
         SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean();
         sqlSessionFactoryBean.setDataSource(ds);
+        Interceptor[] plugins = new Interceptor[]{pageHelper(), catInterceptor()};
+        sqlSessionFactoryBean.setPlugins(plugins);
+
         PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
 
         String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
@@ -132,8 +137,20 @@ public class MyBatisConfiguration {
         return sqlSessionFactoryBean.getObject();
     }
 
-//    @Bean
-//    public CatMybatisPlugin catInterceptor() {
-//        return new CatMybatisPlugin();
-//    }
+    @Bean
+    public PageHelper pageHelper() {
+        PageHelper pageHelper = new PageHelper();
+        Properties p = new Properties();
+        p.setProperty("offsetAsPageNum", "true");
+        p.setProperty("rowBoundsWithCount", "true");
+        p.setProperty("reasonable", "true");
+        p.setProperty("helper-dialect", env.getProperty("datasource.dialect"));
+        pageHelper.setProperties(p);
+        return pageHelper;
+    }
+
+    @Bean
+    public CatMybatisPlugin catInterceptor() {
+        return new CatMybatisPlugin();
+    }
 }
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfo.java b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfo.java
index 9715378..9582dce 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfo.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfo.java
@@ -196,7 +196,7 @@ public class FirmInfo implements Serializable {
      *
      * Table:     firm_info
      * Column:    create_time
-     * Nullable:  true
+     * Nullable:  false
      */
     private Date createTime;
 
@@ -205,7 +205,7 @@ public class FirmInfo implements Serializable {
      *
      * Table:     firm_info
      * Column:    update_time
-     * Nullable:  true
+     * Nullable:  false
      */
     private Date updateTime;
 
@@ -253,15 +253,6 @@ public class FirmInfo implements Serializable {
     private Integer platAppId;
 
     /**
-     * 第三方应用证书
-     *
-     * Table:     firm_info
-     * Column:    app_cert
-     * Nullable:  true
-     */
-    private String appCert;
-
-    /**
      * 第三方厂商图标
      *
      * Table:     firm_info
@@ -305,7 +296,6 @@ public class FirmInfo implements Serializable {
         sb.append(", caChannel=").append(caChannel);
         sb.append(", projectStatus=").append(projectStatus);
         sb.append(", platAppId=").append(platAppId);
-        sb.append(", appCert=").append(appCert);
         sb.append(", appIcon=").append(appIcon);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
@@ -458,11 +448,6 @@ public class FirmInfo implements Serializable {
             return this;
         }
 
-        public Builder appCert(String appCert) {
-            obj.setAppCert(appCert);
-            return this;
-        }
-
         public Builder appIcon(String appIcon) {
             obj.setAppIcon(appIcon);
             return this;
@@ -501,7 +486,6 @@ public class FirmInfo implements Serializable {
         caChannel("ca_channel", "caChannel", "INTEGER", false),
         projectStatus("project_status", "projectStatus", "INTEGER", false),
         platAppId("plat_app_id", "platAppId", "INTEGER", false),
-        appCert("app_cert", "appCert", "LONGVARCHAR", false),
         appIcon("app_icon", "appIcon", "LONGVARCHAR", false);
 
         private static final String BEGINNING_DELIMITER = "\"";
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoTemp.java b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoTemp.java
index 8098f07..2adbac8 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoTemp.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoTemp.java
@@ -21,15 +21,6 @@ public class FirmInfoTemp implements Serializable {
     private String uniqueid;
 
     /**
-     * 外键ID
-     *
-     * Table:     firm_info_temp
-     * Column:    open_id
-     * Nullable:  true
-     */
-    private String openId;
-
-    /**
      * 企业营业执照
      *
      * Table:     firm_info_temp
@@ -48,33 +39,6 @@ public class FirmInfoTemp implements Serializable {
     private String orgCodeUrl;
 
     /**
-     * 法人身份证正面
-     *
-     * Table:     firm_info_temp
-     * Column:    juridical_idcard_front_url
-     * Nullable:  true
-     */
-    private String juridicalIdcardFrontUrl;
-
-    /**
-     * 法人身份证背面
-     *
-     * Table:     firm_info_temp
-     * Column:    juridical_idcard_back_url
-     * Nullable:  true
-     */
-    private String juridicalIdcardBackUrl;
-
-    /**
-     * 法人临时身份证
-     *
-     * Table:     firm_info_temp
-     * Column:    juridical_tmp_id_url
-     * Nullable:  true
-     */
-    private String juridicalTmpIdUrl;
-
-    /**
      * 企业名称
      *
      * Table:     firm_info_temp
@@ -84,24 +48,6 @@ public class FirmInfoTemp implements Serializable {
     private String firmName;
 
     /**
-     * 工商注册号
-     *
-     * Table:     firm_info_temp
-     * Column:    firm_bus_reg_num
-     * Nullable:  true
-     */
-    private String firmBusRegNum;
-
-    /**
-     * 社会信用代码
-     *
-     * Table:     firm_info_temp
-     * Column:    firm_soc_cre_code
-     * Nullable:  true
-     */
-    private String firmSocCreCode;
-
-    /**
      * 企业地址
      *
      * Table:     firm_info_temp
@@ -118,15 +64,6 @@ public class FirmInfoTemp implements Serializable {
     private String firmOrgCode;
 
     /**
-     * 税务登记证号
-     *
-     * Table:     firm_info_temp
-     * Column:    firm_tax_reg_cert_code
-     * Nullable:  true
-     */
-    private String firmTaxRegCertCode;
-
-    /**
      * 经营范围
      *
      * Table:     firm_info_temp
@@ -145,51 +82,6 @@ public class FirmInfoTemp implements Serializable {
     private Date firmBusTime;
 
     /**
-     * 法人归属地
-     *
-     * Table:     firm_info_temp
-     * Column:    juridical_nationality
-     * Nullable:  true
-     */
-    private String juridicalNationality;
-
-    /**
-     * 法人姓名
-     *
-     * Table:     firm_info_temp
-     * Column:    juridical_name
-     * Nullable:  true
-     */
-    private String juridicalName;
-
-    /**
-     * 法人联系电话
-     *
-     * Table:     firm_info_temp
-     * Column:    juridical_phone
-     * Nullable:  true
-     */
-    private String juridicalPhone;
-
-    /**
-     * 法人身份证号
-     *
-     * Table:     firm_info_temp
-     * Column:    juridical_idcard
-     * Nullable:  true
-     */
-    private String juridicalIdcard;
-
-    /**
-     * 法人证件有效期
-     *
-     * Table:     firm_info_temp
-     * Column:    juridical_time
-     * Nullable:  true
-     */
-    private Date juridicalTime;
-
-    /**
      * 代理人姓名
      *
      * Table:     firm_info_temp
@@ -235,22 +127,13 @@ public class FirmInfoTemp implements Serializable {
     private String firmEmail;
 
     /**
-     * 实名认证标识（0：未认证 1：已认证 2：认证不通过 3：认证失败）
-     *
-     * Table:     firm_info_temp
-     * Column:    realname_check
-     * Nullable:  false
-     */
-    private String realnameCheck;
-
-    /**
      * 厂商状态0待审核 1审核通过 2审核拒绝 4删除
      *
      * Table:     firm_info_temp
      * Column:    firm_status
      * Nullable:  false
      */
-    private String firmStatus;
+    private String status;
 
     /**
      * 实名认证标识（0：未认证 1：已认证 2：认证不通过 3：认证失败）
@@ -305,16 +188,20 @@ public class FirmInfoTemp implements Serializable {
     private String clientId;
 
     /**
+     * 创建
+     *
      * Table:     firm_info_temp
      * Column:    create_time
-     * Nullable:  true
+     * Nullable:  false
      */
     private Date createTime;
 
     /**
+     * 修改时间
+     *
      * Table:     firm_info_temp
      * Column:    update_time
-     * Nullable:  true
+     * Nullable:  false
      */
     private Date updateTime;
 
@@ -343,32 +230,19 @@ public class FirmInfoTemp implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", uniqueid=").append(uniqueid);
-        sb.append(", openId=").append(openId);
         sb.append(", businessLicenseUrl=").append(businessLicenseUrl);
         sb.append(", orgCodeUrl=").append(orgCodeUrl);
-        sb.append(", juridicalIdcardFrontUrl=").append(juridicalIdcardFrontUrl);
-        sb.append(", juridicalIdcardBackUrl=").append(juridicalIdcardBackUrl);
-        sb.append(", juridicalTmpIdUrl=").append(juridicalTmpIdUrl);
         sb.append(", firmName=").append(firmName);
-        sb.append(", firmBusRegNum=").append(firmBusRegNum);
-        sb.append(", firmSocCreCode=").append(firmSocCreCode);
         sb.append(", firmAddress=").append(firmAddress);
         sb.append(", firmOrgCode=").append(firmOrgCode);
-        sb.append(", firmTaxRegCertCode=").append(firmTaxRegCertCode);
         sb.append(", firmBusScope=").append(firmBusScope);
         sb.append(", firmBusTime=").append(firmBusTime);
-        sb.append(", juridicalNationality=").append(juridicalNationality);
-        sb.append(", juridicalName=").append(juridicalName);
-        sb.append(", juridicalPhone=").append(juridicalPhone);
-        sb.append(", juridicalIdcard=").append(juridicalIdcard);
-        sb.append(", juridicalTime=").append(juridicalTime);
         sb.append(", agentName=").append(agentName);
         sb.append(", agentIdcard=").append(agentIdcard);
         sb.append(", agentTime=").append(agentTime);
         sb.append(", firmPhone=").append(firmPhone);
         sb.append(", firmEmail=").append(firmEmail);
-        sb.append(", realnameCheck=").append(realnameCheck);
-        sb.append(", firmStatus=").append(firmStatus);
+        sb.append(", status=").append(status);
         sb.append(", juridicalRealnameCheck=").append(juridicalRealnameCheck);
         sb.append(", agentPhone=").append(agentPhone);
         sb.append(", channel=").append(channel);
@@ -400,11 +274,6 @@ public class FirmInfoTemp implements Serializable {
             return this;
         }
 
-        public Builder openId(String openId) {
-            obj.setOpenId(openId);
-            return this;
-        }
-
         public Builder businessLicenseUrl(String businessLicenseUrl) {
             obj.setBusinessLicenseUrl(businessLicenseUrl);
             return this;
@@ -415,41 +284,11 @@ public class FirmInfoTemp implements Serializable {
             return this;
         }
 
-        public Builder juridicalIdcard(String juridicalIdcard) {
-            obj.setJuridicalIdcard(juridicalIdcard);
-            return this;
-        }
-
-        public Builder juridicalIdcardFrontUrl(String juridicalIdcardFrontUrl) {
-            obj.setJuridicalIdcardFrontUrl(juridicalIdcardFrontUrl);
-            return this;
-        }
-
-        public Builder juridicalIdcardBackUrl(String juridicalIdcardBackUrl) {
-            obj.setJuridicalIdcardBackUrl(juridicalIdcardBackUrl);
-            return this;
-        }
-
-        public Builder juridicalTmpIdUrl(String juridicalTmpIdUrl) {
-            obj.setJuridicalTmpIdUrl(juridicalTmpIdUrl);
-            return this;
-        }
-
         public Builder firmName(String firmName) {
             obj.setFirmName(firmName);
             return this;
         }
 
-        public Builder firmBusRegNum(String firmBusRegNum) {
-            obj.setFirmBusRegNum(firmBusRegNum);
-            return this;
-        }
-
-        public Builder firmSocCreCode(String firmSocCreCode) {
-            obj.setFirmSocCreCode(firmSocCreCode);
-            return this;
-        }
-
         public Builder firmAddress(String firmAddress) {
             obj.setFirmAddress(firmAddress);
             return this;
@@ -460,11 +299,6 @@ public class FirmInfoTemp implements Serializable {
             return this;
         }
 
-        public Builder firmTaxRegCertCode(String firmTaxRegCertCode) {
-            obj.setFirmTaxRegCertCode(firmTaxRegCertCode);
-            return this;
-        }
-
         public Builder firmBusScope(String firmBusScope) {
             obj.setFirmBusScope(firmBusScope);
             return this;
@@ -475,26 +309,6 @@ public class FirmInfoTemp implements Serializable {
             return this;
         }
 
-        public Builder juridicalNationality(String juridicalNationality) {
-            obj.setJuridicalNationality(juridicalNationality);
-            return this;
-        }
-
-        public Builder juridicalName(String juridicalName) {
-            obj.setJuridicalName(juridicalName);
-            return this;
-        }
-
-        public Builder juridicalPhone(String juridicalPhone) {
-            obj.setJuridicalPhone(juridicalPhone);
-            return this;
-        }
-
-        public Builder juridicalTime(Date juridicalTime) {
-            obj.setJuridicalTime(juridicalTime);
-            return this;
-        }
-
         public Builder agentName(String agentName) {
             obj.setAgentName(agentName);
             return this;
@@ -520,13 +334,8 @@ public class FirmInfoTemp implements Serializable {
             return this;
         }
 
-        public Builder realnameCheck(String realnameCheck) {
-            obj.setRealnameCheck(realnameCheck);
-            return this;
-        }
-
-        public Builder firmStatus(String firmStatus) {
-            obj.setFirmStatus(firmStatus);
+        public Builder status(String status) {
+            obj.setStatus(status);
             return this;
         }
 
@@ -587,32 +396,19 @@ public class FirmInfoTemp implements Serializable {
 
     public enum Column {
         uniqueid("uniqueid", "uniqueid", "VARCHAR", false),
-        openId("open_id", "openId", "VARCHAR", false),
         businessLicenseUrl("business_license_url", "businessLicenseUrl", "VARCHAR", false),
         orgCodeUrl("org_code_url", "orgCodeUrl", "VARCHAR", false),
-        juridicalIdcardFrontUrl("juridical_idcard_front_url", "juridicalIdcardFrontUrl", "VARCHAR", false),
-        juridicalIdcardBackUrl("juridical_idcard_back_url", "juridicalIdcardBackUrl", "VARCHAR", false),
-        juridicalTmpIdUrl("juridical_tmp_id_url", "juridicalTmpIdUrl", "VARCHAR", false),
         firmName("firm_name", "firmName", "VARCHAR", false),
-        firmBusRegNum("firm_bus_reg_num", "firmBusRegNum", "VARCHAR", false),
-        firmSocCreCode("firm_soc_cre_code", "firmSocCreCode", "VARCHAR", false),
         firmAddress("firm_addr", "firmAddress", "VARCHAR", false),
         firmOrgCode("firm_org_code", "firmOrgCode", "VARCHAR", false),
-        firmTaxRegCertCode("firm_tax_reg_cert_code", "firmTaxRegCertCode", "VARCHAR", false),
         firmBusScope("firm_bus_scope", "firmBusScope", "VARCHAR", false),
         firmBusTime("firm_bus_time", "firmBusTime", "TIMESTAMP", false),
-        juridicalNationality("juridical_nationality", "juridicalNationality", "VARCHAR", false),
-        juridicalName("juridical_name", "juridicalName", "VARCHAR", false),
-        juridicalPhone("juridical_phone", "juridicalPhone", "VARCHAR", false),
-        juridicalIdcard("juridical_idcard", "juridicalIdcard", "VARCHAR", false),
-        juridicalTime("juridical_time", "juridicalTime", "TIMESTAMP", false),
         agentName("agent_name", "agentName", "VARCHAR", false),
         agentIdcard("agent_idcard", "agentIdcard", "VARCHAR", false),
         agentTime("agent_time", "agentTime", "TIMESTAMP", false),
         firmPhone("firm_phone", "firmPhone", "VARCHAR", false),
         firmEmail("firm_email", "firmEmail", "VARCHAR", false),
-        realnameCheck("realname_check", "realnameCheck", "CHAR", false),
-        firmStatus("firm_status", "firmStatus", "VARCHAR", false),
+        status("firm_status", "status", "VARCHAR", false),
         juridicalRealnameCheck("juridical_realname_check", "juridicalRealnameCheck", "CHAR", false),
         agentPhone("agent_phone", "agentPhone", "VARCHAR", false),
         channel("channel", "channel", "VARCHAR", false),
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoTempExample.java b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoTempExample.java
index 0e78bbd..7b87348 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoTempExample.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoTempExample.java
@@ -214,76 +214,6 @@ public class FirmInfoTempExample {
             return (Criteria) this;
         }
 
-        public Criteria andOpenIdIsNull() {
-            addCriterion("open_id is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdIsNotNull() {
-            addCriterion("open_id is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdEqualTo(String value) {
-            addCriterion("open_id =", value, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdNotEqualTo(String value) {
-            addCriterion("open_id <>", value, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdGreaterThan(String value) {
-            addCriterion("open_id >", value, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdGreaterThanOrEqualTo(String value) {
-            addCriterion("open_id >=", value, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdLessThan(String value) {
-            addCriterion("open_id <", value, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdLessThanOrEqualTo(String value) {
-            addCriterion("open_id <=", value, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdLike(String value) {
-            addCriterion("open_id like", value, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdNotLike(String value) {
-            addCriterion("open_id not like", value, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdIn(List values) {
-            addCriterion("open_id in", values, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdNotIn(List values) {
-            addCriterion("open_id not in", values, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdBetween(String value1, String value2) {
-            addCriterion("open_id between", value1, value2, "openId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOpenIdNotBetween(String value1, String value2) {
-            addCriterion("open_id not between", value1, value2, "openId");
-            return (Criteria) this;
-        }
-
         public Criteria andBusinessLicenseUrlIsNull() {
             addCriterion("business_license_url is null");
             return (Criteria) this;
@@ -324,1203 +254,443 @@ public class FirmInfoTempExample {
             return (Criteria) this;
         }
 
-        public Criteria andBusinessLicenseUrlLike(String value) {
-            addCriterion("business_license_url like", value, "businessLicenseUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andBusinessLicenseUrlNotLike(String value) {
-            addCriterion("business_license_url not like", value, "businessLicenseUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andBusinessLicenseUrlIn(List values) {
-            addCriterion("business_license_url in", values, "businessLicenseUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andBusinessLicenseUrlNotIn(List values) {
-            addCriterion("business_license_url not in", values, "businessLicenseUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andBusinessLicenseUrlBetween(String value1, String value2) {
-            addCriterion("business_license_url between", value1, value2, "businessLicenseUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andBusinessLicenseUrlNotBetween(String value1, String value2) {
-            addCriterion("business_license_url not between", value1, value2, "businessLicenseUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlIsNull() {
-            addCriterion("org_code_url is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlIsNotNull() {
-            addCriterion("org_code_url is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlEqualTo(String value) {
-            addCriterion("org_code_url =", value, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlNotEqualTo(String value) {
-            addCriterion("org_code_url <>", value, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlGreaterThan(String value) {
-            addCriterion("org_code_url >", value, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("org_code_url >=", value, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlLessThan(String value) {
-            addCriterion("org_code_url <", value, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlLessThanOrEqualTo(String value) {
-            addCriterion("org_code_url <=", value, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlLike(String value) {
-            addCriterion("org_code_url like", value, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlNotLike(String value) {
-            addCriterion("org_code_url not like", value, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlIn(List values) {
-            addCriterion("org_code_url in", values, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlNotIn(List values) {
-            addCriterion("org_code_url not in", values, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlBetween(String value1, String value2) {
-            addCriterion("org_code_url between", value1, value2, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrgCodeUrlNotBetween(String value1, String value2) {
-            addCriterion("org_code_url not between", value1, value2, "orgCodeUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlIsNull() {
-            addCriterion("juridical_idcard_front_url is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlIsNotNull() {
-            addCriterion("juridical_idcard_front_url is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlEqualTo(String value) {
-            addCriterion("juridical_idcard_front_url =", value, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlNotEqualTo(String value) {
-            addCriterion("juridical_idcard_front_url <>", value, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlGreaterThan(String value) {
-            addCriterion("juridical_idcard_front_url >", value, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("juridical_idcard_front_url >=", value, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlLessThan(String value) {
-            addCriterion("juridical_idcard_front_url <", value, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlLessThanOrEqualTo(String value) {
-            addCriterion("juridical_idcard_front_url <=", value, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlLike(String value) {
-            addCriterion("juridical_idcard_front_url like", value, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlNotLike(String value) {
-            addCriterion("juridical_idcard_front_url not like", value, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlIn(List values) {
-            addCriterion("juridical_idcard_front_url in", values, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlNotIn(List values) {
-            addCriterion("juridical_idcard_front_url not in", values, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlBetween(String value1, String value2) {
-            addCriterion("juridical_idcard_front_url between", value1, value2, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardFrontUrlNotBetween(String value1, String value2) {
-            addCriterion("juridical_idcard_front_url not between", value1, value2, "juridicalIdcardFrontUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlIsNull() {
-            addCriterion("juridical_idcard_back_url is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlIsNotNull() {
-            addCriterion("juridical_idcard_back_url is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlEqualTo(String value) {
-            addCriterion("juridical_idcard_back_url =", value, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlNotEqualTo(String value) {
-            addCriterion("juridical_idcard_back_url <>", value, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlGreaterThan(String value) {
-            addCriterion("juridical_idcard_back_url >", value, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("juridical_idcard_back_url >=", value, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlLessThan(String value) {
-            addCriterion("juridical_idcard_back_url <", value, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlLessThanOrEqualTo(String value) {
-            addCriterion("juridical_idcard_back_url <=", value, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlLike(String value) {
-            addCriterion("juridical_idcard_back_url like", value, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlNotLike(String value) {
-            addCriterion("juridical_idcard_back_url not like", value, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlIn(List values) {
-            addCriterion("juridical_idcard_back_url in", values, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlNotIn(List values) {
-            addCriterion("juridical_idcard_back_url not in", values, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlBetween(String value1, String value2) {
-            addCriterion("juridical_idcard_back_url between", value1, value2, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalIdcardBackUrlNotBetween(String value1, String value2) {
-            addCriterion("juridical_idcard_back_url not between", value1, value2, "juridicalIdcardBackUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlIsNull() {
-            addCriterion("juridical_tmp_id_url is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlIsNotNull() {
-            addCriterion("juridical_tmp_id_url is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlEqualTo(String value) {
-            addCriterion("juridical_tmp_id_url =", value, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlNotEqualTo(String value) {
-            addCriterion("juridical_tmp_id_url <>", value, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlGreaterThan(String value) {
-            addCriterion("juridical_tmp_id_url >", value, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlGreaterThanOrEqualTo(String value) {
-            addCriterion("juridical_tmp_id_url >=", value, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlLessThan(String value) {
-            addCriterion("juridical_tmp_id_url <", value, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlLessThanOrEqualTo(String value) {
-            addCriterion("juridical_tmp_id_url <=", value, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlLike(String value) {
-            addCriterion("juridical_tmp_id_url like", value, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlNotLike(String value) {
-            addCriterion("juridical_tmp_id_url not like", value, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlIn(List values) {
-            addCriterion("juridical_tmp_id_url in", values, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlNotIn(List values) {
-            addCriterion("juridical_tmp_id_url not in", values, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlBetween(String value1, String value2) {
-            addCriterion("juridical_tmp_id_url between", value1, value2, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andJuridicalTmpIdUrlNotBetween(String value1, String value2) {
-            addCriterion("juridical_tmp_id_url not between", value1, value2, "juridicalTmpIdUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameIsNull() {
-            addCriterion("firm_name is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameIsNotNull() {
-            addCriterion("firm_name is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameEqualTo(String value) {
-            addCriterion("firm_name =", value, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameNotEqualTo(String value) {
-            addCriterion("firm_name <>", value, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameGreaterThan(String value) {
-            addCriterion("firm_name >", value, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameGreaterThanOrEqualTo(String value) {
-            addCriterion("firm_name >=", value, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameLessThan(String value) {
-            addCriterion("firm_name <", value, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameLessThanOrEqualTo(String value) {
-            addCriterion("firm_name <=", value, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameLike(String value) {
-            addCriterion("firm_name like", value, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameNotLike(String value) {
-            addCriterion("firm_name not like", value, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameIn(List values) {
-            addCriterion("firm_name in", values, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameNotIn(List values) {
-            addCriterion("firm_name not in", values, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameBetween(String value1, String value2) {
-            addCriterion("firm_name between", value1, value2, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmNameNotBetween(String value1, String value2) {
-            addCriterion("firm_name not between", value1, value2, "firmName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumIsNull() {
-            addCriterion("firm_bus_reg_num is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumIsNotNull() {
-            addCriterion("firm_bus_reg_num is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumEqualTo(String value) {
-            addCriterion("firm_bus_reg_num =", value, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumNotEqualTo(String value) {
-            addCriterion("firm_bus_reg_num <>", value, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumGreaterThan(String value) {
-            addCriterion("firm_bus_reg_num >", value, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumGreaterThanOrEqualTo(String value) {
-            addCriterion("firm_bus_reg_num >=", value, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumLessThan(String value) {
-            addCriterion("firm_bus_reg_num <", value, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumLessThanOrEqualTo(String value) {
-            addCriterion("firm_bus_reg_num <=", value, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumLike(String value) {
-            addCriterion("firm_bus_reg_num like", value, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumNotLike(String value) {
-            addCriterion("firm_bus_reg_num not like", value, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumIn(List values) {
-            addCriterion("firm_bus_reg_num in", values, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumNotIn(List values) {
-            addCriterion("firm_bus_reg_num not in", values, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumBetween(String value1, String value2) {
-            addCriterion("firm_bus_reg_num between", value1, value2, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusRegNumNotBetween(String value1, String value2) {
-            addCriterion("firm_bus_reg_num not between", value1, value2, "firmBusRegNum");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeIsNull() {
-            addCriterion("firm_soc_cre_code is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeIsNotNull() {
-            addCriterion("firm_soc_cre_code is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeEqualTo(String value) {
-            addCriterion("firm_soc_cre_code =", value, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeNotEqualTo(String value) {
-            addCriterion("firm_soc_cre_code <>", value, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeGreaterThan(String value) {
-            addCriterion("firm_soc_cre_code >", value, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("firm_soc_cre_code >=", value, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeLessThan(String value) {
-            addCriterion("firm_soc_cre_code <", value, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeLessThanOrEqualTo(String value) {
-            addCriterion("firm_soc_cre_code <=", value, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeLike(String value) {
-            addCriterion("firm_soc_cre_code like", value, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeNotLike(String value) {
-            addCriterion("firm_soc_cre_code not like", value, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeIn(List values) {
-            addCriterion("firm_soc_cre_code in", values, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeNotIn(List values) {
-            addCriterion("firm_soc_cre_code not in", values, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeBetween(String value1, String value2) {
-            addCriterion("firm_soc_cre_code between", value1, value2, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmSocCreCodeNotBetween(String value1, String value2) {
-            addCriterion("firm_soc_cre_code not between", value1, value2, "firmSocCreCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressIsNull() {
-            addCriterion("firm_addr is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressIsNotNull() {
-            addCriterion("firm_addr is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressEqualTo(String value) {
-            addCriterion("firm_addr =", value, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressNotEqualTo(String value) {
-            addCriterion("firm_addr <>", value, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressGreaterThan(String value) {
-            addCriterion("firm_addr >", value, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressGreaterThanOrEqualTo(String value) {
-            addCriterion("firm_addr >=", value, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressLessThan(String value) {
-            addCriterion("firm_addr <", value, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressLessThanOrEqualTo(String value) {
-            addCriterion("firm_addr <=", value, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressLike(String value) {
-            addCriterion("firm_addr like", value, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressNotLike(String value) {
-            addCriterion("firm_addr not like", value, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressIn(List values) {
-            addCriterion("firm_addr in", values, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressNotIn(List values) {
-            addCriterion("firm_addr not in", values, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressBetween(String value1, String value2) {
-            addCriterion("firm_addr between", value1, value2, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmAddressNotBetween(String value1, String value2) {
-            addCriterion("firm_addr not between", value1, value2, "firmAddress");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeIsNull() {
-            addCriterion("firm_org_code is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeIsNotNull() {
-            addCriterion("firm_org_code is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeEqualTo(String value) {
-            addCriterion("firm_org_code =", value, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeNotEqualTo(String value) {
-            addCriterion("firm_org_code <>", value, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeGreaterThan(String value) {
-            addCriterion("firm_org_code >", value, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("firm_org_code >=", value, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeLessThan(String value) {
-            addCriterion("firm_org_code <", value, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeLessThanOrEqualTo(String value) {
-            addCriterion("firm_org_code <=", value, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeLike(String value) {
-            addCriterion("firm_org_code like", value, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeNotLike(String value) {
-            addCriterion("firm_org_code not like", value, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeIn(List values) {
-            addCriterion("firm_org_code in", values, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeNotIn(List values) {
-            addCriterion("firm_org_code not in", values, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeBetween(String value1, String value2) {
-            addCriterion("firm_org_code between", value1, value2, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmOrgCodeNotBetween(String value1, String value2) {
-            addCriterion("firm_org_code not between", value1, value2, "firmOrgCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeIsNull() {
-            addCriterion("firm_tax_reg_cert_code is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeIsNotNull() {
-            addCriterion("firm_tax_reg_cert_code is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeEqualTo(String value) {
-            addCriterion("firm_tax_reg_cert_code =", value, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeNotEqualTo(String value) {
-            addCriterion("firm_tax_reg_cert_code <>", value, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeGreaterThan(String value) {
-            addCriterion("firm_tax_reg_cert_code >", value, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeGreaterThanOrEqualTo(String value) {
-            addCriterion("firm_tax_reg_cert_code >=", value, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeLessThan(String value) {
-            addCriterion("firm_tax_reg_cert_code <", value, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeLessThanOrEqualTo(String value) {
-            addCriterion("firm_tax_reg_cert_code <=", value, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeLike(String value) {
-            addCriterion("firm_tax_reg_cert_code like", value, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeNotLike(String value) {
-            addCriterion("firm_tax_reg_cert_code not like", value, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeIn(List values) {
-            addCriterion("firm_tax_reg_cert_code in", values, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeNotIn(List values) {
-            addCriterion("firm_tax_reg_cert_code not in", values, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeBetween(String value1, String value2) {
-            addCriterion("firm_tax_reg_cert_code between", value1, value2, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmTaxRegCertCodeNotBetween(String value1, String value2) {
-            addCriterion("firm_tax_reg_cert_code not between", value1, value2, "firmTaxRegCertCode");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusScopeIsNull() {
-            addCriterion("firm_bus_scope is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusScopeIsNotNull() {
-            addCriterion("firm_bus_scope is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusScopeEqualTo(String value) {
-            addCriterion("firm_bus_scope =", value, "firmBusScope");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusScopeNotEqualTo(String value) {
-            addCriterion("firm_bus_scope <>", value, "firmBusScope");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusScopeGreaterThan(String value) {
-            addCriterion("firm_bus_scope >", value, "firmBusScope");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusScopeGreaterThanOrEqualTo(String value) {
-            addCriterion("firm_bus_scope >=", value, "firmBusScope");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmBusScopeLessThan(String value) {
-            addCriterion("firm_bus_scope <", value, "firmBusScope");
+        public Criteria andBusinessLicenseUrlLike(String value) {
+            addCriterion("business_license_url like", value, "businessLicenseUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusScopeLessThanOrEqualTo(String value) {
-            addCriterion("firm_bus_scope <=", value, "firmBusScope");
+        public Criteria andBusinessLicenseUrlNotLike(String value) {
+            addCriterion("business_license_url not like", value, "businessLicenseUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusScopeLike(String value) {
-            addCriterion("firm_bus_scope like", value, "firmBusScope");
+        public Criteria andBusinessLicenseUrlIn(List values) {
+            addCriterion("business_license_url in", values, "businessLicenseUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusScopeNotLike(String value) {
-            addCriterion("firm_bus_scope not like", value, "firmBusScope");
+        public Criteria andBusinessLicenseUrlNotIn(List values) {
+            addCriterion("business_license_url not in", values, "businessLicenseUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusScopeIn(List values) {
-            addCriterion("firm_bus_scope in", values, "firmBusScope");
+        public Criteria andBusinessLicenseUrlBetween(String value1, String value2) {
+            addCriterion("business_license_url between", value1, value2, "businessLicenseUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusScopeNotIn(List values) {
-            addCriterion("firm_bus_scope not in", values, "firmBusScope");
+        public Criteria andBusinessLicenseUrlNotBetween(String value1, String value2) {
+            addCriterion("business_license_url not between", value1, value2, "businessLicenseUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusScopeBetween(String value1, String value2) {
-            addCriterion("firm_bus_scope between", value1, value2, "firmBusScope");
+        public Criteria andOrgCodeUrlIsNull() {
+            addCriterion("org_code_url is null");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusScopeNotBetween(String value1, String value2) {
-            addCriterion("firm_bus_scope not between", value1, value2, "firmBusScope");
+        public Criteria andOrgCodeUrlIsNotNull() {
+            addCriterion("org_code_url is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeIsNull() {
-            addCriterion("firm_bus_time is null");
+        public Criteria andOrgCodeUrlEqualTo(String value) {
+            addCriterion("org_code_url =", value, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeIsNotNull() {
-            addCriterion("firm_bus_time is not null");
+        public Criteria andOrgCodeUrlNotEqualTo(String value) {
+            addCriterion("org_code_url <>", value, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeEqualTo(Date value) {
-            addCriterion("firm_bus_time =", value, "firmBusTime");
+        public Criteria andOrgCodeUrlGreaterThan(String value) {
+            addCriterion("org_code_url >", value, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeNotEqualTo(Date value) {
-            addCriterion("firm_bus_time <>", value, "firmBusTime");
+        public Criteria andOrgCodeUrlGreaterThanOrEqualTo(String value) {
+            addCriterion("org_code_url >=", value, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeGreaterThan(Date value) {
-            addCriterion("firm_bus_time >", value, "firmBusTime");
+        public Criteria andOrgCodeUrlLessThan(String value) {
+            addCriterion("org_code_url <", value, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("firm_bus_time >=", value, "firmBusTime");
+        public Criteria andOrgCodeUrlLessThanOrEqualTo(String value) {
+            addCriterion("org_code_url <=", value, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeLessThan(Date value) {
-            addCriterion("firm_bus_time <", value, "firmBusTime");
+        public Criteria andOrgCodeUrlLike(String value) {
+            addCriterion("org_code_url like", value, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeLessThanOrEqualTo(Date value) {
-            addCriterion("firm_bus_time <=", value, "firmBusTime");
+        public Criteria andOrgCodeUrlNotLike(String value) {
+            addCriterion("org_code_url not like", value, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeIn(List values) {
-            addCriterion("firm_bus_time in", values, "firmBusTime");
+        public Criteria andOrgCodeUrlIn(List values) {
+            addCriterion("org_code_url in", values, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeNotIn(List values) {
-            addCriterion("firm_bus_time not in", values, "firmBusTime");
+        public Criteria andOrgCodeUrlNotIn(List values) {
+            addCriterion("org_code_url not in", values, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeBetween(Date value1, Date value2) {
-            addCriterion("firm_bus_time between", value1, value2, "firmBusTime");
+        public Criteria andOrgCodeUrlBetween(String value1, String value2) {
+            addCriterion("org_code_url between", value1, value2, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andFirmBusTimeNotBetween(Date value1, Date value2) {
-            addCriterion("firm_bus_time not between", value1, value2, "firmBusTime");
+        public Criteria andOrgCodeUrlNotBetween(String value1, String value2) {
+            addCriterion("org_code_url not between", value1, value2, "orgCodeUrl");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityIsNull() {
-            addCriterion("juridical_nationality is null");
+        public Criteria andFirmNameIsNull() {
+            addCriterion("firm_name is null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityIsNotNull() {
-            addCriterion("juridical_nationality is not null");
+        public Criteria andFirmNameIsNotNull() {
+            addCriterion("firm_name is not null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityEqualTo(String value) {
-            addCriterion("juridical_nationality =", value, "juridicalNationality");
+        public Criteria andFirmNameEqualTo(String value) {
+            addCriterion("firm_name =", value, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityNotEqualTo(String value) {
-            addCriterion("juridical_nationality <>", value, "juridicalNationality");
+        public Criteria andFirmNameNotEqualTo(String value) {
+            addCriterion("firm_name <>", value, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityGreaterThan(String value) {
-            addCriterion("juridical_nationality >", value, "juridicalNationality");
+        public Criteria andFirmNameGreaterThan(String value) {
+            addCriterion("firm_name >", value, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityGreaterThanOrEqualTo(String value) {
-            addCriterion("juridical_nationality >=", value, "juridicalNationality");
+        public Criteria andFirmNameGreaterThanOrEqualTo(String value) {
+            addCriterion("firm_name >=", value, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityLessThan(String value) {
-            addCriterion("juridical_nationality <", value, "juridicalNationality");
+        public Criteria andFirmNameLessThan(String value) {
+            addCriterion("firm_name <", value, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityLessThanOrEqualTo(String value) {
-            addCriterion("juridical_nationality <=", value, "juridicalNationality");
+        public Criteria andFirmNameLessThanOrEqualTo(String value) {
+            addCriterion("firm_name <=", value, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityLike(String value) {
-            addCriterion("juridical_nationality like", value, "juridicalNationality");
+        public Criteria andFirmNameLike(String value) {
+            addCriterion("firm_name like", value, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityNotLike(String value) {
-            addCriterion("juridical_nationality not like", value, "juridicalNationality");
+        public Criteria andFirmNameNotLike(String value) {
+            addCriterion("firm_name not like", value, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityIn(List values) {
-            addCriterion("juridical_nationality in", values, "juridicalNationality");
+        public Criteria andFirmNameIn(List values) {
+            addCriterion("firm_name in", values, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityNotIn(List values) {
-            addCriterion("juridical_nationality not in", values, "juridicalNationality");
+        public Criteria andFirmNameNotIn(List values) {
+            addCriterion("firm_name not in", values, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityBetween(String value1, String value2) {
-            addCriterion("juridical_nationality between", value1, value2, "juridicalNationality");
+        public Criteria andFirmNameBetween(String value1, String value2) {
+            addCriterion("firm_name between", value1, value2, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNationalityNotBetween(String value1, String value2) {
-            addCriterion("juridical_nationality not between", value1, value2, "juridicalNationality");
+        public Criteria andFirmNameNotBetween(String value1, String value2) {
+            addCriterion("firm_name not between", value1, value2, "firmName");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameIsNull() {
-            addCriterion("juridical_name is null");
+        public Criteria andFirmAddressIsNull() {
+            addCriterion("firm_addr is null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameIsNotNull() {
-            addCriterion("juridical_name is not null");
+        public Criteria andFirmAddressIsNotNull() {
+            addCriterion("firm_addr is not null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameEqualTo(String value) {
-            addCriterion("juridical_name =", value, "juridicalName");
+        public Criteria andFirmAddressEqualTo(String value) {
+            addCriterion("firm_addr =", value, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameNotEqualTo(String value) {
-            addCriterion("juridical_name <>", value, "juridicalName");
+        public Criteria andFirmAddressNotEqualTo(String value) {
+            addCriterion("firm_addr <>", value, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameGreaterThan(String value) {
-            addCriterion("juridical_name >", value, "juridicalName");
+        public Criteria andFirmAddressGreaterThan(String value) {
+            addCriterion("firm_addr >", value, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameGreaterThanOrEqualTo(String value) {
-            addCriterion("juridical_name >=", value, "juridicalName");
+        public Criteria andFirmAddressGreaterThanOrEqualTo(String value) {
+            addCriterion("firm_addr >=", value, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameLessThan(String value) {
-            addCriterion("juridical_name <", value, "juridicalName");
+        public Criteria andFirmAddressLessThan(String value) {
+            addCriterion("firm_addr <", value, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameLessThanOrEqualTo(String value) {
-            addCriterion("juridical_name <=", value, "juridicalName");
+        public Criteria andFirmAddressLessThanOrEqualTo(String value) {
+            addCriterion("firm_addr <=", value, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameLike(String value) {
-            addCriterion("juridical_name like", value, "juridicalName");
+        public Criteria andFirmAddressLike(String value) {
+            addCriterion("firm_addr like", value, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameNotLike(String value) {
-            addCriterion("juridical_name not like", value, "juridicalName");
+        public Criteria andFirmAddressNotLike(String value) {
+            addCriterion("firm_addr not like", value, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameIn(List values) {
-            addCriterion("juridical_name in", values, "juridicalName");
+        public Criteria andFirmAddressIn(List values) {
+            addCriterion("firm_addr in", values, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameNotIn(List values) {
-            addCriterion("juridical_name not in", values, "juridicalName");
+        public Criteria andFirmAddressNotIn(List values) {
+            addCriterion("firm_addr not in", values, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameBetween(String value1, String value2) {
-            addCriterion("juridical_name between", value1, value2, "juridicalName");
+        public Criteria andFirmAddressBetween(String value1, String value2) {
+            addCriterion("firm_addr between", value1, value2, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalNameNotBetween(String value1, String value2) {
-            addCriterion("juridical_name not between", value1, value2, "juridicalName");
+        public Criteria andFirmAddressNotBetween(String value1, String value2) {
+            addCriterion("firm_addr not between", value1, value2, "firmAddress");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneIsNull() {
-            addCriterion("juridical_phone is null");
+        public Criteria andFirmOrgCodeIsNull() {
+            addCriterion("firm_org_code is null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneIsNotNull() {
-            addCriterion("juridical_phone is not null");
+        public Criteria andFirmOrgCodeIsNotNull() {
+            addCriterion("firm_org_code is not null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneEqualTo(String value) {
-            addCriterion("juridical_phone =", value, "juridicalPhone");
+        public Criteria andFirmOrgCodeEqualTo(String value) {
+            addCriterion("firm_org_code =", value, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneNotEqualTo(String value) {
-            addCriterion("juridical_phone <>", value, "juridicalPhone");
+        public Criteria andFirmOrgCodeNotEqualTo(String value) {
+            addCriterion("firm_org_code <>", value, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneGreaterThan(String value) {
-            addCriterion("juridical_phone >", value, "juridicalPhone");
+        public Criteria andFirmOrgCodeGreaterThan(String value) {
+            addCriterion("firm_org_code >", value, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneGreaterThanOrEqualTo(String value) {
-            addCriterion("juridical_phone >=", value, "juridicalPhone");
+        public Criteria andFirmOrgCodeGreaterThanOrEqualTo(String value) {
+            addCriterion("firm_org_code >=", value, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneLessThan(String value) {
-            addCriterion("juridical_phone <", value, "juridicalPhone");
+        public Criteria andFirmOrgCodeLessThan(String value) {
+            addCriterion("firm_org_code <", value, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneLessThanOrEqualTo(String value) {
-            addCriterion("juridical_phone <=", value, "juridicalPhone");
+        public Criteria andFirmOrgCodeLessThanOrEqualTo(String value) {
+            addCriterion("firm_org_code <=", value, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneLike(String value) {
-            addCriterion("juridical_phone like", value, "juridicalPhone");
+        public Criteria andFirmOrgCodeLike(String value) {
+            addCriterion("firm_org_code like", value, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneNotLike(String value) {
-            addCriterion("juridical_phone not like", value, "juridicalPhone");
+        public Criteria andFirmOrgCodeNotLike(String value) {
+            addCriterion("firm_org_code not like", value, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneIn(List values) {
-            addCriterion("juridical_phone in", values, "juridicalPhone");
+        public Criteria andFirmOrgCodeIn(List values) {
+            addCriterion("firm_org_code in", values, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneNotIn(List values) {
-            addCriterion("juridical_phone not in", values, "juridicalPhone");
+        public Criteria andFirmOrgCodeNotIn(List values) {
+            addCriterion("firm_org_code not in", values, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneBetween(String value1, String value2) {
-            addCriterion("juridical_phone between", value1, value2, "juridicalPhone");
+        public Criteria andFirmOrgCodeBetween(String value1, String value2) {
+            addCriterion("firm_org_code between", value1, value2, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalPhoneNotBetween(String value1, String value2) {
-            addCriterion("juridical_phone not between", value1, value2, "juridicalPhone");
+        public Criteria andFirmOrgCodeNotBetween(String value1, String value2) {
+            addCriterion("firm_org_code not between", value1, value2, "firmOrgCode");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardIsNull() {
-            addCriterion("juridical_idcard is null");
+        public Criteria andFirmBusScopeIsNull() {
+            addCriterion("firm_bus_scope is null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardIsNotNull() {
-            addCriterion("juridical_idcard is not null");
+        public Criteria andFirmBusScopeIsNotNull() {
+            addCriterion("firm_bus_scope is not null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardEqualTo(String value) {
-            addCriterion("juridical_idcard =", value, "juridicalIdcard");
+        public Criteria andFirmBusScopeEqualTo(String value) {
+            addCriterion("firm_bus_scope =", value, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardNotEqualTo(String value) {
-            addCriterion("juridical_idcard <>", value, "juridicalIdcard");
+        public Criteria andFirmBusScopeNotEqualTo(String value) {
+            addCriterion("firm_bus_scope <>", value, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardGreaterThan(String value) {
-            addCriterion("juridical_idcard >", value, "juridicalIdcard");
+        public Criteria andFirmBusScopeGreaterThan(String value) {
+            addCriterion("firm_bus_scope >", value, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardGreaterThanOrEqualTo(String value) {
-            addCriterion("juridical_idcard >=", value, "juridicalIdcard");
+        public Criteria andFirmBusScopeGreaterThanOrEqualTo(String value) {
+            addCriterion("firm_bus_scope >=", value, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardLessThan(String value) {
-            addCriterion("juridical_idcard <", value, "juridicalIdcard");
+        public Criteria andFirmBusScopeLessThan(String value) {
+            addCriterion("firm_bus_scope <", value, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardLessThanOrEqualTo(String value) {
-            addCriterion("juridical_idcard <=", value, "juridicalIdcard");
+        public Criteria andFirmBusScopeLessThanOrEqualTo(String value) {
+            addCriterion("firm_bus_scope <=", value, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardLike(String value) {
-            addCriterion("juridical_idcard like", value, "juridicalIdcard");
+        public Criteria andFirmBusScopeLike(String value) {
+            addCriterion("firm_bus_scope like", value, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardNotLike(String value) {
-            addCriterion("juridical_idcard not like", value, "juridicalIdcard");
+        public Criteria andFirmBusScopeNotLike(String value) {
+            addCriterion("firm_bus_scope not like", value, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardIn(List values) {
-            addCriterion("juridical_idcard in", values, "juridicalIdcard");
+        public Criteria andFirmBusScopeIn(List values) {
+            addCriterion("firm_bus_scope in", values, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardNotIn(List values) {
-            addCriterion("juridical_idcard not in", values, "juridicalIdcard");
+        public Criteria andFirmBusScopeNotIn(List values) {
+            addCriterion("firm_bus_scope not in", values, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardBetween(String value1, String value2) {
-            addCriterion("juridical_idcard between", value1, value2, "juridicalIdcard");
+        public Criteria andFirmBusScopeBetween(String value1, String value2) {
+            addCriterion("firm_bus_scope between", value1, value2, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalIdcardNotBetween(String value1, String value2) {
-            addCriterion("juridical_idcard not between", value1, value2, "juridicalIdcard");
+        public Criteria andFirmBusScopeNotBetween(String value1, String value2) {
+            addCriterion("firm_bus_scope not between", value1, value2, "firmBusScope");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeIsNull() {
-            addCriterion("juridical_time is null");
+        public Criteria andFirmBusTimeIsNull() {
+            addCriterion("firm_bus_time is null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeIsNotNull() {
-            addCriterion("juridical_time is not null");
+        public Criteria andFirmBusTimeIsNotNull() {
+            addCriterion("firm_bus_time is not null");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeEqualTo(Date value) {
-            addCriterion("juridical_time =", value, "juridicalTime");
+        public Criteria andFirmBusTimeEqualTo(Date value) {
+            addCriterion("firm_bus_time =", value, "firmBusTime");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeNotEqualTo(Date value) {
-            addCriterion("juridical_time <>", value, "juridicalTime");
+        public Criteria andFirmBusTimeNotEqualTo(Date value) {
+            addCriterion("firm_bus_time <>", value, "firmBusTime");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeGreaterThan(Date value) {
-            addCriterion("juridical_time >", value, "juridicalTime");
+        public Criteria andFirmBusTimeGreaterThan(Date value) {
+            addCriterion("firm_bus_time >", value, "firmBusTime");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeGreaterThanOrEqualTo(Date value) {
-            addCriterion("juridical_time >=", value, "juridicalTime");
+        public Criteria andFirmBusTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("firm_bus_time >=", value, "firmBusTime");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeLessThan(Date value) {
-            addCriterion("juridical_time <", value, "juridicalTime");
+        public Criteria andFirmBusTimeLessThan(Date value) {
+            addCriterion("firm_bus_time <", value, "firmBusTime");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeLessThanOrEqualTo(Date value) {
-            addCriterion("juridical_time <=", value, "juridicalTime");
+        public Criteria andFirmBusTimeLessThanOrEqualTo(Date value) {
+            addCriterion("firm_bus_time <=", value, "firmBusTime");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeIn(List values) {
-            addCriterion("juridical_time in", values, "juridicalTime");
+        public Criteria andFirmBusTimeIn(List values) {
+            addCriterion("firm_bus_time in", values, "firmBusTime");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeNotIn(List values) {
-            addCriterion("juridical_time not in", values, "juridicalTime");
+        public Criteria andFirmBusTimeNotIn(List values) {
+            addCriterion("firm_bus_time not in", values, "firmBusTime");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeBetween(Date value1, Date value2) {
-            addCriterion("juridical_time between", value1, value2, "juridicalTime");
+        public Criteria andFirmBusTimeBetween(Date value1, Date value2) {
+            addCriterion("firm_bus_time between", value1, value2, "firmBusTime");
             return (Criteria) this;
         }
 
-        public Criteria andJuridicalTimeNotBetween(Date value1, Date value2) {
-            addCriterion("juridical_time not between", value1, value2, "juridicalTime");
+        public Criteria andFirmBusTimeNotBetween(Date value1, Date value2) {
+            addCriterion("firm_bus_time not between", value1, value2, "firmBusTime");
             return (Criteria) this;
         }
 
@@ -1864,143 +1034,73 @@ public class FirmInfoTempExample {
             return (Criteria) this;
         }
 
-        public Criteria andRealnameCheckIsNull() {
-            addCriterion("realname_check is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckIsNotNull() {
-            addCriterion("realname_check is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckEqualTo(String value) {
-            addCriterion("realname_check =", value, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckNotEqualTo(String value) {
-            addCriterion("realname_check <>", value, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckGreaterThan(String value) {
-            addCriterion("realname_check >", value, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckGreaterThanOrEqualTo(String value) {
-            addCriterion("realname_check >=", value, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckLessThan(String value) {
-            addCriterion("realname_check <", value, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckLessThanOrEqualTo(String value) {
-            addCriterion("realname_check <=", value, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckLike(String value) {
-            addCriterion("realname_check like", value, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckNotLike(String value) {
-            addCriterion("realname_check not like", value, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckIn(List values) {
-            addCriterion("realname_check in", values, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckNotIn(List values) {
-            addCriterion("realname_check not in", values, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckBetween(String value1, String value2) {
-            addCriterion("realname_check between", value1, value2, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andRealnameCheckNotBetween(String value1, String value2) {
-            addCriterion("realname_check not between", value1, value2, "realnameCheck");
-            return (Criteria) this;
-        }
-
-        public Criteria andFirmStatusIsNull() {
+        public Criteria andStatusIsNull() {
             addCriterion("firm_status is null");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusIsNotNull() {
+        public Criteria andStatusIsNotNull() {
             addCriterion("firm_status is not null");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusEqualTo(String value) {
-            addCriterion("firm_status =", value, "firmStatus");
+        public Criteria andStatusEqualTo(String value) {
+            addCriterion("firm_status =", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusNotEqualTo(String value) {
-            addCriterion("firm_status <>", value, "firmStatus");
+        public Criteria andStatusNotEqualTo(String value) {
+            addCriterion("firm_status <>", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusGreaterThan(String value) {
-            addCriterion("firm_status >", value, "firmStatus");
+        public Criteria andStatusGreaterThan(String value) {
+            addCriterion("firm_status >", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusGreaterThanOrEqualTo(String value) {
-            addCriterion("firm_status >=", value, "firmStatus");
+        public Criteria andStatusGreaterThanOrEqualTo(String value) {
+            addCriterion("firm_status >=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusLessThan(String value) {
-            addCriterion("firm_status <", value, "firmStatus");
+        public Criteria andStatusLessThan(String value) {
+            addCriterion("firm_status <", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusLessThanOrEqualTo(String value) {
-            addCriterion("firm_status <=", value, "firmStatus");
+        public Criteria andStatusLessThanOrEqualTo(String value) {
+            addCriterion("firm_status <=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusLike(String value) {
-            addCriterion("firm_status like", value, "firmStatus");
+        public Criteria andStatusLike(String value) {
+            addCriterion("firm_status like", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusNotLike(String value) {
-            addCriterion("firm_status not like", value, "firmStatus");
+        public Criteria andStatusNotLike(String value) {
+            addCriterion("firm_status not like", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusIn(List values) {
-            addCriterion("firm_status in", values, "firmStatus");
+        public Criteria andStatusIn(List values) {
+            addCriterion("firm_status in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusNotIn(List values) {
-            addCriterion("firm_status not in", values, "firmStatus");
+        public Criteria andStatusNotIn(List values) {
+            addCriterion("firm_status not in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusBetween(String value1, String value2) {
-            addCriterion("firm_status between", value1, value2, "firmStatus");
+        public Criteria andStatusBetween(String value1, String value2) {
+            addCriterion("firm_status between", value1, value2, "status");
             return (Criteria) this;
         }
 
-        public Criteria andFirmStatusNotBetween(String value1, String value2) {
-            addCriterion("firm_status not between", value1, value2, "firmStatus");
+        public Criteria andStatusNotBetween(String value1, String value2) {
+            addCriterion("firm_status not between", value1, value2, "status");
             return (Criteria) this;
         }
 
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl.java b/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl.java
deleted file mode 100644
index 1956f5e..0000000
--- a/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package com.trust.ywx.customer.service.impl;
-
-import com.fiftyonetrust.common.model.result.Page;
-import com.fiftyonetrust.common.model.result.PageList;
-import com.trust.ywx.customer.common.enu.FirmProperEnum;
-import com.trust.ywx.customer.common.enu.NetworkTypeEnum;
-import com.trust.ywx.customer.dao.DoctorProductTypeDao;
-import com.trust.ywx.customer.dao.TrustFirmDao;
-import com.trust.ywx.customer.dao.FirmExtendDao;
-import com.trust.ywx.customer.dao.FirmGroupDao;
-import com.trust.ywx.customer.dao.po.FirmInfo;
-import com.trust.ywx.customer.dao.po.FirmInfoExtend;
-import com.trust.ywx.customer.dao.po.FirmUsercertChannel;
-import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
-import com.trust.ywx.customer.common.model.query.request.SearchCrmFirmParam;
-import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
-import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmParam;
-import com.trust.ywx.customer.common.model.manager.response.TempFirmDto;
-import com.trust.ywx.customer.common.model.query.response.CrmFirmDto;
-import com.trust.ywx.customer.service.query.FirmQueryService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-
-/**
- * 

- *
- * @文件名称： FirmQueryServiceImpl.java
- * @包 路  径： com.trust.ywx.customer.service.impl
- * @Copyright：北京数字医信责任有限公司 (C) 2022 *
- * @Description:
- * @Version: V1.0
- * @Author： hanzhenchao
- * @Date：2022/6/15 18:43
- * @Modify：
- */
-@Service
-public class FirmQueryServiceImpl implements FirmQueryService {
-    @Autowired
-    private TrustFirmDao trustFirmDao;
-    @Autowired
-    private FirmGroupDao firmGroupDao;
-    @Autowired
-    private FirmExtendDao firmExtendDao;
-    @Autowired
-    private DoctorProductTypeDao doctorProductTypeDao;
-
-    @Override
-    public List getTrustFirmList(SearchTrustFirmParam param) {
-        return doSearch(param,false);
-    }
-
-    @Override
-    public PageList> getTrustFirmListWithPage(SearchTrustFirmParam param) {
-        List dtoList = doSearch(param,true);
-
-        // fixme 组装好麻烦，需要改进下
-        PageList pageList = new PageList();
-        pageList.setItems(dtoList);
-        Page page = new Page();
-        page.setPageNo(param.getPageNo());
-        page.setPageSize(param.getPageSize());
-        page.setTotal(dtoList.size());
-        pageList.setPage(page);
-        return pageList;
-    }
-
-
-    private TrustFirmDto converPoToDto(FirmInfo po) {
-        if (null == po) {
-            return null;
-        }
-        TrustFirmDto dto = new TrustFirmDto();
-        BeanUtils.copyProperties(po, dto);
-
-        // TODO 差异属性转换
-        return dto;
-    }
-
-    @Override
-    public TrustFirmDto getTrustFirm(String clientId) {
-        FirmInfo po = trustFirmDao.getFrimByClientId(clientId);
-        return converPoToDto(po);
-    }
-
-    @Override
-    public TrustFirmDto getTrustFirmWithBLOBs(String clientId) {
-        FirmInfo po = trustFirmDao.getFrimByClientId(clientId);
-        return converPoToDto(po);
-    }
-
-    @Override
-    public Map getAllProp(String clientId) {
-        if (StringUtils.isEmpty(clientId)) {
-            return new HashMap<>();
-        }
-        Map map = new HashMap<>(64);
-        // 1、从firm_info_extend获取全量属性
-        List extendList = firmExtendDao.getListByClientId(clientId);
-        for (FirmInfoExtend extendPo : extendList) {
-            map.put(extendPo.getPropName(), extendPo.getPropValue());
-        }
-
-        //2、从firm_usercert_channel 获取医师产品形态属性 fixme 以后要去掉
-        List doctorProductList = doctorProductTypeDao.getByClientId(clientId);
-
-        for (FirmUsercertChannel doctorPo : doctorProductList) {
-            if(doctorPo.getChannelType()==0){
-                map.put(FirmProperEnum.DOCTOR_PRODUCT_APP.getProperName(), doctorPo.getChannelType() + "");
-            }
-            if(doctorPo.getChannelType()==1){
-                map.put(FirmProperEnum.DOCTOR_PRODUCT_SDK.getProperName(), doctorPo.getChannelType() + "");
-            }
-        }
-        return map;
-    }
-
-    @Override
-    public List getFirmWhite(String firmName) {
-        return null;
-    }
-
-    @Override
-    public List getTempFirmList(SearchFirmParam param) {
-        return null;
-    }
-
-    @Override
-    public List getCrmFirmList(SearchCrmFirmParam param) {
-        return null;
-    }
-
-    private List getClientIdListByProp(String propName, Integer propValue, List clientIdList) {
-        String convertPropValue = "";
-        if (Objects.equals(propName, FirmProperEnum.DOCTOR_PRODUCT_SDK.getProperName())
-                ||Objects.equals(propName, FirmProperEnum.DOCTOR_PRODUCT_APP.getProperName())) {
-            //fixme，目前医师产品形态单独存储在firm_usercert_channel表，后期挪到firm_info_extends表
-            return doctorProductTypeDao.getClientIdByProp(clientIdList, propValue);
-        } else {
-            // 其他属性都在firm_info_extends表
-            if (Objects.equals(propName, FirmProperEnum.NETWORK_TYPE.getProperName())) {
-                convertPropValue = NetworkTypeEnum.getNameOfCode(propValue);
-            } else {
-                convertPropValue = String.valueOf(propValue);
-            }
-            return firmExtendDao.getByPropsAndClientId(propName, convertPropValue, clientIdList);
-        }
-    }
-
-    private List doSearch(SearchTrustFirmParam param , boolean isPage) {
-        List clientIdList = new ArrayList<>();
-
-        // clientId筛选
-        if (StringUtils.isNotEmpty(param.getClientId())) {
-            FirmInfo firmInfo = trustFirmDao.getFrimByClientId(param.getClientId());
-            if (null == firmInfo) {
-                return Arrays.asList();
-            }
-            // 增加项目状态的判断
-            if (null != param.getProjectStatus() && !Objects.equals(firmInfo.getProjectStatus(), param.getProjectStatus())) {
-                return Arrays.asList();
-            }
-            // 增加实施人员的判断
-            if(null!=param.getTechId() && !Objects.equals(firmInfo.getTechPersonId(),param.getTechId())){
-                return Arrays.asList();
-            }
-            // 增加销售人员的判断
-            if(null!=param.getSaleId() && !Objects.equals(firmInfo.getSalePersonId(),param.getTechId())){
-                return Arrays.asList();
-            }
-
-            clientIdList.add(param.getClientId());
-        }
-
-        // 客户组筛选
-        if (StringUtils.isNotEmpty(param.getGroupId())) {
-            List groupClientIdList = firmGroupDao.getClientIdByGroupId(param.getGroupId());
-            if (CollectionUtils.isEmpty(clientIdList)) {
-                clientIdList = groupClientIdList;
-            } else {
-                clientIdList.retainAll(groupClientIdList);
-                if (CollectionUtils.isEmpty(clientIdList)) {
-                    return Arrays.asList();
-                }
-            }
-        }
-
-        // 医师产品形态筛选 fixme 下面的查询可以合成一个
-        if (null != param.getDoctorProductType()) {
-            List subClientIdList;
-            if (StringUtils.isNotEmpty(param.getClientId())) {
-                subClientIdList = getClientIdListByProp(FirmProperEnum.DOCTOR_PRODUCT_APP.getProperName(), param.getDoctorProductType(), Arrays.asList(param.getClientId()));
-            } else {
-                subClientIdList = getClientIdListByProp(FirmProperEnum.DOCTOR_PRODUCT_APP.getProperName(), param.getDoctorProductType(), null);
-            }
-            // 与clientIdList求并集
-            clientIdList.retainAll(subClientIdList);
-            if (CollectionUtils.isEmpty(clientIdList)) {
-                return Arrays.asList();
-            }
-
-            if (StringUtils.isNotEmpty(param.getClientId())) {
-                subClientIdList = getClientIdListByProp(FirmProperEnum.DOCTOR_PRODUCT_SDK.getProperName(), param.getDoctorProductType(), Arrays.asList(param.getClientId()));
-            } else {
-                subClientIdList = getClientIdListByProp(FirmProperEnum.DOCTOR_PRODUCT_SDK.getProperName(), param.getDoctorProductType(), null);
-            }
-            // 与clientIdList求并集
-            clientIdList.retainAll(subClientIdList);
-            if (CollectionUtils.isEmpty(clientIdList)) {
-                return Arrays.asList();
-            }
-        }
-
-        /**
-         * 属性过滤暂时没想到好办法，只能一个个去查询了
-         */
-        if (null != param.getNetworkType()) {
-            List subClientIdList = getClientIdListByProp(FirmProperEnum.NETWORK_TYPE.getProperName(), param.getNetworkType(), clientIdList);
-            // 与clientIdList求并集
-            clientIdList.retainAll(subClientIdList);
-            if (CollectionUtils.isEmpty(clientIdList)) {
-                return Arrays.asList();
-            }
-        }
-        if (null != param.getChargingMode()) {
-            List subClientIdList = getClientIdListByProp(FirmProperEnum.CHARGING_MODE.getProperName(), param.getChargingMode(), clientIdList);
-            // 与clientIdList求并集
-            clientIdList.retainAll(subClientIdList);
-            if (CollectionUtils.isEmpty(clientIdList)) {
-                return Arrays.asList();
-            }
-        }
-        if (null != param.getPublicProductType()) {
-            List subClientIdList = getClientIdListByProp(FirmProperEnum.PUBLIC_PRODUCT_TYPE.getProperName(), param.getPublicProductType(), clientIdList);
-            // 与clientIdList求并集
-            clientIdList.retainAll(subClientIdList);
-            if (CollectionUtils.isEmpty(clientIdList)) {
-                return Arrays.asList();
-            }
-        }
-        List firmList = null;
-        if (isPage) {
-            firmList = trustFirmDao.getListByIds(clientIdList, 100000, 0);
-        } else {
-            if (clientIdList.size() < param.getPageSize() * param.getPageNo()) {
-                return Arrays.asList();
-            }
-            firmList = trustFirmDao.getListByIds(clientIdList, param.getPageSize(), param.getPageNo());
-        }
-
-        List dtoList = new ArrayList<>(firmList.size());
-        if (CollectionUtils.isEmpty(firmList)) {
-            return Arrays.asList();
-        }
-        for (FirmInfo po : firmList) {
-            TrustFirmDto dto = converPoToDto(po);
-            dtoList.add(dto);
-        }
-        return dtoList;
-    }
-}
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl_bak.java b/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl_bak.java
deleted file mode 100644
index 326f433..0000000
--- a/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl_bak.java
+++ /dev/null
@@ -1,202 +0,0 @@
-//package com.trust.ywx.customer.service.impl;
-//
-//import com.fiftyonetrust.common.model.result.Page;
-//import com.fiftyonetrust.common.model.result.PageList;
-//import com.trust.ywx.customer.common.enums.FirmProperEnum;
-//import com.trust.ywx.customer.common.enums.NetworkTypeEnum;
-//import com.trust.ywx.customer.dao.FirmDao;
-//import com.trust.ywx.customer.dao.FirmExtendDao;
-//import com.trust.ywx.customer.dao.FirmGroupDao;
-//import com.trust.ywx.customer.dao.mapper.FirmUsercertChannelMapper;
-//import com.trust.ywx.customer.dao.po.FirmInfo;
-//import com.trust.ywx.customer.dao.po.FirmUsercertChannelExample;
-//import com.trust.ywx.customer.service.dto.TrustFirmDto;
-//import com.trust.ywx.customer.common.model.query.request.SearchCrmFirmParam;
-//import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
-//import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmWithPageParam;
-//import com.trust.ywx.customer.service.dto.response.AuditFirmDto;
-//import com.trust.ywx.customer.common.model.query.response.CrmFirmDto;
-//import com.trust.ywx.customer.common.exception.BizException;
-//import com.trust.ywx.customer.service.query.FirmQueryService;
-//import org.apache.commons.lang.StringUtils;
-//import org.springframework.beans.BeanUtils;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.util.CollectionUtils;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.Map;
-//import java.util.Objects;
-//
-///**
-// * 

-// *
-// * @文件名称： FirmQueryServiceImpl.java
-// * @包 路  径： com.trust.ywx.customer.service.impl
-// * @Copyright：北京数字医信责任有限公司 (C) 2022 *
-// * @Description:
-// * @Version: V1.0
-// * @Author： hanzhenchao
-// * @Date：2022/6/15 18:43
-// * @Modify：
-// */
-//public class FirmQueryServiceImpl_bak implements FirmQueryService {
-//    @Autowired
-//    private FirmDao firmDao;
-//    @Autowired
-//    private FirmGroupDao firmGroupDao;
-//    @Autowired
-//    private FirmExtendDao firmExtendDao;
-//    @Autowired
-//    private FirmUsercertChannelMapper usercertChannelMapper;
-//
-//    @Override
-//    public PageList> getTrustFirmList(SearchTrustFirmWithPageParam param) {
-//        List clientIdList = new ArrayList<>();
-//
-//        // 客户id/合同编号/合同方 筛选
-//        if(!Objects.equals(param.getClientId(),param.getLikeCron())){
-//            // 如果clientId不为空，比较likeCron是否一致，不一致说明likeCron是合同编号/合同方
-//            if(StringUtils.isNotEmpty(param.getLikeCron())){
-//                //查询合同表
-//                String clientId = firmDao.getClientIdByKeyword(param.getLikeCron());
-//                if(StringUtils.isEmpty(clientId) || !Objects.equals(param.getClientId(),clientId)){
-//                    // 未查到或查到的clientId和选择的客户不匹配，返回空
-//                    return new PageList();
-//                }
-//            }
-//        }
-//
-//        // clientId筛选
-//        if(StringUtils.isNotEmpty(param.getClientId())){
-//            FirmInfo firmInfo = firmDao.getFrimByClientId(param.getClientId());
-//            if(null == firmInfo){
-//                return new PageList();
-//            }
-//            // 增加项目状态的判断
-//            if(null != param.getFirmStatus() && Objects.equals(firmInfo.getFirmStatus(),param.getFirmStatus())){
-//                return new PageList();
-//            }
-//            clientIdList.add(param.getClientId());
-//
-//        }
-//
-//        // 客户组筛选
-//        if(StringUtils.isNotEmpty(param.getGroupId())){
-//            List groupClientIdList = firmGroupDao.getClientIdByGroupId(param.getGroupId());
-//            if(CollectionUtils.isEmpty(clientIdList)){
-//                clientIdList = groupClientIdList;
-//            }else{
-//                clientIdList.retainAll(groupClientIdList);
-//                if(CollectionUtils.isEmpty(clientIdList)){
-//                    return new PageList();
-//                }
-//            }
-//        }
-//
-//        // 医师产品形态筛选（fixme，目前单独存储在firm_usercert_channel表，后期挪到firm_info_extends表）
-//        if(null!=param.getDoctorProductType()){
-//            if(StringUtils.isNotEmpty(param.getClientId())){
-//                // 携带客户Id和产品形态一起去查
-//                FirmUsercertChannelExample example = new FirmUsercertChannelExample();
-//                example.createCriteria().andChannelTypeEqualTo(param.getDoctorProductType()).andClientidEqualTo(param.getClientId());
-//                long count = usercertChannelMapper.countByExample(example);
-//                if(count==0){
-//                    return new PageList();
-//                }else{
-//                    clientIdList.add(param.getClientId());
-//                }
-//            }else{
-//                List subClientIdList = firmDao.getClientIdByChannelType(param.getDoctorProductType());
-//                // 与clientIdList求并集
-//                clientIdList.retainAll(subClientIdList);
-//                if(CollectionUtils.isEmpty(clientIdList)){
-//                    return new PageList();
-//                }
-//            }
-//        }
-//
-//        /**
-//         * 属性过滤暂时没想到好办法，只能一个个去查询了
-//         */
-//        if(null!=param.getNetworkType()){
-//            List subClientIdList = firmExtendDao.getByPropsAndClientId(FirmProperEnum.NETWORK_TYPE.getProperName(),NetworkTypeEnum.getNameOfCode(param.getNetworkType()),clientIdList);
-//            // 与clientIdList求并集
-//            clientIdList.retainAll(subClientIdList);
-//            if(CollectionUtils.isEmpty(clientIdList)){
-//                return new PageList();
-//            }
-//        }
-//        if(null!=param.getChargingMode()){
-//            List subClientIdList = firmExtendDao.getByPropsAndClientId(FirmProperEnum.CHARGING_MODEL.getProperName(), param.getChargingMode()+"", clientIdList);
-//            // 与clientIdList求并集
-//            clientIdList.retainAll(subClientIdList);
-//            if(CollectionUtils.isEmpty(clientIdList)){
-//                return new PageList();
-//            }
-//        }
-//        if(null!=param.getPublicProductType()){
-//            List subClientIdList = firmExtendDao.getByPropsAndClientId(FirmProperEnum.PUBLIC_PRODUCT_TYPE.getProperName(),param.getPublicProductType()+"",clientIdList);
-//            // 与clientIdList求并集
-//            clientIdList.retainAll(subClientIdList);
-//            if(CollectionUtils.isEmpty(clientIdList)){
-//                return new PageList();
-//            }
-//        }
-//
-//
-//        List firmList = firmDao.getListByIds(clientIdList);
-//        List dtoList = new ArrayList<>(firmList.size());
-//        for (FirmInfo po: firmList) {
-//            TrustFirmDto dto = converPoToDto(po);
-//            dtoList.add(dto);
-//        }
-//
-//        // fixme 组装好麻烦，需要改进下
-//        PageList pageList = new PageList();
-//        pageList.setItems(dtoList);
-//        Page page = new Page();
-//        page.setPageNo(param.getPageNo());
-//        page.setPageSize(param.getPageSize());
-//        page.setTotal(dtoList.size());
-//        pageList.setPage(page);
-//        return pageList;
-//    }
-//
-//
-//    private TrustFirmDto converPoToDto(FirmInfo po) {
-//        if(null == po){
-//            return null;
-//        }
-//        TrustFirmDto dto = new TrustFirmDto();
-//        BeanUtils.copyProperties(po,dto);
-//
-//        // TODO 差异属性转换
-//        return dto;
-//    }
-//
-//    @Override
-//    public TrustFirmDto getTrustFirm(String clientId) {
-//        return null;
-//    }
-//
-//    @Override
-//    public Map getProp(String clientId) throws Exception{
-//        if(StringUtils.isEmpty(clientId)){
-//            throw new BizException("400","clientId不能为空");
-//        }
-//        // 从firm_info_extend\、firm_usercert_channel获取全量属性
-//
-//        return null;
-//    }
-//
-//    @Override
-//    public List getAuditFirmList(SearchFirmParam param) {
-//        return null;
-//    }
-//
-//    @Override
-//    public List getCrmFirmList(SearchCrmFirmParam param) {
-//        return null;
-//    }
-//}
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java b/customer/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java
index 16da562..98377b9 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java
+++ b/customer/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java
@@ -20,9 +20,10 @@ public interface TempFirmManagerService {
     /**
      * 添加临时客户
      * 互联网医院通过开放平台自注册临时客户，会在firm_info_temp表生成client_id
+     * 返回clientId
      *
      */
-    boolean add(TempFirmParam param) throws BizException;
+    String add(TempFirmParam param) throws BizException;
 
     /**
      * 更新临时客户
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/FirmManagerServiceImpl.java b/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/FirmManagerServiceImpl.java
index 1d6ec06..caaf7a3 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/FirmManagerServiceImpl.java
+++ b/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/FirmManagerServiceImpl.java
@@ -1,7 +1,11 @@
 package com.trust.ywx.customer.service.manager.impl;
 
+import com.trust.ywx.customer.common.enu.CaChannelEnum;
+import com.trust.ywx.customer.common.enu.CommonStatusEnum;
 import com.trust.ywx.customer.common.enu.FirmErrEum;
+import com.trust.ywx.customer.common.enu.FirmStatusEnum;
 import com.trust.ywx.customer.commons.UniqueIdUtils;
+import com.trust.ywx.customer.commons.ValidateUtil;
 import com.trust.ywx.customer.dao.FirmExtendDao;
 import com.trust.ywx.customer.dao.TrustFirmDao;
 import com.trust.ywx.customer.dao.po.FirmInfo;
@@ -9,6 +13,7 @@ import com.trust.ywx.customer.common.model.manager.request.TrustFirmParam;
 import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
 import com.trust.ywx.customer.common.exception.BizException;
 import com.trust.ywx.customer.service.manager.FirmManagerService;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionStatus;
@@ -64,8 +69,55 @@ public class FirmManagerServiceImpl implements FirmManagerService {
         return doAddTrust(param);
     }
 
-    private void checkParam(TrustFirmParam param) {
-        //TODO
+    private void checkParam(TrustFirmParam param) throws BizException {
+        if (StringUtils.isBlank(param.getClientId())) {
+            throw new BizException(FirmErrEum.FIRM_CLIENT_ID_NULL);
+        }
+        if (StringUtils.isBlank(param.getAppSecret())) {
+            throw new BizException(FirmErrEum.FIRM_APP_SECRET_NULL);
+        }
+        if (StringUtils.isBlank(param.getFirmName())) {
+            throw new BizException(FirmErrEum.FIRM_NAME_NULL);
+        }
+        if (StringUtils.isNotEmpty(param.getFirmName()) && param.getFirmName().length() > 30) {
+            throw new BizException(FirmErrEum.FIRM_NAME_TOO_LONG);
+        }
+        if (StringUtils.isBlank(param.getFirmPerson())) {
+            throw new BizException(FirmErrEum.FIRM_PERSON);
+        }
+        if (!ValidateUtil.checkMobile(param.getFirmPhone())) {
+            throw new BizException(FirmErrEum.FIRM_PHONE);
+        }
+
+        if (StringUtils.isBlank(param.getClientOrgCode())) {
+            throw new BizException(FirmErrEum.CLIENT_ORG_CODE_NULL);
+        }
+
+        if ("Y".equals(param.getSmsCustomize()) && StringUtils.isNotBlank(param.getSmsCustomizeContent())
+                && param.getSmsCustomizeContent().length() > 101) {
+            throw new BizException(FirmErrEum.FIRM_SMS_CUSTOMIZECONTENT_TOOLONG);
+        }
+//        if (!StringUtils.isBlank(param.getDoctorProductType()) && !publicProductType.equals("SDK")
+//                && !publicProductType.equals("H5")) {
+//            throw new BizException(GlobalExcpEnum.PARAM_ERROR);
+//        }
+        /*cachannel校验*/
+        if(param.getCaChannel()!=null&& org.apache.commons.lang3.StringUtils.isBlank(CaChannelEnum.getDes(param.getCaChannel()))){
+            throw new BizException(FirmErrEum.FIRM_CA_CHANNEL_ERR);
+        }
+
+        if (StringUtils.isBlank(param.getAppIcon())) {
+            if (param.getAppIcon().length() > 64 * 1024) {
+                throw new BizException(FirmErrEum.FIRM_ICON_TOOBIG);
+            }
+        }
+
+        if ((CommonStatusEnum.YES.getCode() == param.getTechSupport()) && param.getTechSupportInfo().length() > 300) {
+            throw new BizException(FirmErrEum.SUPPORT_INFO_TOOLONG);
+        }
+
+        // 其他属性枚举值范围校验 TODO
+
     }
 
     @Override
@@ -86,7 +138,7 @@ public class FirmManagerServiceImpl implements FirmManagerService {
     }
 
     /**
-     * 执行添加（包含事务）
+     * 执行添加
      *
      * @param param
      * @return
@@ -113,8 +165,8 @@ public class FirmManagerServiceImpl implements FirmManagerService {
         BeanUtils.copyProperties(param, firmInfo);
         if (isAdd) {
             firmInfo.setUniqueid(UniqueIdUtils.genrateUniqueId());
+            firmInfo.setStatus(FirmStatusEnum.FIRM_SUB_NORMAL.getCode());
         }
-        firmInfo.setStatus(param.getFirmStatus());
         // TODO 客户属性有几个属性在此表维护，以后要迁移至extend表。
         firmInfo.setSendSms(param.getSmsSend() == null ? "N" : (param.getSmsSend() == 1 ? "Y" : "N"));
         firmInfo.setStampType(param.getUserStampAuto() == null ? "0" : String.valueOf(param.getUserStampAuto()));
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/TempFirmManagerServiceImpl.java b/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/TempFirmManagerServiceImpl.java
index 677e03a..46ac11f 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/TempFirmManagerServiceImpl.java
+++ b/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/TempFirmManagerServiceImpl.java
@@ -1,7 +1,9 @@
 package com.trust.ywx.customer.service.manager.impl;
 
+import com.fiftyonetrust.common.redis.template.RedisRepository;
 import com.trust.ywx.customer.common.enu.*;
 import com.trust.ywx.customer.commons.UniqueIdUtils;
+import com.trust.ywx.customer.commons.ValidateUtil;
 import com.trust.ywx.customer.dao.TempFirmDao;
 import com.trust.ywx.customer.dao.po.FirmInfoTemp;
 import com.trust.ywx.customer.common.model.manager.request.TempFirmParam;
@@ -12,6 +14,8 @@ import com.trust.ywx.customer.service.manager.TempFirmManagerService;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
@@ -21,6 +25,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 

@@ -43,21 +48,24 @@ public class TempFirmManagerServiceImpl implements TempFirmManagerService {
     @Resource
     FirmManagerService firmManagerService;
 
+
     @Override
-    public boolean add(TempFirmParam param) throws BizException {
+    public String add(TempFirmParam param) throws BizException {
         // 参数校验
-        //checkParam(param);
+        checkParam(param,true);
         // 业务校验
-        checkBiz(param);
+        checkBiz(param,true);
         // 入库
         return doAddTemp(param);
     }
+
     @Override
+    @CacheEvict(cacheNames = "firm",key = "'temp:'+#param.clientId")
     public boolean update(TempFirmParam param) throws BizException {
         // 参数校验
-        //checkParam(param);
+        checkParam(param,false);
         // 业务校验
-        checkBiz(param);
+        checkBiz(param,false);
         // 入库
         return doUpdateTemp(param);
     }
@@ -69,7 +77,6 @@ public class TempFirmManagerServiceImpl implements TempFirmManagerService {
         if (null == tempFirm) {
             throw new BizException(FirmErrEum.FIRM_NOT_EXIST);
         }
-
         // 封装可信客户参数
         TrustFirmParam trustFirmParam = buildTrustFirmParam(tempFirm);
 
@@ -92,6 +99,7 @@ public class TempFirmManagerServiceImpl implements TempFirmManagerService {
     @Override
     public boolean delete(String clientId) {
         // fixme 此处应该为物理删除，否则客户在此添加时 客户名称就重复了
+        tempFirmDao.deleteByClientId(clientId);
         return true;
     }
 
@@ -100,18 +108,33 @@ public class TempFirmManagerServiceImpl implements TempFirmManagerService {
         return tempFirmDao.update(temp)==1;
     }
 
-    private void checkBiz(TempFirmParam param) throws BizException {
+    private void checkBiz(TempFirmParam param,boolean isAdd) throws BizException {
+        // clientId
+        if(!isAdd){
+            FirmInfoTemp temp = tempFirmDao.getByClientId(param.getClientId());
+            if(null == temp){
+                throw new BizException(FirmErrEum.FIRM_NOT_EXIST);
+            }
+        }
         // firmName冲突校验
         List list = tempFirmDao.getListByFirmName(param.getFirmName());
         if (null != list && list.size() > 0) {
-            throw new BizException(FirmErrEum.FIRM_NAME_CHECK_ERR);
+            if (isAdd) {
+                throw new BizException(FirmErrEum.FIRM_NAME_CHECK_ERR);
+            } else {
+                for (FirmInfoTemp temp:list) {
+                    if (!Objects.equals(temp.getClientId(),param.getClientId())) {
+                        throw new BizException(FirmErrEum.FIRM_NAME_CHECK_ERR);
+                    }
+                }
+            }
         }
     }
 
-    private boolean doAddTemp(TempFirmParam param) {
+    private String doAddTemp(TempFirmParam param) {
         FirmInfoTemp temp = convertToTempFirm(param, true);
         tempFirmDao.insert(temp);
-        return true;
+        return temp.getClientId();
 
     }
 
@@ -125,8 +148,7 @@ public class TempFirmManagerServiceImpl implements TempFirmManagerService {
             temp.setClientId(param.getClientId());
         }
         temp.setFirmOrgCode(param.getFirmOrgCode());
-        temp.setFirmStatus(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode() + "");
-        temp.setJuridicalName(param.getFirmPerson());
+        temp.setStatus(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode() + "");
         if (param.getChannelApp() != null && true == param.getChannelApp()
                 && param.getChannelSdk() != null && true == param.getChannelSdk()) {
             temp.setChannel("2");
@@ -161,13 +183,7 @@ public class TempFirmManagerServiceImpl implements TempFirmManagerService {
 
     private TrustFirmParam buildTrustFirmParam(FirmInfoTemp temp) {
         TrustFirmParam trustFirmParam = new TrustFirmParam();
-        trustFirmParam.setFirmPerson(temp.getFirmPerson()); //厂商联系人 （不是法人）
-        trustFirmParam.setFirmName(temp.getFirmName());
-        trustFirmParam.setFirmEmail(temp.getFirmEmail());
-        String phone = StringUtils.isBlank(temp.getJuridicalPhone()) ? temp.getFirmPhone() :
-                temp.getJuridicalPhone();
-        trustFirmParam.setFirmPhone(phone);
-        trustFirmParam.setFirmAddress(temp.getFirmAddress());
+        BeanUtils.copyProperties(temp,trustFirmParam);
         trustFirmParam.setClientOrgCode(temp.getFirmOrgCode());
         trustFirmParam.setAgentSaleId(temp.getAgentSaleId());
         trustFirmParam.setAppIcon(temp.getFirmLogo());
@@ -186,9 +202,9 @@ public class TempFirmManagerServiceImpl implements TempFirmManagerService {
         trustFirmParam.setDoctorProductType(doctorProTypeList);
         trustFirmParam.setCertAlg("RSA");
         trustFirmParam.setAppSecret(UniqueIdUtils.generateAppSecret());
-        // TODO 什么时候审核临时客户会携带clientId？？
         String clientId = null;
         if (StringUtils.isBlank(temp.getClientId())) {
+            // fixme 设么时候会出现这种情况？
             clientId = UniqueIdUtils.generateClientId();
         } else {
             clientId = temp.getClientId();
@@ -200,7 +216,6 @@ public class TempFirmManagerServiceImpl implements TempFirmManagerService {
         trustFirmParam.setUserStampType(CommonStatusEnum.YES.getCode());
         // 信步云默认
         trustFirmParam.setCertAgency("1");
-        trustFirmParam.setFirmStatus(FirmStatusEnum.FIRM_SUB_NORMAL.getCode());
         trustFirmParam.setSmsSend(CommonStatusEnum.YES.getCode());
         String channel = temp.getChannel();
         if ("1".equals(channel) || "2".equals(channel)) {
@@ -219,4 +234,34 @@ public class TempFirmManagerServiceImpl implements TempFirmManagerService {
         return trustFirmParam;
     }
 
+
+    /**
+     * 参数校验
+     * @param param
+     * @param isAdd
+     */
+    private void checkParam(TempFirmParam param, boolean isAdd) throws BizException {
+        if (!isAdd && StringUtils.isBlank(param.getClientId())) {
+            throw new BizException(FirmErrEum.FIRM_CLIENT_ID_NULL);
+        }
+        if (StringUtils.isBlank(param.getFirmName())) {
+            throw new BizException(FirmErrEum.FIRM_NAME_NULL);
+        }
+        if (StringUtils.isNotEmpty(param.getFirmName()) && param.getFirmName().length() > 30) {
+            throw new BizException(FirmErrEum.FIRM_NAME_TOO_LONG);
+        }
+//        if (StringUtils.isBlank(param.getFirmPerson())) {
+//            throw new BizException(FirmErrEum.FIRM_PERSON);
+//        }
+//        if (!ValidateUtil.checkMobile(param.getFirmPhone())) {
+//            throw new BizException(FirmErrEum.FIRM_PHONE);
+//        }
+//        if(!ValidateUtil.checkEmail(param.getFirmEmail())){
+//            throw new BizException(FirmErrEum.EMAIL);
+//        }
+        // 待补充
+
+    }
+
+
 }
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java b/customer/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java
index f695c9a..e1abec6 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java
+++ b/customer/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java
@@ -1,12 +1,12 @@
 package com.trust.ywx.customer.service.query;
 
-import com.fiftyonetrust.common.model.result.PageList;
 import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
 import com.trust.ywx.customer.common.model.query.request.SearchCrmFirmParam;
 import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
 import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmParam;
 import com.trust.ywx.customer.common.model.manager.response.TempFirmDto;
 import com.trust.ywx.customer.common.model.query.response.CrmFirmDto;
+import com.trust.ywx.customer.common.model.PageBean;
 
 import java.util.List;
 import java.util.Map;
@@ -26,19 +26,13 @@ import java.util.Map;
 public interface FirmQueryService {
 
     //-------------------------可信客户--------------------
-    /**
-     * 获取可信客户列表 (fixme 量大的话，不应该提供一次返回全量数据的接口)
-     * @param param
-     * @return
-     */
-    List getTrustFirmList(SearchTrustFirmParam param);
 
     /**
      * 获取可信客户列表 （分页）
      * @param param
      * @return
      */
-    PageList> getTrustFirmListWithPage(SearchTrustFirmParam param);
+    PageBean getTrustFirmList(SearchTrustFirmParam param);
 
     /**
      * 获取可信客户详情 （不包括证书和厂商图标信息）
@@ -46,6 +40,7 @@ public interface FirmQueryService {
      * @return
      */
     TrustFirmDto getTrustFirm(String clientId);
+
     TrustFirmDto getTrustFirmWithBLOBs(String clientId);
 
     /**
@@ -55,13 +50,6 @@ public interface FirmQueryService {
     Map getAllProp(String clientId);
 
     /**
-     * 根据属性值获取客户列表
-     * fixme 要不要提供这个接口呢？
-     * 例如：白名单 感觉最好是明确获取白名单的接口
-     */
-//    List getListByProp(String propName,String propValue);
-
-    /**
      * 查询客户白名单
      * @param firmName
      * @return
@@ -72,8 +60,15 @@ public interface FirmQueryService {
     /**
      * 获取待审核客户列表
      * @param param
+     * @return
+     */
+    PageBean getTempFirmList(SearchFirmParam param);
+    /**
+     * 获取待审核客户详情
+     * @param clientId
+     * @return
      */
-    List getTempFirmList(SearchFirmParam param);
+    TempFirmDto getTempFirmByClientId(String clientId);
 
 
     //-------------------------北京CA客户------------------------
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/query/impl/FirmQueryServiceImpl.java b/customer/src/main/java/com/trust/ywx/customer/service/query/impl/FirmQueryServiceImpl.java
new file mode 100644
index 0000000..76f8c65
--- /dev/null
+++ b/customer/src/main/java/com/trust/ywx/customer/service/query/impl/FirmQueryServiceImpl.java
@@ -0,0 +1,283 @@
+package com.trust.ywx.customer.service.query.impl;
+
+import com.fiftyonetrust.common.redis.template.RedisRepository;
+import com.trust.ywx.customer.common.enu.FirmProperEnum;
+import com.trust.ywx.customer.common.enu.NetworkTypeEnum;
+import com.trust.ywx.customer.common.model.PageBean;
+import com.trust.ywx.customer.common.model.PageBeanUtil;
+import com.trust.ywx.customer.dao.*;
+import com.trust.ywx.customer.dao.po.FirmInfo;
+import com.trust.ywx.customer.dao.po.FirmInfoExtend;
+import com.trust.ywx.customer.dao.po.FirmInfoTemp;
+import com.trust.ywx.customer.dao.po.FirmUsercertChannel;
+import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
+import com.trust.ywx.customer.common.model.query.request.SearchCrmFirmParam;
+import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
+import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmParam;
+import com.trust.ywx.customer.common.model.manager.response.TempFirmDto;
+import com.trust.ywx.customer.common.model.query.response.CrmFirmDto;
+import com.trust.ywx.customer.service.query.FirmQueryService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheConfig;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.*;
+
+/**
+ * 

+ *
+ * @文件名称： FirmQueryServiceImpl.java
+ * @包 路  径： com.trust.ywx.customer.service.query.impl
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/15 18:43
+ * @Modify：
+ */
+@CacheConfig(cacheNames = {"firm"})
+@Service("firmQueryService")
+public class FirmQueryServiceImpl implements FirmQueryService {
+    @Autowired
+    private TrustFirmDao trustFirmDao;
+    @Autowired
+    private TempFirmDao tempFirmDao;
+    @Autowired
+    private FirmGroupDao firmGroupDao;
+    @Autowired
+    private FirmExtendDao firmExtendDao;
+    @Autowired
+    private DoctorProductTypeDao doctorProductTypeDao;
+    @Autowired
+    RedisRepository redisRepository;
+    @Override
+    public PageBean getTrustFirmList(SearchTrustFirmParam param) {
+        List clientIdList = new ArrayList<>();
+
+        // clientId筛选
+        if (StringUtils.isNotEmpty(param.getClientId())) {
+            FirmInfo firmInfo = trustFirmDao.getFrimByClientId(param.getClientId());
+            if (null == firmInfo) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+            // 增加项目状态的判断
+            if (null != param.getProjectStatus() && !Objects.equals(firmInfo.getProjectStatus(), param.getProjectStatus())) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+            // 增加实施人员的判断
+            if (null != param.getTechId() && !Objects.equals(firmInfo.getTechPersonId(), param.getTechId())) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+            // 增加销售人员的判断
+            if (null != param.getSaleId() && !Objects.equals(firmInfo.getSalePersonId(), param.getTechId())) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+
+            clientIdList.add(param.getClientId());
+        }
+
+        // 客户组筛选
+        if (StringUtils.isNotEmpty(param.getGroupId())) {
+            List groupClientIdList = firmGroupDao.getClientIdByGroupId(param.getGroupId());
+            if (CollectionUtils.isEmpty(clientIdList)) {
+                clientIdList = groupClientIdList;
+            } else {
+                clientIdList.retainAll(groupClientIdList);
+                if (CollectionUtils.isEmpty(clientIdList)) {
+                    return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+                }
+            }
+        }
+
+        // 医师产品形态筛选 fixme 下面的查询可以合成一个
+        if (null != param.getDoctorProductType()) {
+            List subClientIdList;
+            if (StringUtils.isNotEmpty(param.getClientId())) {
+                subClientIdList = getClientIdListByProp(FirmProperEnum.DOCTOR_PRODUCT_APP.getProperName(), param.getDoctorProductType(), Arrays.asList(param.getClientId()));
+            } else {
+                subClientIdList = getClientIdListByProp(FirmProperEnum.DOCTOR_PRODUCT_APP.getProperName(), param.getDoctorProductType(), null);
+            }
+            // 与clientIdList求并集
+            clientIdList.retainAll(subClientIdList);
+            if (CollectionUtils.isEmpty(clientIdList)) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+
+            if (StringUtils.isNotEmpty(param.getClientId())) {
+                subClientIdList = getClientIdListByProp(FirmProperEnum.DOCTOR_PRODUCT_SDK.getProperName(), param.getDoctorProductType(), Arrays.asList(param.getClientId()));
+            } else {
+                subClientIdList = getClientIdListByProp(FirmProperEnum.DOCTOR_PRODUCT_SDK.getProperName(), param.getDoctorProductType(), null);
+            }
+            // 与clientIdList求并集
+            clientIdList.retainAll(subClientIdList);
+            if (CollectionUtils.isEmpty(clientIdList)) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+        }
+
+        /**
+         * 属性过滤暂时没想到好办法，只能一个个去查询了
+         */
+        if (null != param.getNetworkType()) {
+            List subClientIdList = getClientIdListByProp(FirmProperEnum.NETWORK_TYPE.getProperName(), param.getNetworkType(), clientIdList);
+            // 与clientIdList求并集
+            clientIdList.retainAll(subClientIdList);
+            if (CollectionUtils.isEmpty(clientIdList)) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+        }
+        if (null != param.getChargingMode()) {
+            List subClientIdList = getClientIdListByProp(FirmProperEnum.CHARGING_MODE.getProperName(), param.getChargingMode(), clientIdList);
+            // 与clientIdList求并集
+            clientIdList.retainAll(subClientIdList);
+            if (CollectionUtils.isEmpty(clientIdList)) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+        }
+        if (null != param.getPublicProductType()) {
+            List subClientIdList = getClientIdListByProp(FirmProperEnum.PUBLIC_PRODUCT_TYPE.getProperName(), param.getPublicProductType(), clientIdList);
+            // 与clientIdList求并集
+            clientIdList.retainAll(subClientIdList);
+            if (CollectionUtils.isEmpty(clientIdList)) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+        }
+        PageBean page = null;
+
+        if(CollectionUtils.isEmpty(clientIdList)){
+            page = trustFirmDao.getList(param.getPageNo(),param.getPageSize());
+        }else{
+            if (clientIdList.size() < param.getPageSize() * param.getPageNo()) {
+                return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+            }
+            page = trustFirmDao.getListByIds(clientIdList,  param.getPageNo(),param.getPageSize());
+        }
+
+        if (CollectionUtils.isEmpty(page.getList())) {
+            return PageBeanUtil.getEmptyPage(param.getPageNo(),param.getPageSize());
+        }
+        List dtoList = new ArrayList<>(page.getList().size());
+        for (FirmInfo po : page.getList()) {
+            TrustFirmDto dto = converPoToDto(po);
+            dtoList.add(dto);
+        }
+
+        PageBean pageBean = new PageBean(dtoList);
+        pageBean.setPageNum(page.getPageNum());
+        pageBean.setPageSize(page.getPageSize());
+        pageBean.setTotal(page.getTotal());
+        pageBean.setPages(page.getPages());
+        return pageBean;
+    }
+
+
+    private TrustFirmDto converPoToDto(FirmInfo po) {
+        if (null == po) {
+            return null;
+        }
+        TrustFirmDto dto = new TrustFirmDto();
+        BeanUtils.copyProperties(po, dto);
+
+        // TODO 差异属性转换
+        return dto;
+    }
+
+    @Override
+    public TrustFirmDto getTrustFirm(String clientId) {
+        FirmInfo po = trustFirmDao.getFrimByClientId(clientId);
+        return converPoToDto(po);
+    }
+
+    @Override
+    public TrustFirmDto getTrustFirmWithBLOBs(String clientId) {
+        FirmInfo po = trustFirmDao.getFrimByClientId(clientId);
+        return converPoToDto(po);
+    }
+
+    @Override
+    public Map getAllProp(String clientId) {
+        if (StringUtils.isEmpty(clientId)) {
+            return new HashMap<>();
+        }
+        Map map = new HashMap<>(64);
+        // 1、从firm_info_extend获取全量属性
+        List extendList = firmExtendDao.getListByClientId(clientId);
+        for (FirmInfoExtend extendPo : extendList) {
+            map.put(extendPo.getPropName(), extendPo.getPropValue());
+        }
+
+        //2、从firm_usercert_channel 获取医师产品形态属性 fixme 以后要去掉
+        List doctorProductList = doctorProductTypeDao.getByClientId(clientId);
+
+        for (FirmUsercertChannel doctorPo : doctorProductList) {
+            if (doctorPo.getChannelType() == 0) {
+                map.put(FirmProperEnum.DOCTOR_PRODUCT_APP.getProperName(), doctorPo.getChannelType() + "");
+            }
+            if (doctorPo.getChannelType() == 1) {
+                map.put(FirmProperEnum.DOCTOR_PRODUCT_SDK.getProperName(), doctorPo.getChannelType() + "");
+            }
+        }
+        return map;
+    }
+
+    @Override
+    public List getFirmWhite(String firmName) {
+        return null;
+    }
+
+    @Override
+    public PageBean getTempFirmList(SearchFirmParam param) {
+        return tempFirmDao.getListByParam(param);
+    }
+
+    @Override
+    @Cacheable(key = "'temp:'+#clientId")
+    public TempFirmDto getTempFirmByClientId(String clientId) {
+        FirmInfoTemp tempPo = tempFirmDao.getByClientId(clientId);
+        TempFirmDto dto =converTempPoToDto(tempPo);
+        return dto;
+    }
+
+    private TempFirmDto converTempPoToDto(FirmInfoTemp tempPo) {
+        TempFirmDto dto = new TempFirmDto();
+        BeanUtils.copyProperties(tempPo,dto);
+        if(StringUtils.isNotBlank(tempPo.getChannel())){
+            if("0".equals(tempPo.getChannel())){
+                dto.setChannelApp(true);
+            }else if("1".equals(tempPo.getChannel())){
+                dto.setChannelSdk(true);
+            }else if("2".equals(tempPo.getChannel())){
+                dto.setChannelApp(true);
+                dto.setChannelSdk(true);
+            }
+        }
+        return dto;
+    }
+
+    @Override
+    public List getCrmFirmList(SearchCrmFirmParam param) {
+        return null;
+    }
+
+    private List getClientIdListByProp(String propName, Integer propValue, List clientIdList) {
+        String convertPropValue = "";
+        if (Objects.equals(propName, FirmProperEnum.DOCTOR_PRODUCT_SDK.getProperName())
+                || Objects.equals(propName, FirmProperEnum.DOCTOR_PRODUCT_APP.getProperName())) {
+            //fixme，目前医师产品形态单独存储在firm_usercert_channel表，后期挪到firm_info_extends表
+            return doctorProductTypeDao.getClientIdByProp(clientIdList, propValue);
+        } else {
+            // 其他属性都在firm_info_extends表
+            if (Objects.equals(propName, FirmProperEnum.NETWORK_TYPE.getProperName())) {
+                convertPropValue = NetworkTypeEnum.getNameOfCode(propValue);
+            } else {
+                convertPropValue = String.valueOf(propValue);
+            }
+            return firmExtendDao.getByPropsAndClientId(propName, convertPropValue, clientIdList);
+        }
+    }
+
+}
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/query/impl/FirmQueryServiceImpl_bak.java b/customer/src/main/java/com/trust/ywx/customer/service/query/impl/FirmQueryServiceImpl_bak.java
new file mode 100644
index 0000000..eb2f79d
--- /dev/null
+++ b/customer/src/main/java/com/trust/ywx/customer/service/query/impl/FirmQueryServiceImpl_bak.java
@@ -0,0 +1,202 @@
+//package com.trust.ywx.customer.service.query.impl;
+//
+//import com.fiftyonetrust.common.model.result.Page;
+//import com.fiftyonetrust.common.model.result.PageList;
+//import com.trust.ywx.customer.common.enums.FirmProperEnum;
+//import com.trust.ywx.customer.common.enums.NetworkTypeEnum;
+//import com.trust.ywx.customer.dao.FirmDao;
+//import com.trust.ywx.customer.dao.FirmExtendDao;
+//import com.trust.ywx.customer.dao.FirmGroupDao;
+//import com.trust.ywx.customer.dao.mapper.FirmUsercertChannelMapper;
+//import com.trust.ywx.customer.dao.po.FirmInfo;
+//import com.trust.ywx.customer.dao.po.FirmUsercertChannelExample;
+//import com.trust.ywx.customer.service.dto.TrustFirmDto;
+//import com.trust.ywx.customer.common.model.query.request.SearchCrmFirmParam;
+//import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
+//import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmWithPageParam;
+//import com.trust.ywx.customer.service.dto.response.AuditFirmDto;
+//import com.trust.ywx.customer.common.model.query.response.CrmFirmDto;
+//import com.trust.ywx.customer.common.exception.BizException;
+//import com.trust.ywx.customer.service.query.FirmQueryService;
+//import org.apache.commons.lang.StringUtils;
+//import org.springframework.beans.BeanUtils;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.util.CollectionUtils;
+//
+//import java.util.ArrayList;
+//import java.util.List;
+//import java.util.Map;
+//import java.util.Objects;
+//
+///**
+// * 

+// *
+// * @文件名称： FirmQueryServiceImpl.java
+// * @包 路  径： com.trust.ywx.customer.service.query.impl
+// * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+// * @Description:
+// * @Version: V1.0
+// * @Author： hanzhenchao
+// * @Date：2022/6/15 18:43
+// * @Modify：
+// */
+//public class FirmQueryServiceImpl_bak implements FirmQueryService {
+//    @Autowired
+//    private FirmDao firmDao;
+//    @Autowired
+//    private FirmGroupDao firmGroupDao;
+//    @Autowired
+//    private FirmExtendDao firmExtendDao;
+//    @Autowired
+//    private FirmUsercertChannelMapper usercertChannelMapper;
+//
+//    @Override
+//    public PageList> getTrustFirmList(SearchTrustFirmWithPageParam param) {
+//        List clientIdList = new ArrayList<>();
+//
+//        // 客户id/合同编号/合同方 筛选
+//        if(!Objects.equals(param.getClientId(),param.getLikeCron())){
+//            // 如果clientId不为空，比较likeCron是否一致，不一致说明likeCron是合同编号/合同方
+//            if(StringUtils.isNotEmpty(param.getLikeCron())){
+//                //查询合同表
+//                String clientId = firmDao.getClientIdByKeyword(param.getLikeCron());
+//                if(StringUtils.isEmpty(clientId) || !Objects.equals(param.getClientId(),clientId)){
+//                    // 未查到或查到的clientId和选择的客户不匹配，返回空
+//                    return new PageList();
+//                }
+//            }
+//        }
+//
+//        // clientId筛选
+//        if(StringUtils.isNotEmpty(param.getClientId())){
+//            FirmInfo firmInfo = firmDao.getFrimByClientId(param.getClientId());
+//            if(null == firmInfo){
+//                return new PageList();
+//            }
+//            // 增加项目状态的判断
+//            if(null != param.getFirmStatus() && Objects.equals(firmInfo.getFirmStatus(),param.getFirmStatus())){
+//                return new PageList();
+//            }
+//            clientIdList.add(param.getClientId());
+//
+//        }
+//
+//        // 客户组筛选
+//        if(StringUtils.isNotEmpty(param.getGroupId())){
+//            List groupClientIdList = firmGroupDao.getClientIdByGroupId(param.getGroupId());
+//            if(CollectionUtils.isEmpty(clientIdList)){
+//                clientIdList = groupClientIdList;
+//            }else{
+//                clientIdList.retainAll(groupClientIdList);
+//                if(CollectionUtils.isEmpty(clientIdList)){
+//                    return new PageList();
+//                }
+//            }
+//        }
+//
+//        // 医师产品形态筛选（fixme，目前单独存储在firm_usercert_channel表，后期挪到firm_info_extends表）
+//        if(null!=param.getDoctorProductType()){
+//            if(StringUtils.isNotEmpty(param.getClientId())){
+//                // 携带客户Id和产品形态一起去查
+//                FirmUsercertChannelExample example = new FirmUsercertChannelExample();
+//                example.createCriteria().andChannelTypeEqualTo(param.getDoctorProductType()).andClientidEqualTo(param.getClientId());
+//                long count = usercertChannelMapper.countByExample(example);
+//                if(count==0){
+//                    return new PageList();
+//                }else{
+//                    clientIdList.add(param.getClientId());
+//                }
+//            }else{
+//                List subClientIdList = firmDao.getClientIdByChannelType(param.getDoctorProductType());
+//                // 与clientIdList求并集
+//                clientIdList.retainAll(subClientIdList);
+//                if(CollectionUtils.isEmpty(clientIdList)){
+//                    return new PageList();
+//                }
+//            }
+//        }
+//
+//        /**
+//         * 属性过滤暂时没想到好办法，只能一个个去查询了
+//         */
+//        if(null!=param.getNetworkType()){
+//            List subClientIdList = firmExtendDao.getByPropsAndClientId(FirmProperEnum.NETWORK_TYPE.getProperName(),NetworkTypeEnum.getNameOfCode(param.getNetworkType()),clientIdList);
+//            // 与clientIdList求并集
+//            clientIdList.retainAll(subClientIdList);
+//            if(CollectionUtils.isEmpty(clientIdList)){
+//                return new PageList();
+//            }
+//        }
+//        if(null!=param.getChargingMode()){
+//            List subClientIdList = firmExtendDao.getByPropsAndClientId(FirmProperEnum.CHARGING_MODEL.getProperName(), param.getChargingMode()+"", clientIdList);
+//            // 与clientIdList求并集
+//            clientIdList.retainAll(subClientIdList);
+//            if(CollectionUtils.isEmpty(clientIdList)){
+//                return new PageList();
+//            }
+//        }
+//        if(null!=param.getPublicProductType()){
+//            List subClientIdList = firmExtendDao.getByPropsAndClientId(FirmProperEnum.PUBLIC_PRODUCT_TYPE.getProperName(),param.getPublicProductType()+"",clientIdList);
+//            // 与clientIdList求并集
+//            clientIdList.retainAll(subClientIdList);
+//            if(CollectionUtils.isEmpty(clientIdList)){
+//                return new PageList();
+//            }
+//        }
+//
+//
+//        List firmList = firmDao.getListByIds(clientIdList);
+//        List dtoList = new ArrayList<>(firmList.size());
+//        for (FirmInfo po: firmList) {
+//            TrustFirmDto dto = converPoToDto(po);
+//            dtoList.add(dto);
+//        }
+//
+//        // fixme 组装好麻烦，需要改进下
+//        PageList pageList = new PageList();
+//        pageList.setItems(dtoList);
+//        Page page = new Page();
+//        page.setPageNo(param.getPageNo());
+//        page.setPageSize(param.getPageSize());
+//        page.setTotal(dtoList.size());
+//        pageList.setPage(page);
+//        return pageList;
+//    }
+//
+//
+//    private TrustFirmDto converPoToDto(FirmInfo po) {
+//        if(null == po){
+//            return null;
+//        }
+//        TrustFirmDto dto = new TrustFirmDto();
+//        BeanUtils.copyProperties(po,dto);
+//
+//        // TODO 差异属性转换
+//        return dto;
+//    }
+//
+//    @Override
+//    public TrustFirmDto getTrustFirm(String clientId) {
+//        return null;
+//    }
+//
+//    @Override
+//    public Map getProp(String clientId) throws Exception{
+//        if(StringUtils.isEmpty(clientId)){
+//            throw new BizException("400","clientId不能为空");
+//        }
+//        // 从firm_info_extend\、firm_usercert_channel获取全量属性
+//
+//        return null;
+//    }
+//
+//    @Override
+//    public List getAuditFirmList(SearchFirmParam param) {
+//        return null;
+//    }
+//
+//    @Override
+//    public List getCrmFirmList(SearchCrmFirmParam param) {
+//        return null;
+//    }
+//}
diff --git a/customer/src/main/resources.dev/jdbc.properties b/customer/src/main/resources.dev/jdbc.properties
new file mode 100644
index 0000000..48e54d5
--- /dev/null
+++ b/customer/src/main/resources.dev/jdbc.properties
@@ -0,0 +1,3 @@
+jdbc.url=jdbc:mysql://192.168.126.22:3306/tms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
+jdbc.username=root
+jdbc.password=tiger
\ No newline at end of file
diff --git a/customer/src/main/resources.dev/logback.xml b/customer/src/main/resources.dev/logback.xml
new file mode 100644
index 0000000..19edeb2
--- /dev/null
+++ b/customer/src/main/resources.dev/logback.xml
@@ -0,0 +1,85 @@
+
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+        ${LOG_DIRECTOR}/${LOG_PREFIX}.log
+        true
+        
+            ${LOG_DIRECTOR}/archive/${LOG_PREFIX}-%d.%i.zip
+            ${MAX_FILE_SIZE}
+            ${MAX_HISTORY}
+            ${TOTAL_SIZE_CAP}
+        
+        
+            ${PATTERN_DEFAULT}
+            UTF-8
+        
+    
+
+    
+    
+        
+        512
+        
+    
+
+    
+    
+        
+            %date %level [%thread] %logger{10} [%file:%line] %msg%n
+            UTF-8
+        
+    
+
+    
+    
+        512
+        
+    
+
+    
+    
+        ${LOG_DIRECTOR}/access.log
+        true
+        
+            ${LOG_DIRECTOR}/archive/access-%d.%i.zip
+            ${MAX_FILE_SIZE}
+            ${MAX_HISTORY}
+            ${TOTAL_SIZE_CAP}
+        
+        
+            ${PATTERN_DEFAULT}
+            UTF-8
+        
+    
+
+    
+        
+    
+
+    
+    
+    
+    
+
+    
+        
+        
+    
+
\ No newline at end of file
diff --git a/customer/src/main/resources.dev/redis.properties b/customer/src/main/resources.dev/redis.properties
new file mode 100644
index 0000000..2d4ed0e
--- /dev/null
+++ b/customer/src/main/resources.dev/redis.properties
@@ -0,0 +1,11 @@
+ywq.cache-manager.configs[0].key=ywx-customer
+ywq.lock.lockerType=REDIS
+spring.redis.database=0
+spring.redis.host=192.168.126.22
+spring.redis.port=6379
+spring.redis.password=ywq@centos7
+spring.redis.timeout=2000
+spring.redis.pool.laxative=64
+spring.redis.pool.maxillae=64
+spring.redis.pool.maxi=-1
+spring.redis.pool.middle=1
diff --git a/customer/src/main/resources.dev/server.properties b/customer/src/main/resources.dev/server.properties
new file mode 100644
index 0000000..3992919
--- /dev/null
+++ b/customer/src/main/resources.dev/server.properties
@@ -0,0 +1,6 @@
+application.name=ywx-customer
+log.level=DEBUG
+server.port=8089
+
+# dubbo register nacos
+dubbo.registry.address.nacos=nacos.server:8848?namespace=dev
diff --git a/customer/src/main/resources.on/jdbc.properties b/customer/src/main/resources.on/jdbc.properties
new file mode 100644
index 0000000..28a6e8a
--- /dev/null
+++ b/customer/src/main/resources.on/jdbc.properties
@@ -0,0 +1,3 @@
+jdbc.url=jdbc:mysql://rds111phk011w53r18r4.mysql.rds.aliyuncs.com:3306/tms?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useUnicode=true
+jdbc.username=ywxmr
+jdbc.password=SZEbdcprVvoxjy1B
\ No newline at end of file
diff --git a/customer/src/main/resources.on/pay.properties b/customer/src/main/resources.on/pay.properties
new file mode 100644
index 0000000..f6db731
--- /dev/null
+++ b/customer/src/main/resources.on/pay.properties
@@ -0,0 +1,4 @@
+pay.domain=http://pay.51trust.com
+pay.clientId=2022032910290110
+pay.clientSecret=7DEDEE048AEB908EE70239D3108A66BA
+wx.domain=http://mr.51trust.com
\ No newline at end of file
diff --git a/customer/src/main/resources.on/redis.properties b/customer/src/main/resources.on/redis.properties
new file mode 100644
index 0000000..cc36fa7
--- /dev/null
+++ b/customer/src/main/resources.on/redis.properties
@@ -0,0 +1,11 @@
+ywq.cache-manager.configs[0].key=mr-cloud
+ywq.lock.lockerType=REDIS
+spring.redis.database=5
+spring.redis.host=r-2zetn1j21ge0njlzfn.redis.rds.aliyuncs.com
+spring.redis.port=6379
+spring.redis.password=ywxmr:psVJjvxPM9b0l1pw
+spring.redis.timeout=2000
+spring.redis.pool.laxative=64
+spring.redis.pool.maxillae=64
+spring.redis.pool.maxi=-1
+spring.redis.pool.middle=1
diff --git a/customer/src/main/resources.on/server.properties b/customer/src/main/resources.on/server.properties
new file mode 100644
index 0000000..1e1e6dc
--- /dev/null
+++ b/customer/src/main/resources.on/server.properties
@@ -0,0 +1,6 @@
+application.name=ywx-customer
+log.level=INFO
+server.port=8089
+
+cloud.host=hhttp://pubhos.51trust.com/mediAdmin
+express.token=33dc06c00a39df7177cc45a5
\ No newline at end of file
diff --git a/customer/src/main/resources.test/jdbc.properties b/customer/src/main/resources.test/jdbc.properties
new file mode 100644
index 0000000..48e54d5
--- /dev/null
+++ b/customer/src/main/resources.test/jdbc.properties
@@ -0,0 +1,3 @@
+jdbc.url=jdbc:mysql://192.168.126.22:3306/tms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8
+jdbc.username=root
+jdbc.password=tiger
\ No newline at end of file
diff --git a/customer/src/main/resources.test/logback.xml b/customer/src/main/resources.test/logback.xml
new file mode 100644
index 0000000..19edeb2
--- /dev/null
+++ b/customer/src/main/resources.test/logback.xml
@@ -0,0 +1,85 @@
+
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+
+    
+    
+        ${LOG_DIRECTOR}/${LOG_PREFIX}.log
+        true
+        
+            ${LOG_DIRECTOR}/archive/${LOG_PREFIX}-%d.%i.zip
+            ${MAX_FILE_SIZE}
+            ${MAX_HISTORY}
+            ${TOTAL_SIZE_CAP}
+        
+        
+            ${PATTERN_DEFAULT}
+            UTF-8
+        
+    
+
+    
+    
+        
+        512
+        
+    
+
+    
+    
+        
+            %date %level [%thread] %logger{10} [%file:%line] %msg%n
+            UTF-8
+        
+    
+
+    
+    
+        512
+        
+    
+
+    
+    
+        ${LOG_DIRECTOR}/access.log
+        true
+        
+            ${LOG_DIRECTOR}/archive/access-%d.%i.zip
+            ${MAX_FILE_SIZE}
+            ${MAX_HISTORY}
+            ${TOTAL_SIZE_CAP}
+        
+        
+            ${PATTERN_DEFAULT}
+            UTF-8
+        
+    
+
+    
+        
+    
+
+    
+    
+    
+    
+
+    
+        
+        
+    
+
\ No newline at end of file
diff --git a/customer/src/main/resources.test/redis.properties b/customer/src/main/resources.test/redis.properties
new file mode 100644
index 0000000..2d4ed0e
--- /dev/null
+++ b/customer/src/main/resources.test/redis.properties
@@ -0,0 +1,11 @@
+ywq.cache-manager.configs[0].key=ywx-customer
+ywq.lock.lockerType=REDIS
+spring.redis.database=0
+spring.redis.host=192.168.126.22
+spring.redis.port=6379
+spring.redis.password=ywq@centos7
+spring.redis.timeout=2000
+spring.redis.pool.laxative=64
+spring.redis.pool.maxillae=64
+spring.redis.pool.maxi=-1
+spring.redis.pool.middle=1
diff --git a/customer/src/main/resources.test/server.properties b/customer/src/main/resources.test/server.properties
new file mode 100644
index 0000000..21234a5
--- /dev/null
+++ b/customer/src/main/resources.test/server.properties
@@ -0,0 +1,3 @@
+application.name=ywx-customer
+log.level=DEBUG
+server.port=8089
diff --git a/customer/src/main/resources/application.properties b/customer/src/main/resources/application.properties
index ec6517b..f73aa8a 100644
--- a/customer/src/main/resources/application.properties
+++ b/customer/src/main/resources/application.properties
@@ -1,18 +1,13 @@
 # 应用名称
-spring.application.name=ywx-customer
-
+logging.level.com.trust.ywx.customer.dao=DEBUG
 # 应用服务 WEB 访问端口
 server.port=8089
 spring.profiles.active=dev
 
-# dubbo register nacos
-dubbo.registry.address.nacos=nacos.server:8848?namespace=dev
+
 spring.main.allow-bean-definition-overriding=true
 
 ##########################  druid配置   ##########################
-spring.datasource.url=jdbc:mysql://192.168.126.22:3306/tms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-jdbc.username=root
-jdbc.password=tiger
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.initialSize=20
@@ -41,7 +36,9 @@ spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowS
 spring.datasource.useGlobalDataSourceStat=true
 ########################################################
 
+########################mybatis======================
 mybatis.mapperLocations=classpath*:/mybatis/**/*.xml
+datasource.dialect=com.github.pagehelper.dialect.helper.MySqlDialect
 
 
 
diff --git a/customer/src/main/resources/dev/base.properties b/customer/src/main/resources/dev/base.properties
deleted file mode 100644
index 89ad18c..0000000
--- a/customer/src/main/resources/dev/base.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-application.name=ywx-customer
-log.level=DEBUG
\ No newline at end of file
diff --git a/customer/src/main/resources/dev/jdbc.properties b/customer/src/main/resources/dev/jdbc.properties
deleted file mode 100644
index 2c6c57f..0000000
--- a/customer/src/main/resources/dev/jdbc.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-jdbc.url=jdbc:mysql://192.168.126.22:3306/tms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=true
-jdbc.username=root
-jdbc.password=tiger
\ No newline at end of file
diff --git a/customer/src/main/resources/dev/redis.properties b/customer/src/main/resources/dev/redis.properties
deleted file mode 100644
index 6c7b6b0..0000000
--- a/customer/src/main/resources/dev/redis.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-ywq.cache-manager.configs[0].key=mr-admin
-ywq.lock.lockerType=REDIS
-spring.redis.database=5
-spring.redis.host=192.168.126.22
-spring.redis.port=6379
-spring.redis.password=ywq@centos7
-spring.redis.timeout=2000
-spring.redis.pool.laxative=5
-spring.redis.pool.maxillae=5
-spring.redis.pool.maxi=-1
-spring.redis.pool.middle=1
-user.root.name=root
-user.root.passwd=root
\ No newline at end of file
diff --git a/customer/src/main/resources/dev/server.properties b/customer/src/main/resources/dev/server.properties
deleted file mode 100644
index b882da4..0000000
--- a/customer/src/main/resources/dev/server.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-application.name=ywx-customer
-log.level=DEBUG
-server.port=7013
\ No newline at end of file
diff --git a/customer/src/main/resources/generatorConfig.xml b/customer/src/main/resources/generatorConfig.xml
index 649a708..754a88a 100644
--- a/customer/src/main/resources/generatorConfig.xml
+++ b/customer/src/main/resources/generatorConfig.xml
@@ -82,40 +82,53 @@
         
 
         
-        
-            
-            
-            
-        

+
+
+
+
+
+
+
         
-
-
+            

             
         

         
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            
+            

             
             
         

-        
-        

-        
-        

+
+
+
+
+
+
+
+
 
-        
-            
-        

+
+
+
+
+
 
     
 
\ No newline at end of file
diff --git a/customer/src/main/resources/mybatis/mapper/FirmInfoMapper.xml b/customer/src/main/resources/mybatis/mapper/FirmInfoMapper.xml
index 110204d..d745d91 100644
--- a/customer/src/main/resources/mybatis/mapper/FirmInfoMapper.xml
+++ b/customer/src/main/resources/mybatis/mapper/FirmInfoMapper.xml
@@ -84,9 +84,6 @@
   
   
     
-    
-    
-    
     
     
   
@@ -155,7 +152,7 @@
     agent_sale_id, ca_channel, project_status, plat_app_id
   
   
-    app_cert, app_icon
+    app_icon
   
   
   
     insert into firm_info_temp
-    (uniqueid, open_id, business_license_url, org_code_url, juridical_idcard_front_url, 
-      juridical_idcard_back_url, juridical_tmp_id_url, firm_name, firm_bus_reg_num, firm_soc_cre_code, 
-      firm_addr, firm_org_code, firm_tax_reg_cert_code, firm_bus_scope, firm_bus_time, 
-      juridical_nationality, juridical_name, juridical_phone, juridical_idcard, juridical_time, 
-      agent_name, agent_idcard, agent_time, firm_phone, firm_email, realname_check, firm_status, 
-      juridical_realname_check, agent_phone, channel, agent_client_id, agent_sale_id, 
-      firm_client_id, create_time, update_time, firm_person, firm_logo)
+    (uniqueid, business_license_url, org_code_url, firm_name, firm_addr, firm_org_code, 
+      firm_bus_scope, firm_bus_time, agent_name, agent_idcard, agent_time, firm_phone, 
+      firm_email, firm_status, juridical_realname_check, agent_phone, channel, agent_client_id, 
+      agent_sale_id, firm_client_id, create_time, update_time, firm_person, firm_logo
+      )
     values
     
-      (#{item.uniqueid,jdbcType=VARCHAR}, #{item.openId,jdbcType=VARCHAR}, #{item.businessLicenseUrl,jdbcType=VARCHAR}, 
-        #{item.orgCodeUrl,jdbcType=VARCHAR}, #{item.juridicalIdcardFrontUrl,jdbcType=VARCHAR}, 
-        #{item.juridicalIdcardBackUrl,jdbcType=VARCHAR}, #{item.juridicalTmpIdUrl,jdbcType=VARCHAR}, 
-        #{item.firmName,jdbcType=VARCHAR}, #{item.firmBusRegNum,jdbcType=VARCHAR}, #{item.firmSocCreCode,jdbcType=VARCHAR}, 
-        #{item.firmAddress,jdbcType=VARCHAR}, #{item.firmOrgCode,jdbcType=VARCHAR}, #{item.firmTaxRegCertCode,jdbcType=VARCHAR}, 
-        #{item.firmBusScope,jdbcType=VARCHAR}, #{item.firmBusTime,jdbcType=TIMESTAMP}, 
-        #{item.juridicalNationality,jdbcType=VARCHAR}, #{item.juridicalName,jdbcType=VARCHAR}, 
-        #{item.juridicalPhone,jdbcType=VARCHAR}, #{item.juridicalIdcard,jdbcType=VARCHAR}, 
-        #{item.juridicalTime,jdbcType=TIMESTAMP}, #{item.agentName,jdbcType=VARCHAR}, #{item.agentIdcard,jdbcType=VARCHAR}, 
-        #{item.agentTime,jdbcType=TIMESTAMP}, #{item.firmPhone,jdbcType=VARCHAR}, #{item.firmEmail,jdbcType=VARCHAR}, 
-        #{item.realnameCheck,jdbcType=CHAR}, #{item.firmStatus,jdbcType=VARCHAR}, #{item.juridicalRealnameCheck,jdbcType=CHAR}, 
-        #{item.agentPhone,jdbcType=VARCHAR}, #{item.channel,jdbcType=VARCHAR}, #{item.agentClientId,jdbcType=VARCHAR}, 
-        #{item.agentSaleId,jdbcType=VARCHAR}, #{item.clientId,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, 
-        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.firmPerson,jdbcType=VARCHAR}, #{item.firmLogo,jdbcType=LONGVARCHAR}
-        )
+      (#{item.uniqueid,jdbcType=VARCHAR}, #{item.businessLicenseUrl,jdbcType=VARCHAR}, 
+        #{item.orgCodeUrl,jdbcType=VARCHAR}, #{item.firmName,jdbcType=VARCHAR}, #{item.firmAddress,jdbcType=VARCHAR}, 
+        #{item.firmOrgCode,jdbcType=VARCHAR}, #{item.firmBusScope,jdbcType=VARCHAR}, #{item.firmBusTime,jdbcType=TIMESTAMP}, 
+        #{item.agentName,jdbcType=VARCHAR}, #{item.agentIdcard,jdbcType=VARCHAR}, #{item.agentTime,jdbcType=TIMESTAMP}, 
+        #{item.firmPhone,jdbcType=VARCHAR}, #{item.firmEmail,jdbcType=VARCHAR}, #{item.status,jdbcType=VARCHAR}, 
+        #{item.juridicalRealnameCheck,jdbcType=CHAR}, #{item.agentPhone,jdbcType=VARCHAR}, 
+        #{item.channel,jdbcType=VARCHAR}, #{item.agentClientId,jdbcType=VARCHAR}, #{item.agentSaleId,jdbcType=VARCHAR}, 
+        #{item.clientId,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+        #{item.firmPerson,jdbcType=VARCHAR}, #{item.firmLogo,jdbcType=LONGVARCHAR})
     
   
   
@@ -974,63 +712,27 @@
         
           #{item.uniqueid,jdbcType=VARCHAR}
         
-        
-          #{item.openId,jdbcType=VARCHAR}
-        
         
           #{item.businessLicenseUrl,jdbcType=VARCHAR}
         
         
           #{item.orgCodeUrl,jdbcType=VARCHAR}
         
-        
-          #{item.juridicalIdcardFrontUrl,jdbcType=VARCHAR}
-        
-        
-          #{item.juridicalIdcardBackUrl,jdbcType=VARCHAR}
-        
-        
-          #{item.juridicalTmpIdUrl,jdbcType=VARCHAR}
-        
         
           #{item.firmName,jdbcType=VARCHAR}
         
-        
-          #{item.firmBusRegNum,jdbcType=VARCHAR}
-        
-        
-          #{item.firmSocCreCode,jdbcType=VARCHAR}
-        
         
           #{item.firmAddress,jdbcType=VARCHAR}
         
         
           #{item.firmOrgCode,jdbcType=VARCHAR}
         
-        
-          #{item.firmTaxRegCertCode,jdbcType=VARCHAR}
-        
         
           #{item.firmBusScope,jdbcType=VARCHAR}
         
         
           #{item.firmBusTime,jdbcType=TIMESTAMP}
         
-        
-          #{item.juridicalNationality,jdbcType=VARCHAR}
-        
-        
-          #{item.juridicalName,jdbcType=VARCHAR}
-        
-        
-          #{item.juridicalPhone,jdbcType=VARCHAR}
-        
-        
-          #{item.juridicalIdcard,jdbcType=VARCHAR}
-        
-        
-          #{item.juridicalTime,jdbcType=TIMESTAMP}
-        
         
           #{item.agentName,jdbcType=VARCHAR}
         
@@ -1046,11 +748,8 @@
         
           #{item.firmEmail,jdbcType=VARCHAR}
         
-        
-          #{item.realnameCheck,jdbcType=CHAR}
-        
         
-          #{item.firmStatus,jdbcType=VARCHAR}
+          #{item.status,jdbcType=VARCHAR}
         
         
           #{item.juridicalRealnameCheck,jdbcType=CHAR}
diff --git a/customer/src/main/resources/on/base.properties b/customer/src/main/resources/on/base.properties
deleted file mode 100644
index 24a9af7..0000000
--- a/customer/src/main/resources/on/base.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-application.name=ywx-customer
-log.level=INFO
\ No newline at end of file
diff --git a/customer/src/main/resources/on/jdbc.properties b/customer/src/main/resources/on/jdbc.properties
deleted file mode 100644
index 28a6e8a..0000000
--- a/customer/src/main/resources/on/jdbc.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-jdbc.url=jdbc:mysql://rds111phk011w53r18r4.mysql.rds.aliyuncs.com:3306/tms?characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useUnicode=true
-jdbc.username=ywxmr
-jdbc.password=SZEbdcprVvoxjy1B
\ No newline at end of file
diff --git a/customer/src/main/resources/on/redis.properties b/customer/src/main/resources/on/redis.properties
deleted file mode 100644
index 19277fc..0000000
--- a/customer/src/main/resources/on/redis.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-ywq.cache-manager.configs[0].key=mr-admin
-ywq.lock.lockerType=REDIS
-spring.redis.database=5
-spring.redis.host=r-2zetn1j21ge0njlzfn.redis.rds.aliyuncs.com
-spring.redis.port=6379
-spring.redis.password=ywxmr:psVJjvxPM9b0l1pw
-spring.redis.timeout=2000
-spring.redis.pool.laxative=64
-spring.redis.pool.maxillae=64
-spring.redis.pool.maxi=-1
-spring.redis.pool.middle=1
-user.root.name=root
-user.root.passwd=root
\ No newline at end of file
diff --git a/customer/src/main/resources/on/server.properties b/customer/src/main/resources/on/server.properties
deleted file mode 100644
index cff9ad4..0000000
--- a/customer/src/main/resources/on/server.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-application.name==ywx-customer
-server.port=7013
\ No newline at end of file
diff --git a/customer/src/main/resources/spring/dubbo-provider.xml b/customer/src/main/resources/spring/dubbo-provider.xml
index 00f0b66..8f32af1 100644
--- a/customer/src/main/resources/spring/dubbo-provider.xml
+++ b/customer/src/main/resources/spring/dubbo-provider.xml
@@ -7,13 +7,14 @@
        http://code.alibabatech.com/schema/dubbo
        http://code.alibabatech.com/schema/dubbo/dubbo.xsd">
 
-    
     
         
     
+
+    
     
-        
-
+    
     
-
+    
 
diff --git a/customer/src/main/resources/spring/spring-applicationContext.xml b/customer/src/main/resources/spring/spring-applicationContext.xml
index ac21975..f5d4421 100644
--- a/customer/src/main/resources/spring/spring-applicationContext.xml
+++ b/customer/src/main/resources/spring/spring-applicationContext.xml
@@ -10,7 +10,6 @@
 	   default-autowire="byName">
 	
 
-
-
+	
 	
 
\ No newline at end of file
diff --git a/customer/src/main/resources/test/base.properties b/customer/src/main/resources/test/base.properties
deleted file mode 100644
index 6026be3..0000000
--- a/customer/src/main/resources/test/base.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-application.name==ywx-customer
-log.level=INFO
\ No newline at end of file
diff --git a/customer/src/main/resources/test/jdbc.properties b/customer/src/main/resources/test/jdbc.properties
deleted file mode 100644
index 24c2366..0000000
--- a/customer/src/main/resources/test/jdbc.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-jdbc.url=jdbc:mysql://192.168.126.122:3306/tms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=true
-jdbc.username=root
-jdbc.password=tiger
\ No newline at end of file
diff --git a/customer/src/main/resources/test/redis.properties b/customer/src/main/resources/test/redis.properties
deleted file mode 100644
index 953dfb2..0000000
--- a/customer/src/main/resources/test/redis.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-ywq.cache-manager.configs[0].key=mr-admin
-ywq.lock.lockerType=REDIS
-spring.redis.database=5
-spring.redis.host=192.168.126.122
-spring.redis.port=6379
-spring.redis.timeout=2000
-spring.redis.pool.laxative=5
-spring.redis.pool.maxillae=5
-spring.redis.pool.maxi=-1
-spring.redis.pool.middle=1
-user.root.name=root
-user.root.passwd=root
\ No newline at end of file
diff --git a/customer/src/main/resources/test/server.properties b/customer/src/main/resources/test/server.properties
deleted file mode 100644
index cff9ad4..0000000
--- a/customer/src/main/resources/test/server.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-application.name==ywx-customer
-server.port=7013
\ No newline at end of file
diff --git a/customer/src/test/java/com/trust/ywx/customer/FirmServiceTests.java b/customer/src/test/java/com/trust/ywx/customer/FirmServiceTests.java
index c136e3b..761d989 100644
--- a/customer/src/test/java/com/trust/ywx/customer/FirmServiceTests.java
+++ b/customer/src/test/java/com/trust/ywx/customer/FirmServiceTests.java
@@ -1,11 +1,17 @@
 package com.trust.ywx.customer;
 
+import com.alibaba.fastjson.JSONObject;
+import com.fiftyonetrust.common.model.param.PageParam;
 import com.trust.ywx.customer.common.enu.CaChannelEnum;
 import com.trust.ywx.customer.common.enu.CommonStatusEnum;
 import com.trust.ywx.customer.common.enu.ProjectStatusEnum;
 import com.trust.ywx.customer.common.model.manager.request.TrustFirmParam;
 import com.trust.ywx.customer.common.exception.BizException;
+import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
+import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmParam;
+import com.trust.ywx.customer.common.model.PageBean;
 import com.trust.ywx.customer.service.manager.FirmManagerService;
+import com.trust.ywx.customer.service.query.FirmQueryService;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -29,7 +35,9 @@ import javax.annotation.Resource;
 @SpringBootTest(classes = Application.class)
 public class FirmServiceTests {
     @Resource
-    FirmManagerService firmManagerService;
+    FirmManagerService managerService;
+    @Resource
+    FirmQueryService queryService;
 
     @Test
     public void addTest() throws BizException {
@@ -45,12 +53,22 @@ public class FirmServiceTests {
         param.setSmsSend(CommonStatusEnum.YES.getCode());
         param.setSmsCustomize(CommonStatusEnum.YES.getCode());
         param.setSmsCustomizeContent("我的短信我做主");
-        firmManagerService.add(param);
+        managerService.add(param);
         System.out.println("success");
     }
 
     @Test
     public void delTest(){
-        firmManagerService.delete("12345");
+        managerService.delete("12345");
+    }
+
+    @Test
+    public void queryListTest(){
+        SearchTrustFirmParam param = new SearchTrustFirmParam();
+        PageParam pageParam = new PageParam();
+        pageParam.setPageNo(0);
+        pageParam.setPageSize(10);
+        PageBean pageList = queryService.getTrustFirmList(param);
+        System.out.println(JSONObject.toJSONString(pageList));
     }
 }
diff --git a/customer/src/test/java/com/trust/ywx/customer/TempFirmServiceTests.java b/customer/src/test/java/com/trust/ywx/customer/TempFirmServiceTests.java
new file mode 100644
index 0000000..fe374ab
--- /dev/null
+++ b/customer/src/test/java/com/trust/ywx/customer/TempFirmServiceTests.java
@@ -0,0 +1,98 @@
+package com.trust.ywx.customer;
+
+import com.trust.ywx.customer.common.exception.BizException;
+import com.trust.ywx.customer.common.model.manager.request.TempFirmParam;
+import com.trust.ywx.customer.common.model.manager.response.TempFirmDto;
+import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
+import com.trust.ywx.customer.common.model.PageBean;
+import com.trust.ywx.customer.service.manager.TempFirmManagerService;
+import com.trust.ywx.customer.service.query.FirmQueryService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+
+/**
+ * 

+ *
+ * @文件名称： FirmServiceTests.java
+ * @包 路  径： com.trust.ywx.customer
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/20 17:19
+ * @Modify：
+ */
+
+@Slf4j
+@SpringBootTest(classes = Application.class)
+public class TempFirmServiceTests {
+    @Resource
+    TempFirmManagerService managerService;
+    @Resource
+    FirmQueryService queryService;
+
+    @Test
+    public void addTest() throws BizException {
+        TempFirmParam param = new TempFirmParam();
+        param.setAgentClientId("agentId");
+        param.setFirmOrgCode("orgCode");
+        param.setFirmName("莆田医院2");
+        param.setAppIcon("http://url.com");
+        param.setFirmPerson("firmPerson");
+        param.setFirmEmail("firmEmail");
+        param.setFirmPhone("firmPhone");
+        param.setAgentSaleId("saleId");
+        param.setChannelApp(true);
+        param.setChannelSdk(true);
+        String clientId = managerService.add(param);
+        System.out.println(clientId);
+    }
+
+
+
+    @Test
+    public void updateTest() throws BizException {
+        TempFirmParam param = new TempFirmParam();
+        param.setClientId("2022062117474932");
+        param.setFirmOrgCode("orgCode");
+        param.setFirmName("莆田医院2");
+        param.setAppIcon("http://url.com");
+        param.setFirmPerson("firmPerson");
+        param.setFirmEmail("firmEmail");
+        param.setFirmPhone("韩振超");
+        param.setAgentSaleId("saleId");
+        param.setChannelApp(true);
+        param.setChannelSdk(true);
+        System.out.println(managerService.update(param));
+    }
+
+    @Test
+    public void auditTest() throws BizException {
+        System.out.println(managerService.audit("2022062117474932"));
+    }
+
+    @Test
+    public void rejectTest() throws BizException {
+        System.out.println(managerService.reject("2022062117474932"));
+    }
+
+    @Test
+    public void delTest(){
+        System.out.println(managerService.delete("2022062117474932"));
+    }
+
+    @Test
+    public void listTest(){
+        SearchFirmParam param = new SearchFirmParam();
+        PageBean result = queryService.getTempFirmList(param);
+        System.out.println(result);
+    }
+    @Test
+    public void getTest(){
+        TempFirmDto result = queryService.getTempFirmByClientId("2022062117474932");
+        System.out.println(result);
+    }
+}
diff --git a/facade/pom.xml b/facade/pom.xml
index 0381b64..7bde8cc 100644
--- a/facade/pom.xml
+++ b/facade/pom.xml
@@ -28,6 +28,10 @@
             com.51trust.rd
             common-model
         
+        
+            com.51trust.ywx
+            ywx-customer-common
+        
 
         
             org.apache.dubbo
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/manager/FirmManagerService.java b/facade/src/main/java/com/trust/ywx/customer/service/manager/FirmManagerService.java
new file mode 100644
index 0000000..4ae6137
--- /dev/null
+++ b/facade/src/main/java/com/trust/ywx/customer/service/manager/FirmManagerService.java
@@ -0,0 +1,56 @@
+package com.trust.ywx.customer.service.manager;
+
+import com.trust.ywx.customer.common.exception.BizException;
+import com.trust.ywx.customer.common.model.manager.request.TrustFirmParam;
+import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
+
+/**
+ * 

+ *
+ * @文件名称： FirmManagerService.java
+ * @包 路  径： com.trust.ywx.customer.service.manager
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/15 18:55
+ * @Modify：
+ */
+public interface FirmManagerService {
+    /**
+     * 初始化客户
+     * 返回clientId和appSecret
+     * @param clientId
+     * @return
+     */
+    TrustFirmDto init(String clientId);
+
+    /**
+     * 添加可信客户
+     */
+    boolean add(TrustFirmParam param) throws BizException;
+
+    /**
+     * 更新可信客户
+     */
+    boolean update(TrustFirmParam param) throws BizException;
+
+    /**
+     * 删除可信客户
+     *
+     * @param clientId
+     * @return
+     */
+    boolean delete(String clientId);
+
+
+    /**
+     * 添加CA渠道客户
+     */
+    boolean addCaChannelFirm();
+
+    /**
+     * 添加客户白名单
+     */
+    boolean addFirmWhite();
+}
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java b/facade/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java
new file mode 100644
index 0000000..d0e72c4
--- /dev/null
+++ b/facade/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java
@@ -0,0 +1,56 @@
+package com.trust.ywx.customer.service.manager;
+
+import com.trust.ywx.customer.common.exception.BizException;
+import com.trust.ywx.customer.common.model.manager.request.TempFirmParam;
+
+/**
+ * 

+ *
+ * @文件名称： FirmManagerService.java
+ * @包 路  径： com.trust.ywx.customer.service.manager
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/15 18:55
+ * @Modify：
+ */
+public interface TempFirmManagerService {
+
+    /**
+     * 添加临时客户
+     * 互联网医院通过开放平台自注册临时客户，会在firm_info_temp表生成client_id
+     * 返回clientId
+     *
+     */
+    String add(TempFirmParam param) throws BizException;
+
+    /**
+     * 更新临时客户
+     * @param param
+     * @return
+     * @throws BizException
+     */
+    boolean update(TempFirmParam param) throws BizException;
+
+    /**
+     * 审核临时客户
+     * @param clientId
+     * @return
+     */
+    boolean audit(String clientId) throws BizException;
+
+    /**
+     * 拒绝临时客户
+     * @param clientId
+     * @return
+     */
+    boolean reject(String clientId) throws BizException;
+
+    /**
+     * 删除临时客户
+     * @param clientId
+     * @return
+     */
+    boolean delete(String clientId);
+}
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java b/facade/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java
new file mode 100644
index 0000000..6b66fcc
--- /dev/null
+++ b/facade/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java
@@ -0,0 +1,84 @@
+package com.trust.ywx.customer.service.query;
+
+import com.trust.ywx.customer.common.model.PageBean;
+import com.trust.ywx.customer.common.model.manager.response.TempFirmDto;
+import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
+import com.trust.ywx.customer.common.model.query.request.SearchCrmFirmParam;
+import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
+import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmParam;
+import com.trust.ywx.customer.common.model.query.response.CrmFirmDto;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 

+ *
+ * @文件名称： FirmQueryService.java
+ * @包 路  径： com.trust.ywx.customer.service.query
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/14 19:34
+ * @Modify：
+ */
+public interface FirmQueryService {
+
+    //-------------------------可信客户--------------------
+
+    /**
+     * 获取可信客户列表 （分页）
+     * @param param
+     * @return
+     */
+    PageBean getTrustFirmList(SearchTrustFirmParam param);
+
+    /**
+     * 获取可信客户详情 （不包括证书和厂商图标信息）
+     * @param clientId
+     * @return
+     */
+    TrustFirmDto getTrustFirm(String clientId);
+
+    TrustFirmDto getTrustFirmWithBLOBs(String clientId);
+
+    /**
+     * 获取客户配置属性集合
+     * 主要给customer-client内部使用！
+     */
+    Map getAllProp(String clientId);
+
+    /**
+     * 查询客户白名单
+     * @param firmName
+     * @return
+     */
+    List getFirmWhite(String firmName);
+
+    //------------------------临时客户--------------------
+    /**
+     * 获取待审核客户列表
+     * @param param
+     * @return
+     */
+    PageBean getTempFirmList(SearchFirmParam param);
+    /**
+     * 获取待审核客户详情
+     * @param clientId
+     * @return
+     */
+    TempFirmDto getTempFirmByClientId(String clientId);
+
+
+    //-------------------------北京CA客户------------------------
+    /**
+     * 获取CRM<北京CA,...>客户列表
+     * @param param
+     */
+    List getCrmFirmList(SearchCrmFirmParam param);
+
+
+
+
+}
diff --git a/pom.xml b/pom.xml
index c504eda..b999c15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,39 @@
                 common-util
                 1.0.0
             
+            
+                com.51trust.rd
+                common-redis
+                1.0.0
+            
+
+            
+                com.51trust.ywx
+                ywx-customer-common
+                0.0.1-SNAPSHOT
+            
+
+            
+                commons-dbcp
+                commons-dbcp
+                1.4
+            
+
+
+
+
+
+
+            
+                com.dianping.cat
+                cat-client
+                3.0.0
+            
+            
+                com.github.pagehelper
+                pagehelper
+                4.1.0
+            
             
             
                 org.hibernate.validator
@@ -117,21 +150,11 @@
                 dubbo
                 ${dubbo.version}
             
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+            
+                com.alibaba
+                fastjson
+                1.2.83
+