diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CreateAgencyFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CreateAgencyFormDTO.java
index dec52622c8..4ab159bb59 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CreateAgencyFormDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CreateAgencyFormDTO.java
@@ -37,17 +37,17 @@ public class CreateAgencyFormDTO implements Serializable {
     /**
      * 省（中国字）
      */
-    private String province;
+    private String province = "";
 
     /**
      * 市（中国字）
      */
-    private String city;
+    private String city = "";
 
     /**
      * 区（中国字）
      */
-    private String district;
+    private String district = "";
 
     /**
      * 党支部数量
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AgencyLevelListResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AgencyLevelListResultDTO.java
new file mode 100644
index 0000000000..6f879233f3
--- /dev/null
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AgencyLevelListResultDTO.java
@@ -0,0 +1,25 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author sun
+ * @Description 公众号-查询组织级别-接口返参
+ */
+@Data
+public class AgencyLevelListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3253989119352850315L;
+
+    /**
+     * 机关级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province）
+     */
+    private String levelKey;
+    /**
+     * 级别对应的名称
+     */
+    private String levelName;
+
+}
diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateAgencyResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateAgencyResultDTO.java
index f344e5c062..285b662e40 100644
--- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateAgencyResultDTO.java
+++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CreateAgencyResultDTO.java
@@ -19,5 +19,9 @@ public class CreateAgencyResultDTO implements Serializable {
      * 新增客户Id
      */
     private String customerId;
+    /**
+     * 包含customerId的token
+     */
+    private String token;
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java
index ee15ddf636..80ed388deb 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/PaConstant.java
@@ -10,10 +10,28 @@ public interface PaConstant {
      * 手机号注册
      */
     String PHONE_EXCEPTION = "手机号已存在，不允许再次注册";
+
     /**
      * 根据userId查询pa_user_wechat表失败
      */
     String SELECT_WECHAT_EXCEPTION = "获取用户微信信息失败";
 
+    /**
+     * 组织级别对应的key、name
+     */
+    String PROVINCE_KEY = "province";
+    String PROVINCE_NAME = "省级";
+    String CITY_KEY = "city";
+    String CITY_NAME = "区县级";
+    String STREET_KEY = "street";
+    String STREET_NAME = "乡（镇、街道）级";
+    String COMMUNITY_KEY = "community";
+    String COMMUNITY_NAME = "社区级";
+
+    /**
+     * 客户小程序关系表小程序所属端
+     */
+    String RESI_CLIENT = "resi";
+    String WORK_CLIENT = "work";
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
index 5f8f9f5660..4f0443c376 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java
@@ -7,6 +7,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.form.CreateAgencyFormDTO;
 import com.epmet.dto.form.RegisterFormDTO;
+import com.epmet.dto.result.AgencyLevelListResultDTO;
 import com.epmet.dto.result.CreateAgencyResultDTO;
 import com.epmet.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 公众号用户的注册、客户创建、跟组织创建 ，查询我的详情等等...api写在这
  *
@@ -50,6 +53,16 @@ public class PaCustomerController {
         return new Result();
     }
 
+    /**
+     * @return
+     * @Author sun
+     * @Description 公众号-查询组织级别
+     **/
+    @PostMapping("agencylevellist")
+    public Result<List<AgencyLevelListResultDTO>> agencyLevelList() {
+        return new Result<List<AgencyLevelListResultDTO>>().ok(paCustomerService.agencyLevelList());
+    }
+
     /**
      * @param formDTO
      * @return
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
index 9bb1547dcf..08d5c88373 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java
@@ -23,6 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.form.CreateAgencyFormDTO;
 import com.epmet.dto.form.RegisterFormDTO;
+import com.epmet.dto.result.AgencyLevelListResultDTO;
 import com.epmet.dto.result.CreateAgencyResultDTO;
 import com.epmet.entity.PaCustomerEntity;
 
@@ -121,4 +122,10 @@ public interface PaCustomerService extends BaseService<PaCustomerEntity> {
      **/
     CreateAgencyResultDTO myInfo(CreateAgencyFormDTO formDTO);
 
+    /**
+     * @return
+     * @Author sun
+     * @Description 公众号-查询组织级别
+     **/
+    List<AgencyLevelListResultDTO> agencyLevelList();
 }
\ No newline at end of file
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
index 7c51bfadc2..766973bc4a 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java
@@ -30,6 +30,7 @@ import com.epmet.commons.tools.redis.RedisKeys;
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.CpUserDetailRedis;
 import com.epmet.constant.PaConstant;
 import com.epmet.dao.PaCustomerDao;
 import com.epmet.dao.PaUserDao;
@@ -40,13 +41,14 @@ import com.epmet.dto.PaUserDTO;
 import com.epmet.dto.PaUserWechatDTO;
 import com.epmet.dto.form.CreateAgencyFormDTO;
 import com.epmet.dto.form.RegisterFormDTO;
+import com.epmet.dto.result.AgencyLevelListResultDTO;
 import com.epmet.dto.result.CreateAgencyResultDTO;
-import com.epmet.entity.PaCustomerEntity;
-import com.epmet.entity.PaUserEntity;
-import com.epmet.entity.PaUserVisitedEntity;
-import com.epmet.entity.PaUserWechatEntity;
+import com.epmet.entity.*;
 import com.epmet.redis.PaCustomerRedis;
+import com.epmet.service.CustomerMpService;
+import com.epmet.service.PaCustomerAgencyService;
 import com.epmet.service.PaCustomerService;
+import com.epmet.service.PaCustomerUserAgencyService;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -54,6 +56,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -78,6 +81,14 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
     private PaUserVisitedDao paUserVisitedDao;
     @Autowired
     private RedisUtils redisUtils;
+    @Autowired
+    private PaCustomerAgencyService paCustomerAgencyService;
+    @Autowired
+    private PaCustomerUserAgencyService paCustomerUserAgencyService;
+    @Autowired
+    private CustomerMpService customerMpService;
+    @Autowired
+    private CpUserDetailRedis cpUserDetailRedis;
 
     @Override
     public PageData<PaCustomerDTO> page(Map<String, Object> params) {
@@ -95,8 +106,8 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         return ConvertUtils.sourceToTarget(entityList, PaCustomerDTO.class);
     }
 
-    private QueryWrapper<PaCustomerEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<PaCustomerEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<PaCustomerEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -177,6 +188,33 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
         paUserVisitedDao.insert(visitedEntity);
     }
 
