Merge remote-tracking branch 'origin/test' into dev

yd-insurance-base-api/Dockerfile

+# 基础镜像
+FROM openjdk:8
+# 维护人
+LABEL maintainer="zxm<2060197959@qq.com>"
+# 创建目录
+RUN mkdir -p /home/app
+# 拷贝项目jar - 使用可执行的 fat JAR
+COPY target/yd-insurance-base-api-1.0-SNAPSHOT-exec.jar /home/app/yd-insurance-base-api.jar
+# 执行命令启动jar
+ENTRYPOINT ["java", "-Xmx256m", "-Xms128m", "-jar", "/home/app/yd-insurance-base-api.jar"]
+# 暴露端口
+EXPOSE 9201

yd-insurance-base-api/pom.xml

@@ -78,4 +78,25 @@
         </dependency>
 
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${springboot.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <classifier>exec</classifier>
+                            <mainClass>com.yd.insurance.base.api.BaseApiApplication</mainClass>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiInsuranceAdditionalProductController.java

@@ -43,6 +43,7 @@ public class ApiInsuranceAdditionalProductController implements ApiInsuranceAddi
     }
 
     /**
+     *
      * 获取保险附加产品详情
      * @param additionalProductBizId 保险附加产品唯一标识(业务ID)
      * @return

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiInsuranceCategoryController.java

+package com.yd.insurance.base.api.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.api.service.ApiInsuranceCategoryService;
+import com.yd.insurance.base.feign.client.insurancecategory.ApiInsuranceCategoryFeignClient;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryAddRequest;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryPageRequest;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryDetailResponse;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryEditRequest;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 保险险种信息
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+@RestController
+@RequestMapping("/insuranceCategory")
+@Validated
+public class ApiInsuranceCategoryController implements ApiInsuranceCategoryFeignClient {
+
+    @Autowired
+    private ApiInsuranceCategoryService apiInsuranceCategoryService;
+
+    /**
+     * 分页列表查询-保险险种信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiInsuranceCategoryPageResponse>> page(ApiInsuranceCategoryPageRequest request) {
+        return apiInsuranceCategoryService.page(request);
+    }
+
+    /**
+     * 详情-保险险种信息
+     * @param insuranceCategoryBizId 保险险种表唯一业务ID
+     * @return
+     */
+    @Override
+    public Result<ApiInsuranceCategoryDetailResponse> detail(String insuranceCategoryBizId) {
+        return apiInsuranceCategoryService.detail(insuranceCategoryBizId);
+    }
+
+    /**
+     * 添加-保险险种信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiInsuranceCategoryAddRequest request) {
+        return apiInsuranceCategoryService.add(request);
+    }
+
+    /**
+     * 编辑-保险险种信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiInsuranceCategoryEditRequest request) {
+        return apiInsuranceCategoryService.edit(request);
+    }
+
+    /**
+     * 删除-保险险种信息
+     * @param insuranceCategoryBizId 保险险种表唯一业务ID
+     * @return
+     */
+    @Override
+    public Result del(String insuranceCategoryBizId) {
+        return apiInsuranceCategoryService.del(insuranceCategoryBizId);
+    }
+
+    /**
+     * 编辑-保险险种信息状态
+     * @param insuranceCategoryBizId 保险险种表唯一业务ID
+     * @param status 状态(0:停用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String insuranceCategoryBizId, String status) {
+        return apiInsuranceCategoryService.editStatus(insuranceCategoryBizId,status);
+    }
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiInsuranceCompanyController.java

+package com.yd.insurance.base.api.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.api.service.ApiInsuranceCompanyService;
+import com.yd.insurance.base.feign.client.insurancecompany.ApiInsuranceCompanyFeignClient;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancecompany.ApiInsuranceCompanyDetailResponse;
+import com.yd.insurance.base.feign.response.insurancecompany.ApiInsuranceCompanyPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 保险公司信息
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+@RestController
+@RequestMapping("/insuranceCompany")
+@Validated
+public class ApiInsuranceCompanyController implements ApiInsuranceCompanyFeignClient {
+
+    @Autowired
+    private ApiInsuranceCompanyService apiInsuranceCompanyService;
+
+    /**
+     * 分页列表查询-保险公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiInsuranceCompanyPageResponse>> page(ApiInsuranceCompanyPageRequest request) {
+        return apiInsuranceCompanyService.page(request);
+    }
+
+    /**
+     * 详情-保险公司信息
+     * @param insuranceCompanyBizId 保险公司唯一业务ID
+     * @return
+     */
+    @Override
+    public Result<ApiInsuranceCompanyDetailResponse> detail(String insuranceCompanyBizId) {
+        return apiInsuranceCompanyService.detail(insuranceCompanyBizId);
+    }
+
+    /**
+     * 添加-保险公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiInsuranceCompanyAddRequest request) {
+        return apiInsuranceCompanyService.add(request);
+    }
+
+    /**
+     * 编辑-保险公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiInsuranceCompanyEditRequest request) {
+        return apiInsuranceCompanyService.edit(request);
+    }
+
+    /**
+     * 删除-保险公司信息 TODO
+     * @param insuranceCompanyBizId 保险公司唯一业务ID
+     * @return
+     */
+    @Override
+    public Result del(String insuranceCompanyBizId) {
+        return apiInsuranceCompanyService.del(insuranceCompanyBizId);
+    }
+
+    /**
+     * 编辑-保险公司信息合作状态
+     * @param insuranceCompanyBizId 保险公司唯一业务ID
+     * @param cooperationStatus 合作状态（合作中、已终止、未合作）
+     * @return
+     */
+    @Override
+    public Result editStatus(String insuranceCompanyBizId, String cooperationStatus) {
+        return apiInsuranceCompanyService.editStatus(insuranceCompanyBizId,cooperationStatus);
+    }
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiInsuranceProductController.java