+    /**
+     * @return
+     * @Author sun
+     * @Description 公众号-查询组织级别
+     **/
+    @Override
+    public List<AgencyLevelListResultDTO> agencyLevelList() {
+        List<AgencyLevelListResultDTO> list = new ArrayList<>();
+        AgencyLevelListResultDTO dto1 = new AgencyLevelListResultDTO();
+        dto1.setLevelKey(PaConstant.PROVINCE_KEY);
+        dto1.setLevelName(PaConstant.PROVINCE_NAME);
+        list.add(dto1);
+        AgencyLevelListResultDTO dto2 = new AgencyLevelListResultDTO();
+        dto2.setLevelKey(PaConstant.CITY_KEY);
+        dto2.setLevelName(PaConstant.CITY_NAME);
+        list.add(dto2);
+        AgencyLevelListResultDTO dto3 = new AgencyLevelListResultDTO();
+        dto3.setLevelKey(PaConstant.STREET_KEY);
+        dto3.setLevelName(PaConstant.STREET_NAME);
+        list.add(dto3);
+        AgencyLevelListResultDTO dto4 = new AgencyLevelListResultDTO();
+        dto4.setLevelKey(PaConstant.COMMUNITY_KEY);
+        dto4.setLevelName(PaConstant.COMMUNITY_NAME);
+        list.add(dto4);
+        return list;
+    }
+
     /**
      * @param formDTO
      * @return
@@ -184,15 +222,64 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
      * @Description 公众号-创建组织
      **/
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public CreateAgencyResultDTO createAgency(TokenDto tokenDTO, CreateAgencyFormDTO formDTO) {
         //1.客户表初始化数据
+        PaCustomerEntity entity = new PaCustomerEntity();
+        entity.setCustomerName(formDTO.getAgencyName());
+        baseDao.insert(entity);
+
         //2.客户组织表初始化数据
-        //3.
-        //4.
-        //5.
+        PaCustomerAgencyEntity agencyEntity = new PaCustomerAgencyEntity();
+        agencyEntity.setCustomerId(entity.getId());
+        agencyEntity.setAgencyName(formDTO.getAgencyName());
+        agencyEntity.setLevel(formDTO.getLevel());
+        agencyEntity.setAreaCode(formDTO.getAreaCode());
+        agencyEntity.setProvince(formDTO.getProvince());
+        agencyEntity.setCity(formDTO.getCity());
+        agencyEntity.setDistrict(formDTO.getDistrict());
+        agencyEntity.setPartybranchnum(formDTO.getPartyBranchNum());
+        paCustomerAgencyService.insert(agencyEntity);
 
+        //3.客户组织用户关系表初始化数据
+        PaCustomerUserAgencyEntity cuaEntity = new PaCustomerUserAgencyEntity();
+        cuaEntity.setCustomerId(entity.getId());
+        cuaEntity.setAgencyId(agencyEntity.getId());
+        cuaEntity.setUserId(tokenDTO.getUserId());
+        paCustomerUserAgencyService.insert(cuaEntity);
 
-        return null;
+        //4.客户小程序关系表初始化数据
+        List<CustomerMpEntity> listEntity = new ArrayList<>();
+        CustomerMpEntity mpEntity1 = new CustomerMpEntity();
+        mpEntity1.setCustomerId(entity.getId());
+        mpEntity1.setAuthorizationFlag(NumConstant.ZERO);
+        mpEntity1.setClient(PaConstant.RESI_CLIENT);
+        listEntity.add(mpEntity1);
+        CustomerMpEntity mpEntity2 = ConvertUtils.sourceToTarget(mpEntity1, CustomerMpEntity.class);
+        mpEntity2.setClient(PaConstant.WORK_CLIENT);
+        listEntity.add(mpEntity2);
+        customerMpService.insertBatch(listEntity);
+
+        //5.token中添加customerId
+        //5-1.获取redis中的token
+        //获取缓存中的token
+        TokenDto redisTokenDTO = cpUserDetailRedis.get(LoginConstant.APP_PUBLIC, LoginConstant.CLIENT_MP, tokenDTO.getUserId(), TokenDto.class);
+        if (redisTokenDTO == null) {
+            return null;
+        }
+        //5-2.添加customerId
+        redisTokenDTO.setCustomerId(entity.getId());
+        //获取key的剩余过期时间
+        String key = RedisKeys.getCpUserKey(LoginConstant.APP_PUBLIC, LoginConstant.CLIENT_MP, tokenDTO.getUserId());
+        long expire = redisUtils.getExpire(key);
+        cpUserDetailRedis.set(redisTokenDTO, expire);
+
+        //6.接口返参
+        CreateAgencyResultDTO resultDTO = new CreateAgencyResultDTO();
+        resultDTO.setCustomerId(entity.getId());
+        resultDTO.setToken(redisTokenDTO.getToken());
+
+        return resultDTO;
     }
 
     /**
@@ -207,5 +294,4 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
     }
 
 
-
 }
\ No newline at end of file