@@ -14,9 +14,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
 /**
  * 保险产品基础信息
  *

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiInsuranceReconciliationCompanyController.java

+package com.yd.insurance.base.api.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.api.service.ApiInsuranceReconciliationCompanyService;
+import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyDetailResponse;
+import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 保险对账公司信息
+ *
+ * @author zxm
+ * @since 2025-12-23
+ */
+@RestController
+@RequestMapping("/insuranceReconciliationCompany")
+@Validated
+public class ApiInsuranceReconciliationCompanyController implements ApiInsuranceReconciliationCompanyFeignClient {
+
+    @Autowired
+    private ApiInsuranceReconciliationCompanyService apiInsuranceReconciliationCompanyService;
+
+    /**
+     * 分页列表查询-保险对账公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiInsuranceReconciliationCompanyPageResponse>> page(ApiInsuranceReconciliationCompanyPageRequest request) {
+        return apiInsuranceReconciliationCompanyService.page(request);
+    }
+
+    /**
+     * 详情-保险对账公司信息
+     * @param reconciliationCompanyBizId 保险对账公司唯一业务ID
+     * @return
+     */
+    @Override
+    public Result<ApiInsuranceReconciliationCompanyDetailResponse> detail(String reconciliationCompanyBizId) {
+        return apiInsuranceReconciliationCompanyService.detail(reconciliationCompanyBizId);
+    }
+
+    /**
+     * 添加-保险对账公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiInsuranceReconciliationCompanyAddRequest request) {
+        return apiInsuranceReconciliationCompanyService.add(request);
+    }
+
+    /**
+     * 编辑-保险对账公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiInsuranceReconciliationCompanyEditRequest request) {
+        return apiInsuranceReconciliationCompanyService.edit(request);
+    }
+
+    /**
+     * 删除-保险对账公司信息
+     * @param reconciliationCompanyBizId 保险对账公司唯一业务ID
+     * @return
+     */
+    @Override
+    public Result del(String reconciliationCompanyBizId) {
+        return apiInsuranceReconciliationCompanyService.del(reconciliationCompanyBizId);
+    }
+
+    /**
+     * 编辑-保险对账公司信息状态
+     * @param reconciliationCompanyBizId 保险对账公司唯一业务ID
+     * @param status 状态(0:停用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String reconciliationCompanyBizId, String status) {
+        return apiInsuranceReconciliationCompanyService.editStatus(reconciliationCompanyBizId,status);
+    }
+
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiRelProductAnnouncementController.java

+package com.yd.insurance.base.api.controller;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.api.service.ApiRelProductAnnouncementService;
+import com.yd.insurance.base.feign.client.ApiRelProductAnnouncementFeignClient;
+import com.yd.insurance.base.feign.request.ApiQueryRatioRequest;
+import com.yd.insurance.base.feign.response.ApiQueryRatioResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 产品和公告比例关系信息
+ *
+ * @author zxm
+ * @since 2025-10-28
+ */
+@RestController
+@RequestMapping("/relProductAnnouncement")
+@Validated
+public class ApiRelProductAnnouncementController implements ApiRelProductAnnouncementFeignClient {
+
+    @Autowired
+    private ApiRelProductAnnouncementService apiRelProductAnnouncementService;
+
+    /**
+     * 查询-产品公告比例
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<ApiQueryRatioResponse> queryRatio(ApiQueryRatioRequest request) {
+        return apiRelProductAnnouncementService.queryRatio(request);
+    }
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiUserSaleExpandController.java

+package com.yd.insurance.base.api.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.api.service.ApiUserSaleExpandService;
+import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 保险-转介人（销售员）信息
+ *
+ * @author zxm
+ * @since 2025-12-19
+ */
+@RestController
+@RequestMapping("/userSaleExpand")
+@Validated
+public class ApiUserSaleExpandController implements ApiUserSaleExpandFeignClient {
+
+    @Autowired
+    private ApiUserSaleExpandService apiUserSaleExpandService;
+
+    /**
+     * 销售员（转介人）分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiUserSaleExpandPageResponse>> page(ApiUserSaleExpandPageRequest request) {
+        return apiUserSaleExpandService.page(request);
+    }
+
+    /**
+     * 获取销售员（转介人）详情
+     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId) {
+        return apiUserSaleExpandService.detail(userSaleBizId);
+    }
+
+    /**
+     * 添加销售员（转介人）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiUserSaleExpandAddRequest request) {
+        return apiUserSaleExpandService.add(request);
+    }
+
+    /**
+     * 编辑销售员（转介人）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiUserSaleExpandEditRequest request) {
+        return apiUserSaleExpandService.edit(request);
+    }
+
+    /**
+     * 删除销售员（转介人）（逻辑删除） TODO
+     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result del(String userSaleBizId) {
+        return apiUserSaleExpandService.del(userSaleBizId);
+    }
+
+    /**
+     * 编辑销售员（转介人）状态
+     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @param status 状态(0:禁用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String userSaleBizId, Integer status) {
+        return apiUserSaleExpandService.editStatus(userSaleBizId,status);
+    }
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/ApiUserSignExpandController.java

+package com.yd.insurance.base.api.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.api.service.ApiUserSignExpandService;
+import com.yd.insurance.base.feign.client.usersignexpand.ApiUserSignExpandFeignClient;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
+import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 保险-签单员信息
+ *
+ * @author zxm
+ * @since 2025-12-19
+ */
+@RestController
+@RequestMapping("/userSignExpand")
+@Validated
+public class ApiUserSignExpandController implements ApiUserSignExpandFeignClient {
+
+    @Autowired
+    private ApiUserSignExpandService apiUserSignExpandService;
+
+    /**
+     * 签单员分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiUserSignExpandPageResponse>> page(ApiUserSignExpandPageRequest request) {
+        return apiUserSignExpandService.page(request);
+    }
+
+    /**
+     * 获取签单员详情
+     * @param userSignBizId 签单员唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result<ApiUserSignExpandDetailResponse> detail(String userSignBizId) {
+        return apiUserSignExpandService.detail(userSignBizId);
+    }
+
+    /**
+     * 添加签单员
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiUserSignExpandAddRequest request) {
+        return apiUserSignExpandService.add(request);
+    }
+
+    /**
+     * 编辑签单员
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiUserSignExpandEditRequest request) {
+        return apiUserSignExpandService.edit(request);
+    }
+
+    /**
+     * 删除签单员（逻辑删除） TODO
+     * @param userSignBizId 签单员唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result del(String userSignBizId) {
+        return apiUserSignExpandService.del(userSignBizId);
+    }
+
+    /**
+     * 编辑签单员状态
+     * @param userSignBizId 签单员唯一标识(业务ID)
+     * @param status 状态(0:禁用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String userSignBizId, Integer status) {
+        return apiUserSignExpandService.editStatus(userSignBizId,status);
+    }
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/InsuranceCompanyExpandController.java → yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/InsuranceCompanyClaimController.java

@@ -5,14 +5,14 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 组织架构-保险公司扩展表 前端控制器
+ * 保险公司理赔支持表 前端控制器
  * </p>
  *
  * @author zxm
- * @since 2025-08-25
+ * @since 2025-12-22
  */
 @RestController
-@RequestMapping("/insuranceCompanyExpand")
-public class InsuranceCompanyExpandController {
+@RequestMapping("/insuranceCompanyClaim")
+public class InsuranceCompanyClaimController {
 
 }

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/UserSaleExpandController.java → yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/InsuranceCompanyContactController.java

@@ -5,14 +5,14 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 系统用户-销售用户扩展表 前端控制器
+ * 保险公司联系信息表 前端控制器
  * </p>
  *
  * @author zxm
- * @since 2025-08-25
+ * @since 2025-12-22
  */
 @RestController
-@RequestMapping("/userSaleExpand")
-public class UserSaleExpandController {
+@RequestMapping("/insuranceCompanyContact")
+public class InsuranceCompanyContactController {
 
 }

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/UserSignExpandController.java → yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/InsuranceCompanyMaterialController.java

@@ -5,14 +5,14 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 系统用户-签单用户扩展表 前端控制器
+ * 保险公司文档资料表 前端控制器
  * </p>
  *
  * @author zxm
- * @since 2025-08-25
+ * @since 2025-12-22
  */
 @RestController
-@RequestMapping("/userSignExpand")
-public class UserSignExpandController {
+@RequestMapping("/insuranceCompanyMaterial")
+public class InsuranceCompanyMaterialController {
 
 }

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/InsuranceCompanyPaymentController.java

+package com.yd.insurance.base.api.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 保险公司缴费信息表 前端控制器
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+@RestController
+@RequestMapping("/insuranceCompanyPayment")
+public class InsuranceCompanyPaymentController {
+
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/controller/InsuranceCompanyWebsiteController.java

+package com.yd.insurance.base.api.controller;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 保险公司网站表 前端控制器
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+@RestController
+@RequestMapping("/insuranceCompanyWebsite")
+public class InsuranceCompanyWebsiteController {
+
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiInsuranceCategoryService.java

+package com.yd.insurance.base.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryAddRequest;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryPageRequest;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryDetailResponse;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryEditRequest;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryPageResponse;
+
+public interface ApiInsuranceCategoryService {
+    Result<IPage<ApiInsuranceCategoryPageResponse>> page(ApiInsuranceCategoryPageRequest request);
+
+    Result<ApiInsuranceCategoryDetailResponse> detail(String insuranceCategoryBizId);
+
+    Result add(ApiInsuranceCategoryAddRequest request);
+
+    Result edit(ApiInsuranceCategoryEditRequest request);
+
+    Result del(String insuranceCategoryBizId);
+
+    Result editStatus(String insuranceCategoryBizId, String status);
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiInsuranceCompanyService.java

+package com.yd.insurance.base.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancecompany.ApiInsuranceCompanyDetailResponse;
+import com.yd.insurance.base.feign.response.insurancecompany.ApiInsuranceCompanyPageResponse;
+
+public interface ApiInsuranceCompanyService {
+    Result<IPage<ApiInsuranceCompanyPageResponse>> page(ApiInsuranceCompanyPageRequest request);
+
+    Result<ApiInsuranceCompanyDetailResponse> detail(String insuranceCompanyBizId);
+
+    Result add(ApiInsuranceCompanyAddRequest request);
+
+    Result edit(ApiInsuranceCompanyEditRequest request);
+
+    Result del(String insuranceCompanyBizId);
+
+    Result editStatus(String insuranceCompanyBizId, String cooperationStatus);
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiInsuranceReconciliationCompanyService.java

+package com.yd.insurance.base.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyDetailResponse;
+import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageResponse;
+
+public interface ApiInsuranceReconciliationCompanyService {
+    Result<IPage<ApiInsuranceReconciliationCompanyPageResponse>> page(ApiInsuranceReconciliationCompanyPageRequest request);
+
+    Result<ApiInsuranceReconciliationCompanyDetailResponse> detail(String reconciliationCompanyBizId);
+
+    Result add(ApiInsuranceReconciliationCompanyAddRequest request);
+
+    Result edit(ApiInsuranceReconciliationCompanyEditRequest request);
+
+    Result del(String reconciliationCompanyBizId);
+
+    Result editStatus(String reconciliationCompanyBizId, String status);
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiRelProductAnnouncementService.java

+package com.yd.insurance.base.api.service;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.request.ApiQueryRatioRequest;
+import com.yd.insurance.base.feign.response.ApiQueryRatioResponse;
+
+public interface ApiRelProductAnnouncementService {
+    Result<ApiQueryRatioResponse> queryRatio(ApiQueryRatioRequest request);
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiUserSaleExpandService.java

+package com.yd.insurance.base.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
+
+public interface ApiUserSaleExpandService {
+    Result<IPage<ApiUserSaleExpandPageResponse>> page(ApiUserSaleExpandPageRequest request);
+
+    Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId);
+
+    Result add(ApiUserSaleExpandAddRequest request);
+
+    Result edit(ApiUserSaleExpandEditRequest request);
+
+    Result del(String userSaleBizId);
+
+    Result editStatus(String userSaleBizId, Integer status);
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/ApiUserSignExpandService.java

+package com.yd.insurance.base.api.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
+import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse;
+
+public interface ApiUserSignExpandService {
+    Result<IPage<ApiUserSignExpandPageResponse>> page(ApiUserSignExpandPageRequest request);
+
+    Result<ApiUserSignExpandDetailResponse> detail(String userSignBizId);
+
+    Result add(ApiUserSignExpandAddRequest request);
+
+    Result edit(ApiUserSignExpandEditRequest request);
+
+    Result del(String userSignBizId);
+
+    Result editStatus(String userSignBizId, Integer status);
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiInsuranceCategoryServiceImpl.java

+package com.yd.insurance.base.api.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.api.service.ApiInsuranceCategoryService;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryAddRequest;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryPageRequest;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryDetailResponse;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryEditRequest;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryPageResponse;
+import com.yd.insurance.base.service.service.IInsuranceCategoryService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class ApiInsuranceCategoryServiceImpl implements ApiInsuranceCategoryService {
+
+    @Autowired
+    private IInsuranceCategoryService iInsuranceCategoryService;
+
+    /**
+     * 分页列表查询-保险险种信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiInsuranceCategoryPageResponse>> page(ApiInsuranceCategoryPageRequest request) {
+        Page<ApiInsuranceCategoryPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiInsuranceCategoryPageResponse> iPage = iInsuranceCategoryService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 详情-保险险种信息
+     * @param insuranceCategoryBizId 保险险种表唯一业务ID
+     * @return
+     */
+    @Override
+    public Result<ApiInsuranceCategoryDetailResponse> detail(String insuranceCategoryBizId) {
+
+        return null;
+    }
+
+    /**
+     * 添加-保险险种信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiInsuranceCategoryAddRequest request) {
+        return null;
+    }
+
+    /**
+     * 编辑-保险险种信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiInsuranceCategoryEditRequest request) {
+        return null;
+    }
+
+    /**
+     * 删除-保险险种信息
+     * @param insuranceCategoryBizId 保险险种表唯一业务ID
+     * @return
+     */
+    @Override
+    public Result del(String insuranceCategoryBizId) {
+        return null;
+    }
+
+    /**
+     * 编辑-保险险种信息状态
+     * @param insuranceCategoryBizId 保险险种表唯一业务ID
+     * @param status 状态(0:停用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String insuranceCategoryBizId, String status) {
+        return null;
+    }
+
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiInsuranceCompanyServiceImpl.java

+package com.yd.insurance.base.api.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.CommonEnum;
+import com.yd.common.enums.ResultCode;
+import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
+import com.yd.common.utils.RandomStringGenerator;
+import com.yd.insurance.base.api.service.ApiInsuranceCompanyService;
+import com.yd.insurance.base.feign.dto.ApiInsuranceCompanyDto;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancecompany.ApiInsuranceCompanyDetailResponse;
+import com.yd.insurance.base.feign.response.insurancecompany.ApiInsuranceCompanyPageResponse;
+import com.yd.insurance.base.service.dto.InsuranceCompanyDto;
+import com.yd.insurance.base.service.dto.InsuranceProductPlanDto;
+import com.yd.insurance.base.service.model.InsuranceCompany;
+import com.yd.insurance.base.service.model.InsuranceProductPlan;
+import com.yd.insurance.base.service.service.IInsuranceCompanyService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.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.List;
+import java.util.Objects;
+
+@Slf4j
+@Service
+public class ApiInsuranceCompanyServiceImpl implements ApiInsuranceCompanyService {
+
+    @Autowired
+    private IInsuranceCompanyService iInsuranceCompanyService;
+
+    /**
+     * 分页列表查询-保险公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiInsuranceCompanyPageResponse>> page(ApiInsuranceCompanyPageRequest request) {
+        Page<ApiInsuranceCompanyPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiInsuranceCompanyPageResponse> iPage = iInsuranceCompanyService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 详情-保险公司信息
+     * @param insuranceCompanyBizId 保险公司唯一业务ID
+     * @return
+     */
+    @Override
+    public Result<ApiInsuranceCompanyDetailResponse> detail(String insuranceCompanyBizId) {
+        //校验保险公司信息是否存在
+        Result<InsuranceCompany> result = checkInsuranceCompany(insuranceCompanyBizId);
+        InsuranceCompany insuranceCompany = result.getData();
+        ApiInsuranceCompanyDetailResponse response = new ApiInsuranceCompanyDetailResponse();
+        //保险公司主信息
+        ApiInsuranceCompanyDto apiInsuranceCompanyDto = new ApiInsuranceCompanyDto();
+        BeanUtils.copyProperties(insuranceCompany,apiInsuranceCompanyDto);
+        response.setApiInsuranceCompanyDto(apiInsuranceCompanyDto);
+        return Result.success(response);
+    }
+
+    /**
+     * 添加-保险公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiInsuranceCompanyAddRequest request) {
+        //添加-保险公司主信息
+        addInsuranceCompanyMain(request.getApiInsuranceCompanyDto());
+
+        return Result.success();
+    }
+
+    /**
+     * 添加-保险公司主信息
+     * @param apiInsuranceCompanyDto
+     * @return
+     */
+    public Result addInsuranceCompanyMain(ApiInsuranceCompanyDto apiInsuranceCompanyDto) {
+        //校验保险公司全称的唯一性
+        List<InsuranceCompany> list = iInsuranceCompanyService.queryList(InsuranceCompanyDto.builder()
+                .fullName(apiInsuranceCompanyDto.getFullName())
+                .build());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new BusinessException("保险公司全称已存在");
+        }
+        InsuranceCompany insuranceCompany = new InsuranceCompany();
+        BeanUtils.copyProperties(apiInsuranceCompanyDto,insuranceCompany);
+        //保险公司表唯一业务ID
+        insuranceCompany.setInsuranceCompanyBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_INSURANCE_COMPANY.getCode()));
+        iInsuranceCompanyService.saveOrUpdate(insuranceCompany);
+        return Result.success();
+    }
+
+    /**
+     * 编辑-保险公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiInsuranceCompanyEditRequest request) {
+        //编辑-保险公司主信息
+        editInsuranceCompanyMain(request.getApiInsuranceCompanyDto());
+        return Result.success();
+    }
+
+    /**
+     * 编辑-保险公司主信息
+     * @param dto
+     * @return
+     */
+    public Result editInsuranceCompanyMain(ApiInsuranceCompanyDto dto) {
+        if (StringUtils.isBlank(dto.getInsuranceCompanyBizId())) {
+            throw new BusinessException("保险公司表唯一业务ID不能为空");
+        }
+        //校验保险公司信息是否存在
+        Result<InsuranceCompany> result = checkInsuranceCompany(dto.getInsuranceCompanyBizId());
+        InsuranceCompany insuranceCompany = result.getData();
+
+        //校验保险公司全称的唯一性
+        List<InsuranceCompany> list = iInsuranceCompanyService.queryList(InsuranceCompanyDto.builder()
+                .fullName(dto.getFullName())
+                .insuranceCompanyBizId(dto.getInsuranceCompanyBizId())
+                .isExcludeMy(true)
+                .build());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new BusinessException("保险公司全称已存在");
+        }
+        BeanUtils.copyProperties(dto,insuranceCompany);
+        iInsuranceCompanyService.saveOrUpdate(insuranceCompany);
+        return Result.success();
+    }
+
+    /**
+     * 删除-保险公司信息
+     * @param insuranceCompanyBizId 保险公司唯一业务ID
+     * @return
+     */
+    @Override
+    public Result del(String insuranceCompanyBizId) {
+        return null;
+    }
+
+    /**
+     * 编辑-保险公司信息合作状态
+     * @param insuranceCompanyBizId 保险公司唯一业务ID
+     * @param cooperationStatus 合作状态（合作中、已终止、未合作）
+     * @return
+     */
+    @Override
+    public Result editStatus(String insuranceCompanyBizId, String cooperationStatus) {
+        //校验保险公司信息是否存在
+        Result<InsuranceCompany> result = checkInsuranceCompany(insuranceCompanyBizId);
+        InsuranceCompany insuranceCompany = result.getData();
+        insuranceCompany.setCooperationStatus(cooperationStatus);
+        iInsuranceCompanyService.saveOrUpdate(insuranceCompany);
+        return Result.success();
+    }
+
+    /**
+     * 校验保险公司信息是否存在
+     * @param insuranceCompanyBizId
+     * @return
+     */
+    public Result<InsuranceCompany> checkInsuranceCompany(String insuranceCompanyBizId) {
+        InsuranceCompany insuranceCompany = iInsuranceCompanyService.queryOne(insuranceCompanyBizId);
+        if (Objects.isNull(insuranceCompany)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        return Result.success(insuranceCompany);
+    }
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiInsuranceReconciliationCompanyServiceImpl.java

+package com.yd.insurance.base.api.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.result.Result;
+import com.yd.insurance.base.api.service.ApiInsuranceReconciliationCompanyService;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyDetailResponse;
+import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageResponse;
+import com.yd.insurance.base.service.service.IInsuranceReconciliationCompanyService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class ApiInsuranceReconciliationCompanyServiceImpl implements ApiInsuranceReconciliationCompanyService {
+
+    @Autowired
+    private IInsuranceReconciliationCompanyService iInsuranceReconciliationCompanyService;
+
+    /**
+     * 分页列表查询-保险对账公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiInsuranceReconciliationCompanyPageResponse>> page(ApiInsuranceReconciliationCompanyPageRequest request) {
+        Page<ApiInsuranceReconciliationCompanyPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiInsuranceReconciliationCompanyPageResponse> iPage = iInsuranceReconciliationCompanyService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 详情-保险对账公司信息
+     * @param reconciliationCompanyBizId 保险对账公司唯一业务ID
+     * @return
+     */
+    @Override
+    public Result<ApiInsuranceReconciliationCompanyDetailResponse> detail(String reconciliationCompanyBizId) {
+        return null;
+    }
+
+    /**
+     * 添加-保险对账公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiInsuranceReconciliationCompanyAddRequest request) {
+        return null;
+    }
+
+    /**
+     * 编辑-保险对账公司信息
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiInsuranceReconciliationCompanyEditRequest request) {
+        return null;
+    }
+
+    /**
+     * 删除-保险对账公司信息
+     * @param reconciliationCompanyBizId 保险对账公司唯一业务ID
+     * @return
+     */
+    @Override
+    public Result del(String reconciliationCompanyBizId) {
+        return null;
+    }
+
+    /**
+     * 编辑-保险对账公司信息状态
+     * @param reconciliationCompanyBizId 保险对账公司唯一业务ID
+     * @param status 状态(0:停用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String reconciliationCompanyBizId, String status) {
+        return null;
+    }
+
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiRelProductAnnouncementServiceImpl.java

+package com.yd.insurance.base.api.service.impl;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.api.service.ApiRelProductAnnouncementService;
+import com.yd.insurance.base.feign.dto.ApiProductRatioDto;
+import com.yd.insurance.base.feign.request.ApiQueryRatioRequest;
+import com.yd.insurance.base.feign.response.ApiQueryRatioResponse;
+import com.yd.insurance.base.service.dto.RelProductAnnouncementDto;
+import com.yd.insurance.base.service.model.RelProductAnnouncement;
+import com.yd.insurance.base.service.service.IRelProductAnnouncementService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@Slf4j
+@Service
+public class ApiRelProductAnnouncementServiceImpl implements ApiRelProductAnnouncementService {
+
+    @Autowired
+    private IRelProductAnnouncementService iRelProductAnnouncementService;
+
+    /**
+     * 查询-产品公告比例
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<ApiQueryRatioResponse> queryRatio(ApiQueryRatioRequest request) {
+        LocalDateTime now = LocalDateTime.now();
+        ApiQueryRatioResponse ratioResponse = new ApiQueryRatioResponse();
+        List<ApiProductRatioDto> apiProductRatioDtoList = request.getApiProductRatioDtoList();
+        if (!CollectionUtils.isEmpty(apiProductRatioDtoList)) {
+            //产品代码列表
+            List<String> productCodeList = apiProductRatioDtoList.stream()
+                    .map(ApiProductRatioDto::getProductCode)
+                    .collect(Collectors.toList());
+            //产品业务ID列表
+            List<String> productBizIdList = apiProductRatioDtoList.stream()
+                    .map(ApiProductRatioDto::getProductBizId)
+                    .collect(Collectors.toList());
+            List<RelProductAnnouncement> productAnnouncementDtoList = new ArrayList<>();
+            //查询产品和公告比例关系列表信息
+            if (!CollectionUtils.isEmpty(productCodeList)) {
+                productAnnouncementDtoList = iRelProductAnnouncementService.queryList(RelProductAnnouncementDto.builder()
+                        .productCodeList(productCodeList)
+                        .build());
+            }else {
+                productAnnouncementDtoList = iRelProductAnnouncementService.queryList(RelProductAnnouncementDto.builder()
+                        .productBizIdList(productBizIdList)
+                        .build());
+            }
+            if (!CollectionUtils.isEmpty(productAnnouncementDtoList)) {
+                List<RelProductAnnouncement> finalProductAnnouncementDtoList = productAnnouncementDtoList;
+                apiProductRatioDtoList.stream().map(dto -> {
+                    //根据产品代码或者产品业务ID获取产品和公告比例关系列表信息
+                    List<RelProductAnnouncement> announcementList =  finalProductAnnouncementDtoList.stream()
+                            .filter(d -> d.getProductCode().equals(dto.getProductCode())
+                            || d.getProductBizId().equals(dto.getProductBizId())).collect(Collectors.toList());
+                    if (!CollectionUtils.isEmpty(announcementList)) {
+                        //先判断当前计算的产品时间是否在有效期内，如果在有效期内，用有效期内的公告比例
+                        List<RelProductAnnouncement> announcements = announcementList.stream()
+                                .filter(d -> d.getStartPayment() <= dto.getCommissionPeriod()
+                                        && d.getEndPayment() > dto.getCommissionPeriod()).collect(Collectors.toList());
+                        if (!CollectionUtils.isEmpty(announcements)) {
+                            //当前计算获取的产品公告比例对象
+                            RelProductAnnouncement announcement = announcements.get(0);
+                            //先判断当前时间是否在有效期内，在有效期内，公告比例取值有效期内公告比例字段值, 否则取公告比例字段
+                            if ((!Objects.isNull(announcement.getEffectiveStart()) && now.compareTo(announcement.getEffectiveStart()) >= 0)
+                                && (!Objects.isNull(announcement.getEffectiveEnd()) && now.compareTo(announcement.getEffectiveEnd()) <= 0)) {
+                                dto.setRatio(announcement.getRatio());
+                            }else {
+                                dto.setRatio(announcement.getAnnouncementRatio());
+                            }
+                        }
+                    }
+                    return dto;
+                }).collect(Collectors.toList());
+            }
+        }
+        ratioResponse.setApiProductRatioDtoList(apiProductRatioDtoList);
+        return Result.success(ratioResponse);
+    }
+
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiUserSaleExpandServiceImpl.java

+package com.yd.insurance.base.api.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.CommonEnum;
+import com.yd.common.enums.ResultCode;
+import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
+import com.yd.common.utils.RandomStringGenerator;
+import com.yd.insurance.base.api.service.ApiUserSaleExpandService;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
+import com.yd.insurance.base.service.model.UserSaleExpand;
+import com.yd.insurance.base.service.service.IUserSaleExpandService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Slf4j
+@Service
+public class ApiUserSaleExpandServiceImpl implements ApiUserSaleExpandService {
+
+    @Autowired
+    private IUserSaleExpandService iUserSaleExpandService;
+
+    /**
+     * 销售员（转介人）分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiUserSaleExpandPageResponse>> page(ApiUserSaleExpandPageRequest request) {
+        Page<ApiUserSaleExpandPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiUserSaleExpandPageResponse> iPage = iUserSaleExpandService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 获取销售员（转介人）详情
+     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId) {
+        Result<UserSaleExpand> result = checkUserSaleExpandIsExist(userSaleBizId);
+        UserSaleExpand userSaleExpand = result.getData();
+        ApiUserSaleExpandDetailResponse response = new ApiUserSaleExpandDetailResponse();
+        BeanUtils.copyProperties(userSaleExpand,response);
+        return Result.success(response);
+    }
+
+    /**
+     * 添加销售员（转介人）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiUserSaleExpandAddRequest request) {
+        UserSaleExpand userSaleExpand = new UserSaleExpand();
+        BeanUtils.copyProperties(request,userSaleExpand);
+        userSaleExpand.setUserSaleBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_USER_SALE_EXPAND.getCode()));
+        iUserSaleExpandService.saveOrUpdate(userSaleExpand);
+        return Result.success();
+    }
+
+    /**
+     * 编辑销售员（转介人）
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiUserSaleExpandEditRequest request) {
+        Result<UserSaleExpand> result = checkUserSaleExpandIsExist(request.getUserSaleBizId());
+        UserSaleExpand userSaleExpand = result.getData();
+        BeanUtils.copyProperties(request,userSaleExpand);
+        iUserSaleExpandService.saveOrUpdate(userSaleExpand);
+        return Result.success();
+    }
+
+    /**
+     * 删除销售员（转介人）（逻辑删除）
+     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result del(String userSaleBizId) {
+        return null;
+    }
+
+    /**
+     * 编辑销售员（转介人）状态
+     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @param status 状态(0:禁用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String userSaleBizId, Integer status) {
+        Result<UserSaleExpand> result = checkUserSaleExpandIsExist(userSaleBizId);
+        UserSaleExpand userSaleExpand = result.getData();
+        userSaleExpand.setStatus(status);
+        iUserSaleExpandService.saveOrUpdate(userSaleExpand);
+        return Result.success();
+    }
+
+    /**
+     * 校验销售员（转介人）是否存在
+     * @param userSaleBizId
+     * @return
+     */
+    public Result<UserSaleExpand> checkUserSaleExpandIsExist(String userSaleBizId) {
+        UserSaleExpand userSaleExpand = iUserSaleExpandService.queryOne(userSaleBizId);
+        if (Objects.isNull(userSaleExpand)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        return Result.success(userSaleExpand);
+    }
+}

yd-insurance-base-api/src/main/java/com/yd/insurance/base/api/service/impl/ApiUserSignExpandServiceImpl.java

+package com.yd.insurance.base.api.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.common.enums.CommonEnum;
+import com.yd.common.enums.ResultCode;
+import com.yd.common.exception.BusinessException;
+import com.yd.common.result.Result;
+import com.yd.common.utils.RandomStringGenerator;
+import com.yd.insurance.base.api.service.ApiUserSignExpandService;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
+import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse;
+import com.yd.insurance.base.service.model.UserSignExpand;
+import com.yd.insurance.base.service.service.IUserSignExpandService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+@Slf4j
+@Service
+public class ApiUserSignExpandServiceImpl implements ApiUserSignExpandService {
+
+    @Autowired
+    private IUserSignExpandService iUserSignExpandService;
+
+    /**
+     * 签单员分页查询
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<IPage<ApiUserSignExpandPageResponse>> page(ApiUserSignExpandPageRequest request) {
+        Page<ApiUserSignExpandPageResponse> page = new Page<>(request.getPageNo(), request.getPageSize());
+        IPage<ApiUserSignExpandPageResponse> iPage = iUserSignExpandService.page(page, request);
+        return Result.success(iPage);
+    }
+
+    /**
+     * 获取签单员详情
+     * @param userSignBizId 签单员唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result<ApiUserSignExpandDetailResponse> detail(String userSignBizId) {
+        Result<UserSignExpand> result = checkUserSignExpandIsExist(userSignBizId);
+        UserSignExpand userSignExpand = result.getData();
+        ApiUserSignExpandDetailResponse response = new ApiUserSignExpandDetailResponse();
+        BeanUtils.copyProperties(userSignExpand,response);
+        return Result.success(response);
+    }
+
+    /**
+     * 添加签单员
+     * @param request
+     * @return
+     */
+    @Override
+    public Result add(ApiUserSignExpandAddRequest request) {
+        UserSignExpand userSignExpand = new UserSignExpand();
+        BeanUtils.copyProperties(request,userSignExpand);
+        userSignExpand.setUserSignBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_USER_SIGN_EXPAND.getCode()));
+        iUserSignExpandService.saveOrUpdate(userSignExpand);
+        return Result.success();
+    }
+
+    /**
+     * 编辑签单员
+     * @param request
+     * @return
+     */
+    @Override
+    public Result edit(ApiUserSignExpandEditRequest request) {
+        Result<UserSignExpand> result = checkUserSignExpandIsExist(request.getUserSignBizId());
+        UserSignExpand userSignExpand = result.getData();
+        BeanUtils.copyProperties(request,userSignExpand);
+        iUserSignExpandService.saveOrUpdate(userSignExpand);
+        return Result.success();
+    }
+
+    /**
+     * 删除签单员（逻辑删除）
+     * @param userSignBizId 签单员唯一标识(业务ID)
+     * @return
+     */
+    @Override
+    public Result del(String userSignBizId) {
+        return null;
+    }
+
+    /**
+     * 编辑签单员状态
+     * @param userSignBizId 签单员唯一标识(业务ID)
+     * @param status 状态(0:禁用 1:启用)
+     * @return
+     */
+    @Override
+    public Result editStatus(String userSignBizId, Integer status) {
+        Result<UserSignExpand> result = checkUserSignExpandIsExist(userSignBizId);
+        UserSignExpand userSignExpand = result.getData();
+        userSignExpand.setStatus(status);
+        iUserSignExpandService.saveOrUpdate(userSignExpand);
+        return Result.success();
+    }
+
+    /**
+     * 校验签单员是否存在
+     * @param userSignBizId
+     * @return
+     */
+    public Result<UserSignExpand> checkUserSignExpandIsExist(String userSignBizId) {
+        UserSignExpand userSignExpand = iUserSignExpandService.queryOne(userSignBizId);
+        if (Objects.isNull(userSignExpand)) {
+            //数据不存在
+            throw new BusinessException(ResultCode.NULL_ERROR.getCode(),ResultCode.NULL_ERROR.getMessage());
+        }
+        return Result.success(userSignExpand);
+    }
+
+}

yd-insurance-base-api/src/main/resources/bootstrap.yml

@@ -40,7 +40,7 @@ spring:
       # 配置中心
       config:
         # 命名空间id(此处不用public,因public初始化的空间, id为空)
-        namespace: c1e4cbcf-d8b7-4da9-a75a-7b75890fc390
+        namespace: b3b01715-eb85-4242-992a-5aff03d864d4
         # nacos的ip地址和端口
         server-addr: 139.224.145.34:8848
         # 这个就表示 在我们nacos命名空间id为 dev中 有一个data-id 为 demo-service.yml 的配置文件 读取这个里面的配置

yd-insurance-base-api/yd-insurance-base-api.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/ApiRelProductAnnouncementFeignClient.java

+package com.yd.insurance.base.feign.client;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.fallback.ApiRelProductAnnouncementFeignFallbackFactory;
+import com.yd.insurance.base.feign.request.ApiQueryRatioRequest;
+import com.yd.insurance.base.feign.response.ApiQueryRatioResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+/**
+ * 保险基础数据服务-产品和公告比例关系信息Feign客户端
+ */
+@FeignClient(name = "yd-insurance-base-api",path = "/insurance/base/api/relProductAnnouncement",fallbackFactory = ApiRelProductAnnouncementFeignFallbackFactory.class)
+public interface ApiRelProductAnnouncementFeignClient {
+
+    /**
+     * 查询-产品公告比例
+     * @param request
+     * @return
+     */
+    @PostMapping("/query/ratio")
+    Result<ApiQueryRatioResponse> queryRatio(@RequestBody ApiQueryRatioRequest request);
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/insurancecategory/ApiInsuranceCategoryFeignClient.java

+package com.yd.insurance.base.feign.client.insurancecategory;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.fallback.insurancecategory.ApiInsuranceCategoryFeignFallbackFactory;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryAddRequest;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryPageRequest;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryDetailResponse;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryEditRequest;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 保险险种信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api",path = "/insurance/base/api/insuranceCategory",fallbackFactory = ApiInsuranceCategoryFeignFallbackFactory.class)
+public interface ApiInsuranceCategoryFeignClient {
+
+    /**
+     * 分页列表查询-保险险种信息
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@RequestBody ApiInsuranceCategoryPageRequest request);
+
+    /**
+     * 详情-保险险种信息
+     * @param insuranceCategoryBizId 保险险种表唯一业务ID
+     * @return
+     */
+    @GetMapping("/detail")
+    Result<ApiInsuranceCategoryDetailResponse> detail(@NotBlank(message = "保险险种表唯一业务ID不能为空") @RequestParam(value = "insuranceCategoryBizId") String insuranceCategoryBizId);
+
+    /**
+     * 添加-保险险种信息
+     * @param request
+     * @return
+     */
+    @PostMapping("/add")
+    Result add(@Validated @RequestBody ApiInsuranceCategoryAddRequest request);
+
+    /**
+     * 编辑-保险险种信息
+     * @param request
+     * @return
+     */
+    @PutMapping("/edit")
+    Result edit(@Validated @RequestBody ApiInsuranceCategoryEditRequest request);
+
+
+    /**
+     * 删除-保险险种信息
+     * @param insuranceCategoryBizId 保险险种表唯一业务ID
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@RequestParam(value = "insuranceCategoryBizId") String insuranceCategoryBizId);
+
+    /**
+     * 编辑-保险险种信息状态
+     * @param insuranceCategoryBizId 保险险种表唯一业务ID
+     * @param status 状态(0:停用 1:启用)
+     * @return
+     */
+    @PatchMapping("/edit/status")
+    Result editStatus(@NotBlank(message = "保险险种表唯一业务ID不能为空") @RequestParam(value = "insuranceCategoryBizId") String insuranceCategoryBizId,
+                      @NotBlank(message = "状态不能为空") @RequestParam(value = "status") String status);
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/insurancecompany/ApiInsuranceCompanyFeignClient.java

+package com.yd.insurance.base.feign.client.insurancecompany;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.fallback.insurancecompany.ApiInsuranceCompanyFeignFallbackFactory;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancecompany.ApiInsuranceCompanyDetailResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 保险公司信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api",path = "/insurance/base/api/insuranceCompany",fallbackFactory = ApiInsuranceCompanyFeignFallbackFactory.class)
+public interface ApiInsuranceCompanyFeignClient {
+
+    /**
+     * 分页列表查询-保险公司信息
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@RequestBody ApiInsuranceCompanyPageRequest request);
+
+    /**
+     * 详情-保险公司信息
+     * @param insuranceCompanyBizId 保险公司唯一业务ID
+     * @return
+     */
+    @GetMapping("/detail")
+    Result<ApiInsuranceCompanyDetailResponse> detail(@NotBlank(message = "保险公司唯一业务ID不能为空") @RequestParam(value = "insuranceCompanyBizId") String insuranceCompanyBizId);
+
+    /**
+     * 添加-保险公司信息
+     * @param request
+     * @return
+     */
+    @PostMapping("/add")
+    Result add(@Validated @RequestBody ApiInsuranceCompanyAddRequest request);
+
+    /**
+     * 编辑-保险公司信息
+     * @param request
+     * @return
+     */
+    @PutMapping("/edit")
+    Result edit(@Validated @RequestBody ApiInsuranceCompanyEditRequest request);
+
+
+    /**
+     * 删除-保险公司信息
+     * @param insuranceCompanyBizId 保险公司唯一业务ID
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@RequestParam(value = "insuranceCompanyBizId") String insuranceCompanyBizId);
+
+    /**
+     * 编辑-保险公司信息合作状态
+     * @param insuranceCompanyBizId 保险公司唯一业务ID
+     * @param cooperationStatus 合作状态（合作中、已终止、未合作）
+     * @return
+     */
+    @PatchMapping("/edit/cooperationStatus")
+    Result editStatus(@NotBlank(message = "保险公司唯一业务ID不能为空") @RequestParam(value = "insuranceCompanyBizId") String insuranceCompanyBizId,
+                      @NotBlank(message = "合作状态不能为空") @RequestParam(value = "cooperationStatus") String cooperationStatus);
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/insurancereconciliationcompany/ApiInsuranceReconciliationCompanyFeignClient.java

+package com.yd.insurance.base.feign.client.insurancereconciliationcompany;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.fallback.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignFallbackFactory;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyDetailResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 保险对账公司信息Feign客户端
+ */
+@FeignClient(name = "yd-insurance-base-api",path = "/insurance/base/api/insuranceReconciliationCompany",fallbackFactory = ApiInsuranceReconciliationCompanyFeignFallbackFactory.class)
+public interface ApiInsuranceReconciliationCompanyFeignClient {
+
+    /**
+     * 分页列表查询-保险对账公司信息
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@RequestBody ApiInsuranceReconciliationCompanyPageRequest request);
+
+    /**
+     * 详情-保险对账公司信息
+     * @param reconciliationCompanyBizId 保险对账公司唯一业务ID
+     * @return
+     */
+    @GetMapping("/detail")
+    Result<ApiInsuranceReconciliationCompanyDetailResponse> detail(@NotBlank(message = "保险对账公司唯一业务ID不能为空") @RequestParam(value = "reconciliationCompanyBizId") String reconciliationCompanyBizId);
+
+    /**
+     * 添加-保险对账公司信息
+     * @param request
+     * @return
+     */
+    @PostMapping("/add")
+    Result add(@Validated @RequestBody ApiInsuranceReconciliationCompanyAddRequest request);
+
+    /**
+     * 编辑-保险对账公司信息
+     * @param request
+     * @return
+     */
+    @PutMapping("/edit")
+    Result edit(@Validated @RequestBody ApiInsuranceReconciliationCompanyEditRequest request);
+
+
+    /**
+     * 删除-保险对账公司信息
+     * @param reconciliationCompanyBizId 保险对账公司唯一业务ID
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@RequestParam(value = "reconciliationCompanyBizId") String reconciliationCompanyBizId);
+
+    /**
+     * 编辑-保险对账公司信息状态
+     * @param reconciliationCompanyBizId 保险对账公司唯一业务ID
+     * @param status 状态(0:停用 1:启用)
+     * @return
+     */
+    @PatchMapping("/edit/cooperationStatus")
+    Result editStatus(@NotBlank(message = "保险对账公司唯一业务ID不能为空") @RequestParam(value = "reconciliationCompanyBizId") String reconciliationCompanyBizId,
+                      @NotBlank(message = "状态不能为空") @RequestParam(value = "status") String status);
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/usersaleexpand/ApiUserSaleExpandFeignClient.java

+package com.yd.insurance.base.feign.client.usersaleexpand;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.fallback.usersaleexpand.ApiUserSaleExpandFeignFallbackFactory;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 系统用户-销售用户扩展信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", path = "/user/api/userSaleExpand",fallbackFactory = ApiUserSaleExpandFeignFallbackFactory.class)
+public interface ApiUserSaleExpandFeignClient {
+
+    /**
+     * 销售员（转介人）分页查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@RequestBody ApiUserSaleExpandPageRequest request);
+
+    /**
+     * 获取销售员（转介人）详情
+     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @return
+     */
+    @GetMapping("/detail")
+    Result<ApiUserSaleExpandDetailResponse> detail(@NotBlank(message = "销售员（转介人）唯一标识(业务ID)不能为空") @RequestParam(value = "userSaleBizId") String userSaleBizId);
+
+    /**
+     * 添加销售员（转介人）
+     * @param request
+     * @return
+     */
+    @PostMapping("/add")
+    Result add(@Validated @RequestBody ApiUserSaleExpandAddRequest request);
+
+    /**
+     * 编辑销售员（转介人）
+     * @param request
+     * @return
+     */
+    @PutMapping("/edit")
+    Result edit(@Validated @RequestBody ApiUserSaleExpandEditRequest request);
+
+
+    /**
+     * 删除销售员（转介人）（逻辑删除）
+     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@RequestParam(value = "userSaleBizId") String userSaleBizId);
+
+    /**
+     * 编辑销售员（转介人）状态
+     * @param userSaleBizId 销售员（转介人）唯一标识(业务ID)
+     * @param status 状态(0:禁用 1:启用)
+     * @return
+     */
+    @PatchMapping("/edit/status")
+    Result editStatus(@NotBlank(message = "销售员（转介人）唯一标识(业务ID)不能为空") @RequestParam(value = "userSaleBizId") String userSaleBizId,
+                      @NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status);
+
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/client/usersignexpand/ApiUserSignExpandFeignClient.java

+package com.yd.insurance.base.feign.client.usersignexpand;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.fallback.usersignexpand.ApiUserSignExpandFeignFallbackFactory;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 系统用户-签单用户扩展信息Feign客户端
+ */
+@FeignClient(name = "yd-user-api", path = "/user/api/userSignExpand",fallbackFactory = ApiUserSignExpandFeignFallbackFactory.class)
+public interface ApiUserSignExpandFeignClient {
+
+    /**
+     * 签单员分页查询
+     * @param request
+     * @return
+     */
+    @PostMapping("/page")
+    Result page(@RequestBody ApiUserSignExpandPageRequest request);
+
+    /**
+     * 获取签单员详情
+     * @param userSignBizId 签单员唯一标识(业务ID)
+     * @return
+     */
+    @GetMapping("/detail")
+    Result<ApiUserSignExpandDetailResponse> detail(@NotBlank(message = "签单员唯一标识(业务ID)不能为空") @RequestParam(value = "userSignBizId") String userSignBizId);
+
+    /**
+     * 添加签单员
+     * @param request
+     * @return
+     */
+    @PostMapping("/add")
+    Result add(@Validated @RequestBody ApiUserSignExpandAddRequest request);
+
+    /**
+     * 编辑签单员
+     * @param request
+     * @return
+     */
+    @PutMapping("/edit")
+    Result edit(@Validated @RequestBody ApiUserSignExpandEditRequest request);
+
+
+    /**
+     * 删除签单员（逻辑删除）
+     * @param userSignBizId 签单员唯一标识(业务ID)
+     * @return
+     */
+    @DeleteMapping("/del")
+    Result del(@RequestParam(value = "userSignBizId") String userSignBizId);
+
+    /**
+     * 编辑签单员状态
+     * @param userSignBizId 签单员唯一标识(业务ID)
+     * @param status 状态(0:禁用 1:启用)
+     * @return
+     */
+    @PatchMapping("/edit/status")
+    Result editStatus(@NotBlank(message = "签单员唯一标识(业务ID)不能为空") @RequestParam(value = "userSignBizId") String userSignBizId,
+                      @NotNull(message = "状态不能为空") @RequestParam(value = "status") Integer status);
+
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/dto/ApiInsuranceCompanyDto.java

+package com.yd.insurance.base.feign.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ApiInsuranceCompanyDto {
+
+    /**
+     * 保险公司表唯一业务ID
+     */
+    private String insuranceCompanyBizId;
+
+    /**
+     * 部门组织表唯一业务ID
+     */
+    private String deptBizId;
+
+    /**
+     * 保险公司编码
+     */
+    private String code;
+
+    /**
+     * 保险公司全称
+     */
+    @NotBlank(message = "保险公司全称不能为空")
+    private String fullName;
+
+    /**
+     * 保险公司简称
+     */
+    private String abbreviation;
+
+    /**
+     * 保险公司英文全称
+     */
+    private String enFullName;
+
+    /**
+     * 保险公司英文简称
+     */
+    private String enAbbreviation;
+
+    /**
+     * 保险公司类型（财险、寿险、健康险、综合）
+     */
+    private String type;
+
+    /**
+     * 所属地区
+     */
+    private String region;
+
+    /**
+     * 保险公司介绍（支持HTML）
+     */
+    private String introduction;
+
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+
+    /**
+     * 联系邮箱
+     */
+    private String contactEmail;
+
+    /**
+     * 官方网站
+     */
+    private String officialWebsite;
+
+    /**
+     * 公众号名称
+     */
+    private String officialAccountName;
+
+    /**
+     * 公众号二维码
+     */
+    private String officialAccountQrCode;
+
+    /**
+     * 合作状态（合作中、已终止、未合作）
+     */
+    private String cooperationStatus;
+
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/dto/ApiProductRatioDto.java

+package com.yd.insurance.base.feign.dto;
+
+import lombok.Data;
+import java.math.BigDecimal;
+
+/**
+ * 产品对应的公告比例对象
+ */
+@Data
+public class ApiProductRatioDto {
+
+    /**
+     * 保险产品唯一业务ID
+     */
+    private String productBizId;
+
+    /**
+     * 保险产品名称
+     */
+    private String productName;
+
+    /**
+     * 保险产品代码
+     */
+    private String productCode;
+
+    /**
+     * 公告比例
+     */
+    private BigDecimal ratio;
+
+    /**
+     * 当前佣金期数(1=第一年; 2=第二年; 3=第三年; 4=第四年; 5=第五年。。)
+     */
+    private Integer commissionPeriod;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/ApiRelProductAnnouncementFeignFallbackFactory.java

+package com.yd.insurance.base.feign.fallback;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.client.ApiRelProductAnnouncementFeignClient;
+import com.yd.insurance.base.feign.request.ApiQueryRatioRequest;
+import com.yd.insurance.base.feign.response.ApiQueryRatioResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 保险基础数据服务-产品和公告比例关系信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiRelProductAnnouncementFeignFallbackFactory implements FallbackFactory<ApiRelProductAnnouncementFeignClient> {
+    @Override
+    public ApiRelProductAnnouncementFeignClient create(Throwable cause) {
+        return new ApiRelProductAnnouncementFeignClient() {
+            @Override
+            public Result<ApiQueryRatioResponse> queryRatio(ApiQueryRatioRequest request) {
+                return null;
+            }
+        };
+    }
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/insurancecategory/ApiInsuranceCategoryFeignFallbackFactory.java

+package com.yd.insurance.base.feign.fallback.insurancecategory;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.client.insurancecategory.ApiInsuranceCategoryFeignClient;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryAddRequest;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryPageRequest;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryDetailResponse;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryEditRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 保险险种信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiInsuranceCategoryFeignFallbackFactory implements FallbackFactory<ApiInsuranceCategoryFeignClient> {
+    @Override
+    public ApiInsuranceCategoryFeignClient create(Throwable cause) {
+        return new ApiInsuranceCategoryFeignClient() {
+            @Override
+            public Result page(ApiInsuranceCategoryPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result<ApiInsuranceCategoryDetailResponse> detail(String insuranceCategoryBizId) {
+                return null;
+            }
+
+            @Override
+            public Result add(ApiInsuranceCategoryAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result edit(ApiInsuranceCategoryEditRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(String insuranceCategoryBizId) {
+                return null;
+            }
+
+            @Override
+            public Result editStatus(String insuranceCategoryBizId,String status) {
+                return null;
+            }
+        };
+    }
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/insurancecompany/ApiInsuranceCompanyFeignFallbackFactory.java

+package com.yd.insurance.base.feign.fallback.insurancecompany;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.client.insurancecompany.ApiInsuranceCompanyFeignClient;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancecompany.ApiInsuranceCompanyDetailResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 保险公司信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiInsuranceCompanyFeignFallbackFactory implements FallbackFactory<ApiInsuranceCompanyFeignClient> {
+    @Override
+    public ApiInsuranceCompanyFeignClient create(Throwable cause) {
+        return new ApiInsuranceCompanyFeignClient() {
+            @Override
+            public Result page(ApiInsuranceCompanyPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result<ApiInsuranceCompanyDetailResponse> detail(String insuranceCompanyBizId) {
+                return null;
+            }
+
+            @Override
+            public Result add(ApiInsuranceCompanyAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result edit(ApiInsuranceCompanyEditRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(String insuranceCompanyBizId) {
+                return null;
+            }
+
+            @Override
+            public Result editStatus(String insuranceCompanyBizId,String cooperationStatus) {
+                return null;
+            }
+        };
+    }
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/insurancereconciliationcompany/ApiInsuranceReconciliationCompanyFeignFallbackFactory.java

+package com.yd.insurance.base.feign.fallback.insurancereconciliationcompany;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.client.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyFeignClient;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyAddRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyEditRequest;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyDetailResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 保险对账公司信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiInsuranceReconciliationCompanyFeignFallbackFactory implements FallbackFactory<ApiInsuranceReconciliationCompanyFeignClient> {
+    @Override
+    public ApiInsuranceReconciliationCompanyFeignClient create(Throwable cause) {
+        return new ApiInsuranceReconciliationCompanyFeignClient() {
+            @Override
+            public Result page(ApiInsuranceReconciliationCompanyPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result<ApiInsuranceReconciliationCompanyDetailResponse> detail(String reconciliationCompanyBizId) {
+                return null;
+            }
+
+            @Override
+            public Result add(ApiInsuranceReconciliationCompanyAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result edit(ApiInsuranceReconciliationCompanyEditRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(String reconciliationCompanyBizId) {
+                return null;
+            }
+
+            @Override
+            public Result editStatus(String reconciliationCompanyBizId,String status) {
+                return null;
+            }
+        };
+    }
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/usersaleexpand/ApiUserSaleExpandFeignFallbackFactory.java

+package com.yd.insurance.base.feign.fallback.usersaleexpand;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.client.usersaleexpand.ApiUserSaleExpandFeignClient;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandDetailResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 系统用户-销售用户扩展信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiUserSaleExpandFeignFallbackFactory implements FallbackFactory<ApiUserSaleExpandFeignClient> {
+    @Override
+    public ApiUserSaleExpandFeignClient create(Throwable cause) {
+        return new ApiUserSaleExpandFeignClient() {
+            @Override
+            public Result page(ApiUserSaleExpandPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result<ApiUserSaleExpandDetailResponse> detail(String userSaleBizId) {
+                return null;
+            }
+
+            @Override
+            public Result add(ApiUserSaleExpandAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result edit(ApiUserSaleExpandEditRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(String userSaleBizId) {
+                return null;
+            }
+
+            @Override
+            public Result editStatus(String userSaleBizId, Integer status) {
+                return null;
+            }
+        };
+    }
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/fallback/usersignexpand/ApiUserSignExpandFeignFallbackFactory.java

+package com.yd.insurance.base.feign.fallback.usersignexpand;
+
+import com.yd.common.result.Result;
+import com.yd.insurance.base.feign.client.usersignexpand.ApiUserSignExpandFeignClient;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandAddRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandEditRequest;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandDetailResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 系统用户-签单用户扩展信息Feign降级处理
+ */
+@Slf4j
+@Component
+public class ApiUserSignExpandFeignFallbackFactory implements FallbackFactory<ApiUserSignExpandFeignClient> {
+    @Override
+    public ApiUserSignExpandFeignClient create(Throwable cause) {
+        return new ApiUserSignExpandFeignClient() {
+            @Override
+            public Result page(ApiUserSignExpandPageRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result<ApiUserSignExpandDetailResponse> detail(String userSignBizId) {
+                return null;
+            }
+
+            @Override
+            public Result add(ApiUserSignExpandAddRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result edit(ApiUserSignExpandEditRequest request) {
+                return null;
+            }
+
+            @Override
+            public Result del(String userSignBizId) {
+                return null;
+            }
+
+            @Override
+            public Result editStatus(String userSignBizId, Integer status) {
+                return null;
+            }
+        };
+    }
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/ApiInsuranceAdditionalProductAddRequest.java

@@ -80,4 +80,9 @@ public class ApiInsuranceAdditionalProductAddRequest {
      * 附加产品图片
      */
     private String picture;
+
+    /**
+     * 附加产品所属公司的所在地
+     */
+    private String location;
 }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/ApiInsuranceAdditionalProductEditRequest.java

@@ -89,4 +89,9 @@ public class ApiInsuranceAdditionalProductEditRequest {
      * 附加产品图片
      */
     private String picture;
+
+    /**
+     * 附加产品所属公司的所在地
+     */
+    private String location;
 }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/ApiInsuranceProductAddRequest.java

@@ -107,4 +107,8 @@ public class ApiInsuranceProductAddRequest {
      */
     private String picture;
 
+    /**
+     * 产品所属公司的所在地
+     */
+    private String location;
 }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/ApiInsuranceProductEditRequest.java

@@ -115,4 +115,9 @@ public class ApiInsuranceProductEditRequest {
      * 产品图片
      */
     private String picture;
+
+    /**
+     * 产品所属公司的所在地
+     */
+    private String location;
 }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/ApiInsuranceProductPageRequest.java

@@ -17,6 +17,16 @@ public class ApiInsuranceProductPageRequest extends PageDto {
     private String productName;
 
     /**
+     * 保险产品类型（险种）
+     */
+    private String productType;
+
+    /**
+     * 保险公司（产品所属保险公司，部门业务id）
+     */
+    private String deptBizId;
+
+    /**
      * 状态(0:停用 1:启用)
      */
     private Integer status;

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/ApiQueryRatioRequest.java

+package com.yd.insurance.base.feign.request;
+
+import com.yd.insurance.base.feign.dto.ApiProductRatioDto;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+@Data
+public class ApiQueryRatioRequest {
+
+    /**
+     * 查询产品对应的公告比例入参参数（多个产品）
+     */
+    @NotEmpty(message = "查询产品对应的公告比例入参参数不能为空")
+    private List<ApiProductRatioDto> apiProductRatioDtoList;
+
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancecategory/ApiInsuranceCategoryAddRequest.java

+package com.yd.insurance.base.feign.request.insurancecategory;
+
+import lombok.Data;
+
+@Data
+public class ApiInsuranceCategoryAddRequest {
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancecategory/ApiInsuranceCategoryPageRequest.java

+package com.yd.insurance.base.feign.request.insurancecategory;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+@Data
+public class ApiInsuranceCategoryPageRequest extends PageDto {
+
+    /**
+     * 分类名称（分类名称，中文显示名称。例如：储蓄险，医疗险，意外险。）
+     */
+    private String name;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancecompany/ApiInsuranceCompanyAddRequest.java

+package com.yd.insurance.base.feign.request.insurancecompany;
+
+import com.yd.insurance.base.feign.dto.ApiInsuranceCompanyDto;
+import lombok.Data;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ApiInsuranceCompanyAddRequest {
+
+    /**
+     * 保险公司主信息
+     */
+    @Valid
+    @NotNull(message = "保险公司主信息不能为空")
+    private ApiInsuranceCompanyDto apiInsuranceCompanyDto;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancecompany/ApiInsuranceCompanyEditRequest.java

+package com.yd.insurance.base.feign.request.insurancecompany;
+
+import com.yd.insurance.base.feign.dto.ApiInsuranceCompanyDto;
+import lombok.Data;
+
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ApiInsuranceCompanyEditRequest {
+
+    /**
+     * 保险公司主信息
+     */
+    @Valid
+    @NotNull(message = "保险公司主信息不能为空")
+    private ApiInsuranceCompanyDto apiInsuranceCompanyDto;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancecompany/ApiInsuranceCompanyPageRequest.java

+package com.yd.insurance.base.feign.request.insurancecompany;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiInsuranceCompanyPageRequest extends PageDto {
+
+    /**
+     * 查询内容（保险公司全称/简称/英文全称/英文简称，支持模糊搜索）
+     */
+    private String queryContent;
+
+    /**
+     * 保险公司表唯一业务ID列表
+     */
+    private List<String> insuranceCompanyBizIdList;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancereconciliationcompany/ApiInsuranceReconciliationCompanyAddRequest.java

+package com.yd.insurance.base.feign.request.insurancereconciliationcompany;
+
+import lombok.Data;
+
+@Data
+public class ApiInsuranceReconciliationCompanyAddRequest {
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancereconciliationcompany/ApiInsuranceReconciliationCompanyEditRequest.java

+package com.yd.insurance.base.feign.request.insurancereconciliationcompany;
+
+import lombok.Data;
+
+@Data
+public class ApiInsuranceReconciliationCompanyEditRequest {
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/insurancereconciliationcompany/ApiInsuranceReconciliationCompanyPageRequest.java

+package com.yd.insurance.base.feign.request.insurancereconciliationcompany;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+@Data
+public class ApiInsuranceReconciliationCompanyPageRequest extends PageDto {
+
+    /**
+     * 保险对账公司名称
+     */
+    private String name;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersaleexpand/ApiUserSaleExpandAddRequest.java

+package com.yd.insurance.base.feign.request.usersaleexpand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ApiUserSaleExpandAddRequest {
+
+    /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+    
+    /**
+     * 系统用户唯一标识(业务ID)
+     */
+    private String userBizId;
+
+    /**
+     * 销售用户真实姓名
+     */
+    @NotBlank(message = "销售用户真实姓名不能为空")
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    @NotBlank(message = "邮箱不能为空")
+    private String email;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersaleexpand/ApiUserSaleExpandEditRequest.java

+package com.yd.insurance.base.feign.request.usersaleexpand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ApiUserSaleExpandEditRequest {
+
+    /**
+     * 销售用户扩展唯一业务ID
+     */
+    @NotBlank(message = "销售用户扩展唯一业务ID不能为空")
+    private String userSaleBizId;
+
+    /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+
+    /**
+     * 系统用户唯一标识(业务ID)
+     */
+    private String userBizId;
+
+    /**
+     * 销售用户真实姓名
+     */
+    @NotBlank(message = "销售用户真实姓名不能为空")
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    @NotBlank(message = "邮箱不能为空")
+    private String email;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersaleexpand/ApiUserSaleExpandPageRequest.java

+package com.yd.insurance.base.feign.request.usersaleexpand;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+@Data
+public class ApiUserSaleExpandPageRequest extends PageDto {
+
+    /**
+     * 销售用户真实姓名
+     */
+    private String realName;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersignexpand/ApiUserSignExpandAddRequest.java

+package com.yd.insurance.base.feign.request.usersignexpand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+
+@Data
+public class ApiUserSignExpandAddRequest {
+
+    /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+
+    /**
+     * 系统用户唯一标识(业务ID)
+     */
+    private String userBizId;
+
+    /**
+     * 签单用户真实姓名
+     */
+    @NotBlank(message = "签单用户真实姓名不能为空")
+    private String realName;
+
+    /**
+     * 执业编码
+     */
+    @NotBlank(message = "执业编码不能为空")
+    private String practiceCode;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+    /**
+     * 证件类型
+     */
+    @NotBlank(message = "证件类型不能为空")
+    private String cardType;
+
+    /**
+     * 证件号码
+     */
+    @NotBlank(message = "证件号码不能为空")
+    private String cardNo;
+
+    /**
+     * 邮箱
+     */
+    @NotBlank(message = "邮箱不能为空")
+    private String email;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersignexpand/ApiUserSignExpandEditRequest.java

+package com.yd.insurance.base.feign.request.usersignexpand;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ApiUserSignExpandEditRequest {
+
+    /**
+     * 签单用户扩展唯一业务ID
+     */
+    @NotBlank(message = "签单用户扩展唯一业务ID不能为空")
+    private String userSignBizId;
+
+    /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+
+    /**
+     * 系统用户唯一标识(业务ID)
+     */
+    private String userBizId;
+
+    /**
+     * 签单用户真实姓名
+     */
+    @NotBlank(message = "签单用户真实姓名不能为空")
+    private String realName;
+
+    /**
+     * 执业编码
+     */
+    @NotBlank(message = "执业编码不能为空")
+    private String practiceCode;
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "手机号不能为空")
+    private String phone;
+
+    /**
+     * 证件类型
+     */
+    @NotBlank(message = "证件类型不能为空")
+    private String cardType;
+
+    /**
+     * 证件号码
+     */
+    @NotBlank(message = "证件号码不能为空")
+    private String cardNo;
+
+    /**
+     * 邮箱
+     */
+    @NotBlank(message = "邮箱不能为空")
+    private String email;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/request/usersignexpand/ApiUserSignExpandPageRequest.java

+package com.yd.insurance.base.feign.request.usersignexpand;
+
+import com.yd.common.dto.PageDto;
+import lombok.Data;
+
+@Data
+public class ApiUserSignExpandPageRequest extends PageDto {
+
+    /**
+     * 签单用户真实姓名
+     */
+    private String realName;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/ApiInsuranceAdditionalProductDetailResponse.java

@@ -116,4 +116,9 @@ public class ApiInsuranceAdditionalProductDetailResponse {
      * 附加产品图片
      */
     private String picture;
+
+    /**
+     * 附加产品所属公司的所在地
+     */
+    private String location;
 }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/ApiInsuranceAdditionalProductPageResponse.java

@@ -65,4 +65,9 @@ public class ApiInsuranceAdditionalProductPageResponse {
      * 附加产品图片
      */
     private String picture;
+
+    /**
+     * 附加产品所属公司的所在地
+     */
+    private String location;
 }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/ApiInsuranceProductDetailResponse.java

@@ -151,4 +151,9 @@ public class ApiInsuranceProductDetailResponse {
      * 产品图片
      */
     private String picture;
+
+    /**
+     * 产品所属公司的所在地
+     */
+    private String location;
 }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/ApiInsuranceProductPageResponse.java

@@ -22,7 +22,7 @@ public class ApiInsuranceProductPageResponse {
     private String productName;
 
     /**
-     * 保险产品类型
+     * 保险产品类型（险种）
      */
     private String productType;
 
@@ -91,4 +91,13 @@ public class ApiInsuranceProductPageResponse {
      */
     private String picture;
 
+    /**
+     * 产品所属公司的所在地
+     */
+    private String location;
+
+    /**
+     * 产品所属公司名称（保险公司）
+     */
+    private String ssDeptName;
 }

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/ApiQueryRatioResponse.java

+package com.yd.insurance.base.feign.response;
+
+import com.yd.insurance.base.feign.dto.ApiProductRatioDto;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ApiQueryRatioResponse {
+
+    /**
+     * 查询产品对应的公告比例出参参数（多个产品）
+     */
+    private List<ApiProductRatioDto> apiProductRatioDtoList;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/insurancecategory/ApiInsuranceCategoryDetailResponse.java

+package com.yd.insurance.base.feign.response.insurancecategory;
+
+import lombok.Data;
+
+@Data
+public class ApiInsuranceCategoryDetailResponse {
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/insurancecategory/ApiInsuranceCategoryEditRequest.java

+package com.yd.insurance.base.feign.response.insurancecategory;
+
+import lombok.Data;
+
+@Data
+public class ApiInsuranceCategoryEditRequest {
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/insurancecategory/ApiInsuranceCategoryPageResponse.java

+package com.yd.insurance.base.feign.response.insurancecategory;
+
+import lombok.Data;
+
+@Data
+public class ApiInsuranceCategoryPageResponse {
+
+    /**
+     * 保险险种表主键ID
+     */
+    private Long id;
+
+    /**
+     * 保险险种表唯一业务ID
+     */
+    private String insuranceCategoryBizId;
+
+    /**
+     * 分类类别（区分是国内还是港险还是通用）
+     */
+    private String type;
+
+    /**
+     * 分类编码
+     */
+    private String code;
+
+    /**
+     * 分类名称（分类名称，中文显示名称。例如：储蓄险，医疗险，意外险。）
+     */
+    private String name;
+
+    /**
+     * 父级id
+     */
+    private String pid;
+
+    /**
+     * 分类层级
+     */
+    private Integer level;
+
+    /**
+     * 排序
+     */
+    private Integer sortOrder;
+
+    /**
+     * 图标链接。存储该类别的图标或图片URL，用于前端展示。
+     */
+    private String iconUrl;
+
+    /**
+     * 父子路径
+     */
+    private String path;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    private Integer status;
+
+    /**
+     * 分类描述（分类描述，详细说明此分类的范围和特点。）
+     */
+    private String description;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/insurancecompany/ApiInsuranceCompanyDetailResponse.java

+package com.yd.insurance.base.feign.response.insurancecompany;
+
+import com.yd.insurance.base.feign.dto.ApiInsuranceCompanyDto;
+import lombok.Data;
+
+@Data
+public class ApiInsuranceCompanyDetailResponse {
+
+    /**
+     * 保险公司主信息
+     */
+    private ApiInsuranceCompanyDto apiInsuranceCompanyDto;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/insurancecompany/ApiInsuranceCompanyPageResponse.java

+package com.yd.insurance.base.feign.response.insurancecompany;
+
+import lombok.Data;
+
+@Data
+public class ApiInsuranceCompanyPageResponse {
+
+    /**
+     * 保险公司表主键ID
+     */
+    private Long id;
+
+    /**
+     * 保险公司表唯一业务ID
+     */
+    private String insuranceCompanyBizId;
+
+    /**
+     * 部门组织表唯一业务ID
+     */
+    private String deptBizId;
+
+    /**
+     * 保险公司编码
+     */
+    private String code;
+
+    /**
+     * 保险公司全称
+     */
+    private String fullName;
+
+    /**
+     * 保险公司简称
+     */
+    private String abbreviation;
+
+    /**
+     * 保险公司英文全称
+     */
+    private String enFullName;
+
+    /**
+     * 保险公司英文简称
+     */
+    private String enAbbreviation;
+
+    /**
+     * 保险公司类型（财险、寿险、健康险、综合）
+     */
+    private String type;
+
+    /**
+     * 所属地区
+     */
+    private String region;
+
+    /**
+     * 保险公司介绍（支持HTML）
+     */
+    private String introduction;
+
+    /**
+     * 联系电话
+     */
+    private String contactPhone;
+
+    /**
+     * 联系邮箱
+     */
+    private String contactEmail;
+
+    /**
+     * 官方网站
+     */
+    private String officialWebsite;
+
+    /**
+     * 公众号名称
+     */
+    private String officialAccountName;
+
+    /**
+     * 公众号二维码
+     */
+    private String officialAccountQrCode;
+
+    /**
+     * 合作状态（合作中、已终止、未合作）
+     */
+    private String cooperationStatus;
+
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/insurancereconciliationcompany/ApiInsuranceReconciliationCompanyDetailResponse.java

+package com.yd.insurance.base.feign.response.insurancereconciliationcompany;
+
+import lombok.Data;
+
+@Data
+public class ApiInsuranceReconciliationCompanyDetailResponse {
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/insurancereconciliationcompany/ApiInsuranceReconciliationCompanyPageResponse.java

+package com.yd.insurance.base.feign.response.insurancereconciliationcompany;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class ApiInsuranceReconciliationCompanyPageResponse {
+
+    /**
+     * 保险对账公司表主键ID
+     */
+    private Long id;
+
+    /**
+     * 保险对账公司表唯一业务ID
+     */
+    private String reconciliationCompanyBizId;
+
+    /**
+     * 部门组织表唯一业务ID
+     */
+    private String deptBizId;
+
+    /**
+     * 保险对账公司名称
+     */
+    private String name;
+
+    /**
+     * 保险对账公司编码
+     */
+    private String code;
+
+    /**
+     * 合同起期
+     */
+    private LocalDateTime contractStartDate;
+
+    /**
+     * 合同止期
+     */
+    private LocalDateTime contractEndDate;
+
+    /**
+     * 对接人姓名
+     */
+    private String dockName;
+
+    /**
+     * 对接人手机号
+     */
+    private String dockPhone;
+
+    /**
+     * 对接人邮箱
+     */
+    private String dockEmail;
+
+    /**
+     * 对接人微信二维码
+     */
+    private String dockWxCode;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    private Integer status;
+
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/usersaleexpand/ApiUserSaleExpandDetailResponse.java

+package com.yd.insurance.base.feign.response.usersaleexpand;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class ApiUserSaleExpandDetailResponse {
+
+    /**
+     * 销售用户扩展表主键ID
+     */
+    private Long id;
+
+    /**
+     * 销售用户扩展唯一业务ID
+     */
+    private String userSaleBizId;
+
+    /**
+     * 系统用户唯一标识(业务ID)
+     */
+    private String userBizId;
+
+    /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+
+    /**
+     * 销售用户真实姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 性别(0:未知 1:男 2:女)
+     */
+    private Integer gender;
+
+    /**
+     * 内部编号
+     */
+    private String internalNumber;
+
+    /**
+     * 所属公司ID（部门唯一标识(业务ID)）
+     */
+    private String deptBizId;
+
+    /**
+     * 所属公司名称（部门名称）
+     */
+    private String deptName;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    private Integer status;
+
+    /**
+     * 通用备注
+     */
+    private String remark;
+
+    /**
+     * 删除标识: 0-正常, 1-删除
+     */
+    private Integer isDeleted;
+
+    /**
+     * 创建人ID
+     */
+    private String creatorId;
+
+    /**
+     * 更新人ID
+     */
+    private String updaterId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/usersaleexpand/ApiUserSaleExpandPageResponse.java

+package com.yd.insurance.base.feign.response.usersaleexpand;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class ApiUserSaleExpandPageResponse {
+
+    /**
+     * 销售用户扩展表主键ID
+     */
+    private Long id;
+
+    /**
+     * 销售用户扩展唯一业务ID
+     */
+    private String userSaleBizId;
+
+    /**
+     * 系统用户唯一标识(业务ID)
+     */
+    private String userBizId;
+
+    /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+
+    /**
+     * 销售用户真实姓名
+     */
+    private String realName;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 性别(0:未知 1:男 2:女)
+     */
+    private Integer gender;
+
+    /**
+     * 内部编号
+     */
+    private String internalNumber;
+
+    /**
+     * 所属公司ID（部门唯一标识(业务ID)）
+     */
+    private String deptBizId;
+
+    /**
+     * 所属公司名称（部门名称）
+     */
+    private String deptName;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/usersignexpand/ApiUserSignExpandDetailResponse.java

+package com.yd.insurance.base.feign.response.usersignexpand;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class ApiUserSignExpandDetailResponse {
+
+    /**
+     * 签单用户扩展主键ID
+     */
+    private Long id;
+
+    /**
+     * 签单用户扩展唯一业务ID
+     */
+    private String userSignBizId;
+
+    /**
+     * 系统用户唯一标识(业务ID)
+     */
+    private String userBizId;
+
+    /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+
+    /**
+     * 签单用户真实姓名
+     */
+    private String realName;
+
+    /**
+     * 内部编号
+     */
+    private String internalNumber;
+
+    /**
+     * 执业编码
+     */
+    private String practiceCode;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 证件类型
+     */
+    private String cardType;
+
+    /**
+     * 证件号码
+     */
+    private String cardNo;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 性别(0:未知 1:男 2:女)
+     */
+    private Integer gender;
+
+    /**
+     * 所属公司ID（部门唯一标识(业务ID)）
+     */
+    private String deptBizId;
+
+    /**
+     * 所属公司名称（部门名称）
+     */
+    private String deptName;
+
+    /**
+     * 推荐等级：
+     *
+     * 一般
+     * 推荐
+     * 非常推荐
+     * 不推荐
+     */
+    private String recommendedLevel;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    private Integer status;
+
+    /**
+     * 通用备注
+     */
+    private String remark;
+
+    /**
+     * 删除标识: 0-正常, 1-删除
+     */
+    private Integer isDeleted;
+
+    /**
+     * 创建人ID
+     */
+    private String creatorId;
+
+    /**
+     * 更新人ID
+     */
+    private String updaterId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}

yd-insurance-base-feign/src/main/java/com/yd/insurance/base/feign/response/usersignexpand/ApiUserSignExpandPageResponse.java

+package com.yd.insurance.base.feign.response.usersignexpand;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class ApiUserSignExpandPageResponse {
+
+    /**
+     * 签单用户扩展表主键ID
+     */
+    private Long id;
+
+    /**
+     * 签单用户扩展唯一业务ID
+     */
+    private String userSignBizId;
+
+    /**
+     * 系统用户唯一标识(业务ID)
+     */
+    private String userBizId;
+
+    /**
+     * 客户端用户表唯一业务ID
+     */
+    private String clientUserBizId;
+
+    /**
+     * 签单用户真实姓名
+     */
+    private String realName;
+
+    /**
+     * 内部编号
+     */
+    private String internalNumber;
+
+    /**
+     * 执业编码
+     */
+    private String practiceCode;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 证件类型
+     */
+    private String cardType;
+
+    /**
+     * 证件号码
+     */
+    private String cardNo;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 性别(0:未知 1:男 2:女)
+     */
+    private Integer gender;
+
+    /**
+     * 所属公司ID（部门唯一标识(业务ID)）
+     */
+    private String deptBizId;
+
+    /**
+     * 所属公司名称（部门名称）
+     */
+    private String deptName;
+
+    /**
+     * 推荐等级：
+     *
+     * 一般
+     * 推荐
+     * 非常推荐
+     * 不推荐
+     */
+    private String recommendedLevel;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+}

yd-insurance-base-service/pom.xml

@@ -69,6 +69,18 @@
             <artifactId>yd-auth-core</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <!-- 框架配置模块 -->
+        <dependency>
+            <groupId>com.yd</groupId>
+            <artifactId>yd-framework</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- Feign组件配置模块 -->
+        <dependency>
+            <groupId>com.yd</groupId>
+            <artifactId>yd-feign</artifactId>
+            <version>${project.version}</version>
+        </dependency>
 
     </dependencies>
 </project>

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/InsuranceCategoryMapper.java

+package com.yd.insurance.base.service.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.insurance.base.feign.request.insurancecategory.ApiInsuranceCategoryPageRequest;
+import com.yd.insurance.base.feign.response.insurancecategory.ApiInsuranceCategoryPageResponse;
+import com.yd.insurance.base.service.model.InsuranceCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 保险险种表 Mapper 接口
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+public interface InsuranceCategoryMapper extends BaseMapper<InsuranceCategory> {
+
+    IPage<ApiInsuranceCategoryPageResponse> page(@Param("page") Page<ApiInsuranceCategoryPageResponse> page,
+                                                 @Param("request") ApiInsuranceCategoryPageRequest request);
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/InsuranceCompanyExpandMapper.java → yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/InsuranceCompanyClaimMapper.java

 package com.yd.insurance.base.service.dao;
 
-import com.yd.insurance.base.service.model.InsuranceCompanyExpand;
+import com.yd.insurance.base.service.model.InsuranceCompanyClaim;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 组织架构-保险公司扩展表 Mapper 接口
+ * 保险公司理赔支持表 Mapper 接口
  * </p>
  *
  * @author zxm
- * @since 2025-08-25
+ * @since 2025-12-22
  */
-public interface InsuranceCompanyExpandMapper extends BaseMapper<InsuranceCompanyExpand> {
+public interface InsuranceCompanyClaimMapper extends BaseMapper<InsuranceCompanyClaim> {
 
 }

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/InsuranceCompanyContactMapper.java

+package com.yd.insurance.base.service.dao;
+
+import com.yd.insurance.base.service.model.InsuranceCompanyContact;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 保险公司联系信息表 Mapper 接口
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+public interface InsuranceCompanyContactMapper extends BaseMapper<InsuranceCompanyContact> {
+
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/InsuranceCompanyMapper.java

+package com.yd.insurance.base.service.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.insurance.base.feign.request.insurancecompany.ApiInsuranceCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancecompany.ApiInsuranceCompanyPageResponse;
+import com.yd.insurance.base.service.model.InsuranceCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 保险公司表 Mapper 接口
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+public interface InsuranceCompanyMapper extends BaseMapper<InsuranceCompany> {
+
+    IPage<ApiInsuranceCompanyPageResponse> page(@Param("page") Page<ApiInsuranceCompanyPageResponse> page,
+                                                @Param("request") ApiInsuranceCompanyPageRequest request);
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/InsuranceCompanyMaterialMapper.java

+package com.yd.insurance.base.service.dao;
+
+import com.yd.insurance.base.service.model.InsuranceCompanyMaterial;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 保险公司文档资料表 Mapper 接口
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+public interface InsuranceCompanyMaterialMapper extends BaseMapper<InsuranceCompanyMaterial> {
+
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/InsuranceCompanyPaymentMapper.java

+package com.yd.insurance.base.service.dao;
+
+import com.yd.insurance.base.service.model.InsuranceCompanyPayment;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 保险公司缴费信息表 Mapper 接口
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+public interface InsuranceCompanyPaymentMapper extends BaseMapper<InsuranceCompanyPayment> {
+
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/InsuranceCompanyWebsiteMapper.java

+package com.yd.insurance.base.service.dao;
+
+import com.yd.insurance.base.service.model.InsuranceCompanyWebsite;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 保险公司网站表 Mapper 接口
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+public interface InsuranceCompanyWebsiteMapper extends BaseMapper<InsuranceCompanyWebsite> {
+
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/InsuranceReconciliationCompanyMapper.java

+package com.yd.insurance.base.service.dao;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.insurance.base.feign.request.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageRequest;
+import com.yd.insurance.base.feign.response.insurancereconciliationcompany.ApiInsuranceReconciliationCompanyPageResponse;
+import com.yd.insurance.base.service.model.InsuranceReconciliationCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 保险对账公司表 Mapper 接口
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-23
+ */
+public interface InsuranceReconciliationCompanyMapper extends BaseMapper<InsuranceReconciliationCompany> {
+
+    IPage<ApiInsuranceReconciliationCompanyPageResponse> page(@Param("page") Page<ApiInsuranceReconciliationCompanyPageResponse> page,
+                                                              @Param("request") ApiInsuranceReconciliationCompanyPageRequest request);
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/RelProductAnnouncementMapper.java

+package com.yd.insurance.base.service.dao;
+
+import com.yd.insurance.base.service.model.RelProductAnnouncement;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 产品和公告比例关系表 Mapper 接口
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-10-28
+ */
+public interface RelProductAnnouncementMapper extends BaseMapper<RelProductAnnouncement> {
+
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/UserSaleExpandMapper.java

 package com.yd.insurance.base.service.dao;
 
-import com.yd.insurance.base.service.model.UserSaleExpand;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.insurance.base.feign.request.usersaleexpand.ApiUserSaleExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersaleexpand.ApiUserSaleExpandPageResponse;
+import com.yd.insurance.base.service.model.UserSaleExpand;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -9,8 +14,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author zxm
- * @since 2025-08-25
+ * @since 2025-12-19
  */
 public interface UserSaleExpandMapper extends BaseMapper<UserSaleExpand> {
 
+    IPage<ApiUserSaleExpandPageResponse> page(@Param("page") Page<ApiUserSaleExpandPageResponse> page,
+                                              @Param("request") ApiUserSaleExpandPageRequest request);
 }

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dao/UserSignExpandMapper.java

 package com.yd.insurance.base.service.dao;
 
-import com.yd.insurance.base.service.model.UserSignExpand;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yd.insurance.base.feign.request.usersignexpand.ApiUserSignExpandPageRequest;
+import com.yd.insurance.base.feign.response.usersignexpand.ApiUserSignExpandPageResponse;
+import com.yd.insurance.base.service.model.UserSignExpand;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -9,8 +14,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author zxm
- * @since 2025-08-25
+ * @since 2025-12-19
  */
 public interface UserSignExpandMapper extends BaseMapper<UserSignExpand> {
 
+    IPage<ApiUserSignExpandPageResponse> page(@Param("page") Page<ApiUserSignExpandPageResponse> page,
+                                              @Param("request") ApiUserSignExpandPageRequest request);
 }

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dto/InsuranceCompanyDto.java

+package com.yd.insurance.base.service.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class InsuranceCompanyDto {
+
+    /**
+     * 保险公司表唯一业务ID
+     */
+    private String insuranceCompanyBizId;
+
+    /**
+     * 保险公司全称
+     */
+    private String fullName;
+
+    @Builder.Default
+    private Boolean isExcludeMy = false;
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dto/InsuranceProductDto.java

@@ -28,6 +28,11 @@ public class InsuranceProductDto {
     private List<String> productBizIdList;
 
     /**
+     * 保险产品代码集合
+     */
+    private List<String> productCodeList;
+
+    /**
      * 保险产品名称
      */
     private String productName;

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/dto/RelProductAnnouncementDto.java

+package com.yd.insurance.base.service.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RelProductAnnouncementDto {
+
+    /**
+     * 保险产品唯一标识(业务ID)集合
+     */
+    private List<String> productBizIdList;
+
+    /**
+     * 保险产品代码集合
+     */
+    private List<String> productCodeList;
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/InsuranceAdditionalProduct.java

@@ -41,6 +41,12 @@ public class InsuranceAdditionalProduct implements Serializable {
     private String productName;
 
     /**
+     * 保险附加产品代码
+     */
+    @TableField("product_code")
+    private String productCode;
+
+    /**
      * 保险附加产品类型
      */
     @TableField("product_type")
@@ -95,6 +101,12 @@ public class InsuranceAdditionalProduct implements Serializable {
     private String picture;
 
     /**
+     * 附加产品所属公司的所在地
+     */
+    @TableField("location")
+    private String location;
+
+    /**
      * 通用备注
      */
     @TableField("remark")

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/InsuranceCategory.java

+package com.yd.insurance.base.service.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 保险险种表
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+@Getter
+@Setter
+@TableName("insurance_category")
+public class InsuranceCategory implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 保险险种表唯一业务ID
+     */
+    @TableField("insurance_category_biz_id")
+    private String insuranceCategoryBizId;
+
+    /**
+     * 分类类别（区分是国内还是港险还是通用）
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 分类编码
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 分类名称（分类名称，中文显示名称。例如：储蓄险，医疗险，意外险。）
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 父级id
+     */
+    @TableField("pid")
+    private String pid;
+
+    /**
+     * 分类层级
+     */
+    @TableField("level")
+    private Integer level;
+
+    /**
+     * 排序
+     */
+    @TableField("sort_order")
+    private Integer sortOrder;
+
+    /**
+     * 图标链接。存储该类别的图标或图片URL，用于前端展示。
+     */
+    @TableField("icon_url")
+    private String iconUrl;
+
+    /**
+     * 父子路径
+     */
+    @TableField("path")
+    private String path;
+
+    /**
+     * 状态(0:停用 1:启用)
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 分类描述（分类描述，详细说明此分类的范围和特点。）
+     */
+    @TableField("description")
+    private String description;
+
+    /**
+     * 通用备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 删除标识: 0-正常, 1-删除
+     */
+    @TableField("is_deleted")
+    private Integer isDeleted;
+
+    /**
+     * 创建人ID
+     */
+    @TableField("creator_id")
+    private String creatorId;
+
+    /**
+     * 更新人ID
+     */
+    @TableField("updater_id")
+    private String updaterId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/InsuranceCompany.java

+package com.yd.insurance.base.service.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 保险公司表
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+@Getter
+@Setter
+@TableName("insurance_company")
+public class InsuranceCompany implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 保险公司表唯一业务ID
+     */
+    @TableField("insurance_company_biz_id")
+    private String insuranceCompanyBizId;
+
+    /**
+     * 部门组织表唯一业务ID
+     */
+    @TableField("dept_biz_id")
+    private String deptBizId;
+
+    /**
+     * 保险公司编码
+     */
+    @TableField("code")
+    private String code;
+
+    /**
+     * 保险公司全称
+     */
+    @TableField("full_name")
+    private String fullName;
+
+    /**
+     * 保险公司简称
+     */
+    @TableField("abbreviation")
+    private String abbreviation;
+
+    /**
+     * 保险公司英文全称
+     */
+    @TableField("en_full_name")
+    private String enFullName;
+
+    /**
+     * 保险公司英文简称
+     */
+    @TableField("en_abbreviation")
+    private String enAbbreviation;
+
+    /**
+     * 保险公司类型（财险、寿险、健康险、综合）
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 所属地区
+     */
+    @TableField("region")
+    private String region;
+
+    /**
+     * 保险公司介绍（支持HTML）
+     */
+    @TableField("introduction")
+    private String introduction;
+
+    /**
+     * 联系电话
+     */
+    @TableField("contact_phone")
+    private String contactPhone;
+
+    /**
+     * 联系邮箱
+     */
+    @TableField("contact_email")
+    private String contactEmail;
+
+    /**
+     * 官方网站
+     */
+    @TableField("official_website")
+    private String officialWebsite;
+
+    /**
+     * 公众号名称
+     */
+    @TableField("official_account_name")
+    private String officialAccountName;
+
+    /**
+     * 公众号二维码
+     */
+    @TableField("official_account_qr_code")
+    private String officialAccountQrCode;
+
+    /**
+     * 合作状态（合作中、已终止、未合作）
+     */
+    @TableField("cooperation_status")
+    private String cooperationStatus;
+
+    /**
+     * 通用备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 删除标识: 0-正常, 1-删除
+     */
+    @TableField("is_deleted")
+    private Integer isDeleted;
+
+    /**
+     * 创建人ID
+     */
+    @TableField("creator_id")
+    private String creatorId;
+
+    /**
+     * 更新人ID
+     */
+    @TableField("updater_id")
+    private String updaterId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/InsuranceCompanyClaim.java

+package com.yd.insurance.base.service.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 保险公司理赔支持表
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+@Getter
+@Setter
+@TableName("insurance_company_claim")
+public class InsuranceCompanyClaim implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 保险公司理赔支持表唯一业务ID
+     */
+    @TableField("insurance_company_claim_biz_id")
+    private String insuranceCompanyClaimBizId;
+
+    /**
+     * 保险公司表唯一业务ID
+     */
+    @TableField("insurance_company_biz_id")
+    private String insuranceCompanyBizId;
+
+    /**
+     * 理赔类型（医疗理赔、重疾理赔、死亡理赔、财产损失、其他）
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 理赔电话
+     */
+    @TableField("phone")
+    private String phone;
+
+    /**
+     * 理赔邮箱
+     */
+    @TableField("email")
+    private String email;
+
+    /**
+     * 理赔网站地址
+     */
+    @TableField("website_address")
+    private String websiteAddress;
+
+    /**
+     * 理赔材料
+     */
+    @TableField("material")
+    private String material;
+
+    /**
+     * 理赔流程
+     */
+    @TableField("process")
+    private String process;
+
+    /**
+     * 通用备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 删除标识: 0-正常, 1-删除
+     */
+    @TableField("is_deleted")
+    private Integer isDeleted;
+
+    /**
+     * 创建人ID
+     */
+    @TableField("creator_id")
+    private String creatorId;
+
+    /**
+     * 更新人ID
+     */
+    @TableField("updater_id")
+    private String updaterId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+}

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/InsuranceCompanyExpand.java → yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/InsuranceCompanyContact.java

@@ -11,16 +11,16 @@ import lombok.Setter;
 
 /**
  * <p>
- * 组织架构-保险公司扩展表
+ * 保险公司联系信息表
  * </p>
  *
  * @author zxm
- * @since 2025-08-25
+ * @since 2025-12-22
  */
 @Getter
 @Setter
-@TableName("insurance_company_expand")
-public class InsuranceCompanyExpand implements Serializable {
+@TableName("insurance_company_contact")
+public class InsuranceCompanyContact implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -28,46 +28,58 @@ public class InsuranceCompanyExpand implements Serializable {
     private Long id;
 
     /**
-     * 保险公司唯一业务ID
+     * 保险公司联系信息表唯一业务ID
      */
-    @TableField("company_biz_id")
-    private String companyBizId;
+    @TableField("insurance_company_contact_biz_id")
+    private String insuranceCompanyContactBizId;
 
     /**
-     * 组织唯一标识(业务ID)
+     * 保险公司表唯一业务ID
      */
-    @TableField("dept_biz_id")
-    private String deptBizId;
+    @TableField("insurance_company_biz_id")
+    private String insuranceCompanyBizId;
 
     /**
-     * 保险公司名称
+     * 联系类型（客服、理赔、核保、投诉、其他）
      */
-    @TableField("company_name")
-    private String companyName;
+    @TableField("contact_type")
+    private String contactType;
 
     /**
-     * 保险公司编码
+     * 联系电话
      */
-    @TableField("company_code")
-    private String companyCode;
+    @TableField("contact_phone")
+    private String contactPhone;
 
     /**
-     * 所属地区
+     * 联系邮箱
      */
-    @TableField("region")
-    private String region;
+    @TableField("contact_email")
+    private String contactEmail;
 
     /**
-     * 官方联系电话
+     * 联系微信
      */
-    @TableField("contact_phone")
-    private String contactPhone;
+    @TableField("contact_wechat")
+    private String contactWechat;
 
     /**
-     * 官方邮箱
+     * 公众号名称
      */
-    @TableField("contact_email")
-    private String contactEmail;
+    @TableField("official_account_name")
+    private String officialAccountName;
+
+    /**
+     * 公众号二维码
+     */
+    @TableField("official_account_qr_code")
+    private String officialAccountQrCode;
+
+    /**
+     * 网站地址
+     */
+    @TableField("website_address")
+    private String websiteAddress;
 
     /**
      * 通用备注

yd-insurance-base-service/src/main/java/com/yd/insurance/base/service/model/InsuranceCompanyMaterial.java

+package com.yd.insurance.base.service.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 保险公司文档资料表
+ * </p>
+ *
+ * @author zxm
+ * @since 2025-12-22
+ */
+@Getter
+@Setter
+@TableName("insurance_company_material")
+public class InsuranceCompanyMaterial implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 保险公司缴费信息表唯一业务ID
+     */
+    @TableField("insurance_company_material_biz_id")
+    private String insuranceCompanyMaterialBizId;
+
+    /**
+     * 保险公司表唯一业务ID
+     */
+    @TableField("insurance_company_biz_id")
+    private String insuranceCompanyBizId;
+
+    /**
+     * 材料类型
+     */
+    @TableField("type")
+    private String type;
+
+    /**
+     * 材料名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 材料地址
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 材料大小
+     */
+    @TableField("size")
+    private String size;
+
+    /**
+     * 材料版本
+     */
+    @TableField("version")
+    private String version;
+
+    /**
+     * 生效日
+     */
+    @TableField("effective_date")
+    private LocalDateTime effectiveDate;
+
+    /**
+     * 过期日
+     */
+    @TableField("expiration_date")
+    private LocalDateTime expirationDate;
+
+    /**
+     * 通用备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    /**
+     * 删除标识: 0-正常, 1-删除
+     */
+    @TableField("is_deleted")
+    private Integer isDeleted;
+
+    /**
+     * 创建人ID
+     */
+    @TableField("creator_id")
+    private String creatorId;
+
+    /**
+     * 更新人ID
+     */
+    @TableField("updater_id")
+    private String updaterId;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+}