Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/mapper/TSalaryAccountMapper.java
#	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/TSalaryStandardService.java
#	yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java
#	yifu-salary/yifu-salary-biz/src/main/resources/mapper/TSalaryAccountMapper.xml

k8s-bash-test/yifu-order-deployment.yaml

+apiVersion: apps/v1   # 指定api版本，此值必须在kubectl api-versions中
+kind: Deployment      # 指定创建资源的角色/类型
+metadata:             # 资源的元数据/属性
+  name: yifu-order     # 资源的名字，在同一个namespace中必须唯一
+  namespace: qas-mvp  # 部署在哪个namespace中
+spec:                 # 资源规范字段
+  selector:           # 选择器
+    matchLabels:      # 匹配标签
+      app: yifu-order
+  replicas: 1         # 声明副本数目
+  #revisionHistoryLimit: 3 # 保留历史版本
+  #strategy: # 策略
+  #  rollingUpdate: # 滚动更新
+  #    maxSurge: 30% # 最大额外可以存在的副本数，可以为百分比，也可以为整数
+  #    maxUnavailable: 30% # 示在更新过程中能够进入不可用状态的 Pod 的最大值，可以为百分比，也可以为整数
+  #  type: RollingUpdate # 滚动更新策略
+  template:           # 模版
+    metadata:         # 模版
+      labels:         # 设定资源的标签
+        app: yifu-order
+      annotations:
+        dapr.io/enabled: "true"                #设定此参数为 true 注入Dapr sidecar到pod
+        dapr.io/app-id: "yifu-order"            #应用程序唯一 ID。 用于服务发现、状态封装 和 发布/订阅 消费者ID
+        dapr.io/app-port: "5006"               #这个参数告诉Dapr你的应用程序正在监听哪个端口。
+        #dapr.io/log-level: "debug"             #为 Dapr sidecar设置日志级别。 允许的值是debug，info，warn，error。 默认是 info
+        #dapr.io/log-as-json: "false"           #将此参数设置为true以JSON格式输出日志。 默认值为 false.
+        #dapr.io/config: file   	           #告诉 Dapr 要使用哪个配置 CRD
+        dapr.io/app-protocol: "http"    	   #告诉 Dapr 你的应用程序正在使用哪种协议。 有效选项是 http and grpc。 Default is http
+        #dapr.io/app-max-concurrency: "20"	   #限制应用程序的并发量。 有效的数值是大于 0
+        #dapr.io/app-ssl: "false"	           #告诉Dapr通过不安全的SSL连接调用应用程序。 同时适用于HTTP和gRPC。 Traffic between your app and the Dapr sidecar is encrypted with a certificate issued by a non-trusted certificate authority, which is considered insecure. 默认值为 false.
+        dapr.io/metrics-port: "9090"	       #设置 sidecar 度量服务器的端口。 默认值为 9090
+        #dapr.io/sidecar-cpu-limit: 2	     #Dapr sidecar可以使用的最大CPU数量。  默认情况下未设置
+        #dapr.io/sidecar-memory-limit: "800Mi"	     #Dapr sidecar可以使用的最大内存量。默认情况下未设置 请参阅 https://kubernetes.io/docs/tasks/administer-cluster/manage-resources/quota-memory-cpu-namespace/ 的有效值。
+        #dapr.io/sidecar-cpu-request: 1	     #Dapr sidecar要求的 CPU 数量
+        #dapr.io/sidecar-memory-request	     #Dapr sidecar 请求的内存数量
+        dapr.io/http-max-request-size: "100"	     #增加http和grpc服务器请求正文参数的最大大小，单位为MB，以处理大文件的上传。 默认值为 4 MB
+        dapr.io/http-read-buffer-size: "16"   #Dapr has a default limit of 4KB for the http header read buffer size. When sending http headers that are bigger than the default 4KB, you can increase this value. Otherwise, you may encounter a Too big request header
+        dapr.io/sidecar-listen-addresses: "0.0.0.0"
+        # 更多dapr配置请参考 https://www.bookstack.cn/read/dapr-1.5-zh/cc77b74e2cc2f4d4.md
+
+    spec:             # 资源规范字段
+      nodeSelector:   # node 选择器
+        node-type: worker  # node标签
+        kubernetes.io/hostname: yfmaster1
+      containers:     # 容器
+        - name: yifu-order  # 容器的名字
+          image: hub.worfu.com/qas-mvp/yifu-order-biz:1.0.0 #临时地址
+          # image: 192.168.1.110:5500/qas-mvp/yifu-order-biz:1.0.0  # 容器镜像地址
+          imagePullPolicy: Always  # 每次Pod启动拉取镜像策略，三个选择 Always、Never、IfNotPresent
+                                   # Always，每次都检查；Never，每次都不检查（不管本地是否有）；IfNotPresent，如果本地有就不检查，如果没有就拉取（手动测试时，
+                                   # 已经打好镜像存在docker容器中时，使用存在不检查级别，
+                                   # 默认为每次都检查，然后会进行拉取新镜像，因镜像仓库不存在，导致部署失败）
+          ports:
+            - containerPort: 5006  # 容器端口
+          env:                     # 启动环境配置信息  active and timeZone set
+            - name: SPRING_PROFILES_ACTIVE
+              value: test
+            - name: TZ
+              value: Asia/Shanghai
+          resources:               #资源配置限制
+            limits:                # 最大使用
+              memory: "2048Mi"
+              #cpu: 300m # CPU，1核心 = 1000m
+            requests:             # 容器运行时，最低资源需求，也就是说最少需要多少资源容器才能正常运行
+              #cpu: 100m
+              memory: "500Mi"
+          #livenessProbe: # pod 内部健康检查的设置
+          #  httpGet: # 通过httpget检查健康，返回200-399之间，则认为容器正常
+          #    path: /healthCheck # URI地址
+          #    port: 8080 # 端口
+          #    scheme: HTTP # 协议
+          #    # host: 127.0.0.1 # 主机地址
+          #  initialDelaySeconds: 30 # 表明第一次检测在容器启动后多长时间后开始
+          #  timeoutSeconds: 5 # 检测的超时时间
+          #  periodSeconds: 30 # 检查间隔时间
+          #  successThreshold: 1 # 成功门槛
+          #  failureThreshold: 5 # 失败门槛，连接失败5次，pod杀掉，重启一个新的pod
+          #  readinessProbe: # Pod 准备服务健康检查设置
+           #   httpGet:
+           #     path: /healthCheck
+           #     port: 8080
+           #     scheme: HTTP
+           #   initialDelaySeconds: 30
+           #   timeoutSeconds: 5
+           #   periodSeconds: 10
+           #   successThreshold: 1
+           #   failureThreshold: 5
+            #也可以用这种方法
+            #exec: 执行命令的方法进行监测，如果其退出码不为0，则认为容器正常
+            #  command:
+            #    - cat
+            #    - /tmp/health
+            #也可以用这种方法
+            #tcpSocket: # 通过tcpSocket检查健康
+            #  port: number
+            #ports:
+            #  - name: http # 名称
+            #    containerPort: 8080 # 容器开发对外的端口
+            #    protocol: TCP # 协议
+      imagePullSecrets:        # 镜像仓库拉取密钥
+        - name: login
+      #affinity: # 亲和性调试
+      #  nodeAffinity: # 节点亲和力
+      #    requiredDuringSchedulingIgnoredDuringExecution: # pod 必须部署到满足条件的节点上
+      #      nodeSelectorTerms: # 节点满足任何一个条件就可以
+      #        - matchExpressions: # 有多个选项，则只有同时满足这些逻辑选项的节点才能运行 pod
+      #            - key: beta.kubernetes.io/arch
+      #              operator: In
+      #              values:
+      #                - amd64
\ No newline at end of file

k8s-bash-test/yifu-order-service.yaml

+apiVersion: v1                 # 指定api版本，此值必须在kubectl api-versions中
+kind: Service                  # 指定创建资源的角色/类型
+metadata:                      # 资源的元数据/属性
+  labels:                      # 设定资源的标签
+    app: yifu-order             # 资源的名字，在同一个namespace中必须唯一
+  name: yifu-order              # 资源的名字，在同一个namespace中必须唯一
+  namespace: qas-mvp           # 部署在哪个namespace中
+spec:                          # 资源规范字段
+  ports:
+    - port: 5006               # service 端口
+      protocol: TCP            # 协议
+      targetPort: 5006         # 容器暴露的端口
+      name: http-order              # 端口名称
+    - port: 3500               # service 端口
+      protocol: TCP            # 协议
+      targetPort: 3500         # 容器暴露的端口
+      name: http-order-dapr
+  selector:                    # 选择器
+    app: yifu-order             # 资源名称
+  type: ClusterIP              # ClusterIP 类型
\ No newline at end of file

pom.xml

@@ -101,6 +101,7 @@
 		<module>yifu-social</module>
         <module>yifu-insurances</module>
 		<module>yifu-salary</module>
+        <module>yifu-order</module>
 	</modules>
 
 	<dependencyManagement>

yifu-common/yifu-common-core/src/main/java/com/yifu.cloud.plus.v1/yifu/common/core/constant/CommonConstants.java

@@ -472,4 +472,5 @@ public interface CommonConstants {
 	 **/
 	public static final String PARAM_INFO_ERROR = "传参有误！";
 
+
 }

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/constants/InsurancesConstants.java

@@ -11,6 +11,10 @@ public class InsurancesConstants {
 	 * 新增
 	 */
 	public static final String ADD = "“新增”提交申请";
+	/**
+	 * 替换导出新增
+	 */
+	public static final String ADD_ = "新增";
 	/**
 	 * 离职
 	 */
@@ -985,8 +989,30 @@ public class InsurancesConstants {
 	 */
 	public static final String INSURANCE_ENCLOSURE_DELETE_ABNORMAL = "电子保单删除异常";
 
+	/**
+	 * 未结算
+	 */
+	public static final String SETTLE_ZERO = "未结算";
+
+	/**
+	 * 已结算
+	 */
+	public static final String SETTLE_ONE = "已结算";
+
+	/**
+	 * 结算中
+	 */
+	public static final String SETTLE_TWO = "结算中";
 
+	/**
+	 * 无需结算
+	 */
+	public static final String SETTLE_THREE = "无需结算";
 
+	/**
+	 * 订单编号不能为空
+	 */
+	public static final String ORDER_NO_IS_EMPTY = "订单编号不能为空";
 
 
 

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceDetail.java

@@ -285,5 +285,29 @@ public class TInsuranceDetail extends BaseEntity {
 	@Schema(description = "商险办理时间")
 	private LocalDateTime handledTime;
 
-    private static final long serialVersionUID = 1L;
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+	/**
+	 * 创建人所在部门
+	 */
+	@Schema(description = "创建人所在部门")
+	private String createUserDeptId;
+
+	/**
+	 * 创建人所在部门名称
+	 */
+	@Schema(description = "创建人所在部门名称")
+	private String createUserDeptName;
+
+
+
+
+
+
+
+	private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceEkp.java

@@ -5,6 +5,8 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -30,6 +32,11 @@ public class TInsuranceEkp implements Serializable {
      */
     private String defaultSettleId;
 
+	/**
+	 * 单据类型 (0、与薪资合并结算 1、单独结算)
+	 */
+	private Integer settleType;
+
     /**
      * 项目编码
      */
@@ -88,12 +95,12 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 保单开始时间
      */
-    private Date policyStart;
+    private LocalDate policyStart;
 
     /**
      * 保单结束时间
      */
-    private Date policyEnd;
+    private LocalDate policyEnd;
 
     /**
      * 购买标准
@@ -113,12 +120,12 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 实际保费
      */
-    private String actualPremium;
+    private BigDecimal actualPremium;
 
     /**
      * 预估保费
      */
-    private String estimatePremium;
+    private BigDecimal estimatePremium;
 
     /**
      * 结算月
@@ -128,12 +135,12 @@ public class TInsuranceEkp implements Serializable {
     /**
      * 单据状态
      */
-    private String interactiveType;
+    private Integer interactiveType;
 
     /**
      * 重发标识
      */
-    private String resendFlag;
+    private Integer resendFlag;
 
     /**
      * 创建时间

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/entity/TInsuranceRefund.java

@@ -32,6 +32,12 @@ public class TInsuranceRefund extends BaseEntity {
 	@Schema(description = "保单信息主键")
     private String insDetailId;
 
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
     /**
      * 减员状态
      */
@@ -56,7 +62,17 @@ public class TInsuranceRefund extends BaseEntity {
 	@Schema(description = "是否删除 0否/1是")
 	private Integer deleteFlag;
 
+	/**
+	 * 创建人所在部门
+	 */
+	@Schema(description = "创建人所在部门")
+	private String createUserDeptId;
 
+	/**
+	 * 创建人所在部门名称
+	 */
+	@Schema(description = "创建人所在部门名称")
+	private String createUserDeptName;
 
 
 	private static final long serialVersionUID = 1L;

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/util/EKPUtil.java

@@ -88,6 +88,7 @@ public class EKPUtil {
 		TInsuranceSettlePushParam pushParam = insuranceDetail2PushParam(param);
 		try{
 			String formValues = new ObjectMapper().writeValueAsString(pushParam);
+			log.info("formValues:"+formValues);
 			//指向EKP的接口url
 			//把ModelingAppModelParameterAddForm转换成MultiValueMap
 			JSONObject loginName = new JSONObject();
@@ -104,7 +105,7 @@ public class EKPUtil {
 			//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
 			wholeForm.add("formValues", formValues);
 			//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
-			System.out.println("wholeForm:"+wholeForm);
+			//System.out.println("wholeForm:"+wholeForm);
 			HttpHeaders headers = new HttpHeaders();
 			//如果EKP对该接口启用了Basic认证，那么客户端需要加入
 			//addAuth(headers,"yourAccount"+":"+"yourPassword");是VO，则使用APPLICATION_JSON

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListOrderParam.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-29 11:57:55
+ */
+@Data
+public class InsuranceListOrderParam {
+
+	private String orderNo;
+
+	private List<InsuranceAddParam> data;
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListParam.java

@@ -22,6 +22,12 @@ public class InsuranceListParam implements Serializable {
 	@Schema(description = "项目编码")
 	private String deptNo;
 
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
 	/**
 	 * 投保状态 1待投保 2投保中 3已投保 4投保退回 5 已减员
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceListVO.java

@@ -104,6 +104,12 @@ public class InsuranceListVO implements Serializable {
 	@Schema(description = "创建人(派单人)")
 	private String createName;
 
+	/**
+	 * 创建人部门名称
+	 */
+	@Schema(description = "创建人部门名称(派单人)")
+	private String createUserDeptName;
+
 	/**
 	 * 创建者
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceOrderBatchParam.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-29 12:13:48
+ */
+@Data
+public class InsuranceOrderBatchParam {
+	private String orderNo;
+
+	private List<InsuranceBatchParam> data;
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceOrderRefundParam.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-29 12:35:52
+ */
+@Data
+public class InsuranceOrderRefundParam {
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+	private List<InsuranceRefundCheck> data;
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceOrderReplaceParam.java

+package com.yifu.cloud.plus.v1.yifu.insurances.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-29 12:29:28
+ */
+@Data
+public class InsuranceOrderReplaceParam {
+	private String orderNo;
+
+	private List<InsuranceReplaceParam> data;
+}

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/InsuranceRefundCheck.java

@@ -23,6 +23,12 @@ public class InsuranceRefundCheck implements Serializable {
 	@Schema(description = "主键")
 	private String id;
 
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
 	/**
 	 * 员工姓名
 	 */

yifu-insurances/yifu-insurances-api/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/vo/SettleVo.java

@@ -15,23 +15,28 @@ import java.io.Serializable;
 @Tag(name = "EKP结算信息表")
 public class SettleVo implements Serializable {
 
+	/**
+	 * 主键id
+	 */
+	private String id;
+
 	/**
 	 * 结算id
 	 */
 	@Schema(description = "结算id")
-	private String fd_3b05ba46bb042e;
+	private String detailId;
 
 	/**
 	 * 预估单结算状态
 	 */
 	@Schema(description = "预估单结算状态:未结算、已结算、结算中、无需结算")
-	private String fd_3b05ba4808a3ca;
+	private String estimateStatus;
 
 	/**
 	 * 实缴单结算状态
 	 */
 	@Schema(description = "实缴单结算状态:未结算、已结算、结算中、无需结算")
-	private String fd_3b05bd5ed0b976;
+	private String actualStatus;
 
 
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/config/EkpDataSourceConfig.java

+package com.yifu.cloud.plus.v1.yifu.insurances.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.config.MybatisPlusMetaObjectHandler;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.plugins.YifuPaginationInnerInterceptor;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionFactoryBean;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.sql.DataSource;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-25 17:03:43
+ */
+@Configuration
+@MapperScan(basePackages = "com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp", sqlSessionTemplateRef = "ekpSqlSessionTemplate", sqlSessionFactoryRef = "ekpSqlSessionFactory")
+public class EkpDataSourceConfig {
+	/**
+	 * 配置ekp的数据源
+	 * @return
+	 */
+	@Bean(name="ekpDataSource")
+	@ConfigurationProperties(prefix = "spring.datasource.ekp")
+	public DataSource ekpDataSource() {
+			return DataSourceBuilder.create().build();
+		}
+
+	/**
+	 * 配置该数据源的sql会话工厂
+	 * @param dataSource
+	 * @return
+	 * @throws Exception
+	 */
+	@Bean
+	public SqlSessionFactory ekpSqlSessionFactory(@Qualifier("ekpDataSource") DataSource dataSource) throws Exception {
+		MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+		bean.setDataSource(dataSource);
+		//添加XML目录
+		ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+		try {
+			bean.setMapperLocations(resolver.getResources("classpath:mapper/ekp/*.xml"));
+			//分页插件配置,不配置分页插件无效,否则会出现total为0的情况
+			bean.setPlugins(ekpPlusInterceptor());
+			return bean.getObject();
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+/*		MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+		bean.setDataSource(dataSource);
+		MybatisConfiguration configuration = new MybatisConfiguration();
+		configuration.setMapUnderscoreToCamelCase(true);
+		bean.setConfiguration(configuration);
+		bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/ekp/*.xml"));
+		return bean.getObject();*/
+	}
+
+	/**
+	 * 配置该数据源的事务管理器
+	 * @param dataSource
+	 * @return
+	 */
+	@Bean
+	public DataSourceTransactionManager ekpTransactionManager(@Qualifier("ekpDataSource") DataSource dataSource) {
+		return new DataSourceTransactionManager(dataSource);
+	}
+
+	/**
+	 * 配置ekp数据源的sql会话模板
+	 * @param sqlSessionFactory
+	 * @return
+	 */
+	@Bean
+	public SqlSessionTemplate ekpSqlSessionTemplate(@Qualifier("ekpSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
+		return new SqlSessionTemplate(sqlSessionFactory);
+	}
+	/**
+	 * 配置ekp数据源的事务模板
+	 * @param dataSourceTransactionManager
+	 * @return
+	 */
+	@Bean
+	public TransactionTemplate ekpTransactionTemplate(@Qualifier("ekpTransactionManager") DataSourceTransactionManager dataSourceTransactionManager) {
+		return new TransactionTemplate(dataSourceTransactionManager);
+	}
+
+	@Bean
+	public MybatisPlusInterceptor ekpPlusInterceptor() {
+		MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+		interceptor.addInnerInterceptor(new YifuPaginationInnerInterceptor());
+		return interceptor;
+	}
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/config/InsurancesDataSourceConfig.java

+package com.yifu.cloud.plus.v1.yifu.insurances.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.core.MybatisConfiguration;
+import com.baomidou.mybatisplus.core.config.GlobalConfig;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.config.MybatisPlusMetaObjectHandler;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.plugins.YifuPaginationInnerInterceptor;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.SqlSessionTemplate;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.sql.DataSource;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-25 16:57:06
+ */
+@Configuration
+@MapperScan(basePackages = "com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances", sqlSessionTemplateRef = "insurancesSqlSessionTemplate", sqlSessionFactoryRef = "insurancesSqlSessionFactory")
+public class InsurancesDataSourceConfig {
+
+	@Bean(name = "insurancesDataSource")
+    @ConfigurationProperties(prefix = "spring.datasource.insurances")
+	@Primary
+    public DataSource insurancesDataSource() {
+		         return DataSourceBuilder.create().build();
+	}
+	@Bean
+     public SqlSessionFactory insurancesSqlSessionFactory(@Qualifier("insurancesDataSource") DataSource dataSource) throws Exception {
+
+		MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+		bean.setDataSource(dataSource);
+		//多数据源 myMetaObjectHandler不起作用问题解决
+		GlobalConfig globalConfig = new GlobalConfig();
+		globalConfig.setMetaObjectHandler(new MybatisPlusMetaObjectHandler());
+		globalConfig.setDbConfig(new GlobalConfig.DbConfig());
+		globalConfig.setBanner(false);
+		bean.setGlobalConfig(globalConfig);
+		//添加XML目录
+		ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+		try {
+			bean.setMapperLocations(resolver.getResources("classpath:mapper/insurances/*.xml"));
+			//分页插件配置,不配置分页插件无效,否则会出现total为0的情况
+			bean.setPlugins(insurancesPlusInterceptor());
+			SqlSessionFactory sqlSessionFactory = bean.getObject();
+			sqlSessionFactory.getConfiguration().setMapUnderscoreToCamelCase(true);
+			return sqlSessionFactory;
+		} catch (Exception e) {
+			e.printStackTrace();
+			throw new RuntimeException(e);
+		}
+
+/*		MybatisSqlSessionFactoryBean bean = new MybatisSqlSessionFactoryBean();
+		bean.setDataSource(dataSource);
+		MybatisConfiguration configuration = new MybatisConfiguration();
+		configuration.setMapUnderscoreToCamelCase(true);
+		bean.setConfiguration(configuration);
+		bean.setMapperLocations(new PathMatchingResourcePatternResolver().getResources("classpath:mapper/insurances/*.xml"));
+		return bean.getObject();*/
+	}
+
+
+	@Bean(name = "insurancesTransactionManager")
+	@Primary
+	public DataSourceTransactionManager insurancesTransactionManager(@Qualifier("insurancesDataSource") DataSource dataSource) {
+		         return new DataSourceTransactionManager(dataSource);
+	}
+	@Bean
+     public SqlSessionTemplate insurancesSqlSessionTemplate(@Qualifier("insurancesSqlSessionFactory") SqlSessionFactory sqlSessionFactory) {
+		        return new SqlSessionTemplate(sqlSessionFactory);
+	}
+	@Bean
+	public TransactionTemplate insurancesTransactionTemplate(@Qualifier("insurancesTransactionManager") DataSourceTransactionManager dataSourceTransactionManager) {
+	         return new TransactionTemplate(dataSourceTransactionManager);
+   }
+
+	@Bean
+	public MybatisPlusInterceptor insurancesPlusInterceptor() {
+		MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+		interceptor.addInnerInterceptor(new YifuPaginationInnerInterceptor());
+		return interceptor;
+	}
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceCompanyController.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceCompanyService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceDetailController.java

@@ -11,7 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.common.security.annotation.Inner;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.Dept;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.*;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -119,7 +119,7 @@ public class TInsuranceDetailController {
 	@Operation(summary = "投保新增", description = "投保新增")
 	@PostMapping("/addInsurance")
 	public R<List<InsuranceAddParam>> addInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceAddParam> paramList){
-		return tInsuranceDetailService.addInsurance(paramList);
+		return tInsuranceDetailService.addInsurance(paramList,null);
 	}
 
 	/**
@@ -132,7 +132,7 @@ public class TInsuranceDetailController {
 	@Operation(summary = "投保批增", description = "投保批增")
 	@PostMapping("/batchInsurance")
 	public R<List<InsuranceBatchParam>> batchInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceBatchParam> paramList){
-		return tInsuranceDetailService.batchInsurance(paramList);
+		return tInsuranceDetailService.batchInsurance(paramList,null);
 	}
 
 	/**
@@ -145,7 +145,7 @@ public class TInsuranceDetailController {
 	@Operation(summary = "投保替换", description = "投保替换")
 	@PostMapping("/replaceInsurance")
 	public R<List<InsuranceReplaceParam>> replaceInsurance(@RequestBody @Valid @Size(min = 1,message = "集合不能为空") List<InsuranceReplaceParam> paramList){
-		return tInsuranceDetailService.replaceInsurance(paramList);
+		return tInsuranceDetailService.replaceInsurance(paramList,null);
 	}
 
 	/**
@@ -288,7 +288,7 @@ public class TInsuranceDetailController {
 	 */
 	@PostMapping("/saveInsuranceRefund")
 	public R saveInsuranceRefund(@RequestBody @Valid @Size(min = 1,message = "导入减员列表不能为空") List<InsuranceRefundCheck> insuranceRefundCheckList){
-		return tInsuranceDetailService.saveInsuranceRefund(insuranceRefundCheckList);
+		return tInsuranceDetailService.saveInsuranceRefund(insuranceRefundCheckList,null);
 	}
 
 	/**
@@ -353,7 +353,7 @@ public class TInsuranceDetailController {
 	 */
 	@Operation(summary = "已减员列表分页查询", description = "已减员列表分页查询")
 	@PostMapping("/getInsuranceRefundPageList")
-	public R<IPage<InsuranceRefundListVo>> getInsuranceRefundPageList(Page<InsuranceRefundParam> page, @RequestBody InsuranceRefundParam param) {
+	public R getInsuranceRefundPageList(Page<InsuranceRefundParam> page, @RequestBody InsuranceRefundParam param) {
 		return tInsuranceDetailService.getInsuranceRefundPageList(page,param);
 	}
 
@@ -524,4 +524,57 @@ public class TInsuranceDetailController {
 	public R<IPage<InsuranceListByIdCardVo>> getInsuranceListByIdCard(Page page, String idCard,String deptNo) {
 		return new R<>(tInsuranceDetailService.getInsuranceListByIdCard(page, idCard,deptNo));
 	}
+
+	/**
+	 * 商险新增
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R<List<InsuranceAddParam>>}
+	 */
+	@Operation(summary = "投保新增", description = "投保新增")
+	@PostMapping("/addOrderInsurance")
+	public R<List<InsuranceAddParam>> addOrderInsurance(@RequestBody InsuranceListOrderParam paramList ){
+		return tInsuranceDetailService.addOrderInsurance(paramList);
+	}
+
+	/**
+	 * 商险批增
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R<List<InsuranceBatchParam>>}
+	 */
+	@Operation(summary = "投保批增", description = "投保批增")
+	@PostMapping("/batchOrderInsurance")
+	public R<List<InsuranceBatchParam>> batchOrderInsurance(@RequestBody InsuranceOrderBatchParam paramList){
+		return tInsuranceDetailService.batchOrderInsurance(paramList);
+	}
+
+	/**
+	 * 商险替换
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R<List<InsuranceReplaceParam>>}
+	 */
+	@Operation(summary = "投保替换", description = "投保替换")
+	@PostMapping("/replaceOrderInsurance")
+	public R<List<InsuranceReplaceParam>> replaceOrderInsurance(@RequestBody InsuranceOrderReplaceParam paramList){
+		return tInsuranceDetailService.replaceOrderInsurance(paramList);
+	}
+
+	/**
+	 * 导入减员校验
+	 * @param paramList 导入减员校验
+	 * @author zhaji
+	 * @date 2022-07-19
+	 * @since v1.0
+	 */
+	@PostMapping("/refundOrderInsurance")
+	public R refundOrderInsurance(@RequestBody InsuranceOrderRefundParam paramList){
+		return tInsuranceDetailService.refundOrderInsurance(paramList);
+	}
+
+
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceEkpController.java

 package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEkpService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceEnclosureController.java

 package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEnclosure;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEnclosureService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEnclosureService;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceEnclosureParam;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListParam;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO;
-import com.yifu.cloud.plus.v1.yifu.salary.entity.TSalaryAtta;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -21,7 +16,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.IOException;
-import java.net.URL;
 
 /**
  * @author zhaji

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeController.java

@@ -4,21 +4,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceRefundHandlingParam;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeService;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @author zhaji

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeRateController.java

@@ -2,19 +2,16 @@ package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeRateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeRateService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * @author zhaji

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/controller/TInsuranceTypeStandardController.java

@@ -2,15 +2,13 @@ package com.yifu.cloud.plus.v1.yifu.insurances.controller;
 
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.log.annotation.SysLog;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeStandardService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeStandardService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/ekp/EkpSettleMapper.java

+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp;
+
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-26 09:12:46
+ */
+@Mapper
+public interface EkpSettleMapper {
+	/**
+	 * 获取结算信息
+	 *
+	 * @author zhaji
+	 * @param id
+	 * @return {@link SettleVo}
+	 */
+	SettleVo getSettle(String id);
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceCompanyMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceCompanyMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceDetailMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceDetailMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -84,6 +84,15 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 */
 	void updatePolicyNoBatch(@Param("details") List<TInsuranceDetail> details);
 
+	/**
+	 * 批量更新发票号
+	 *
+	 * @author licancan
+	 * @param details
+	 * @return void
+	 */
+	void updateInvoiceNoBatch(@Param("details") List<TInsuranceDetail> details);
+
 	/***********************减员办理********************************/
 
 	/**
@@ -188,7 +197,22 @@ public interface TInsuranceDetailMapper extends BaseMapper<TInsuranceDetail> {
 	 */
 	IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, @Param("idCard") String idCard, @Param("deptNo")String deptNo);
 
+	/**
+	 * 查询所有在保，未出险，未过期，未失效，未减员的保单信息
+	 *
+	 * @author zhaji
+	 * @param empIdcardNo
+	 * @return {@link List< TInsuranceDetail>}
+	 */
 	List<TInsuranceDetail> selectListByempIdcardNo(String empIdcardNo);
 
+	/**
+	 * 	查数据是否存在权限范围内
+	 *
+	 * @author zhaji
+	 * @param regionSQL
+	 * @param id
+	 * @return {@link TInsuranceDetail}
+	 */
 	TInsuranceDetail selectByregionSQL(@Param("regionSql") String regionSQL,@Param("id") String id);
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceEkpMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceEkpMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceEnclosureMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceEnclosureMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceOperateMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceOperateMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceRefundMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceRefundMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
 * @author Administrator
@@ -22,7 +23,7 @@ public interface TInsuranceRefundMapper extends BaseMapper<TInsuranceRefund> {
 	 */
     TInsuranceRefund getByInsDetailId(String id);
 
-	void updateByInsDetailId(TInsuranceRefund insuranceRefund);
+	void updateByInsDetailId(@Param("param") TInsuranceRefund insuranceRefund);
 
 	int updateRefundMoney(TInsuranceRefund insuranceRefund);
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceReplaceMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceReplaceMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceSettleCancelMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceSettleCancelMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceSettleMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceSettleMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceTypeMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeRateMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceTypeRateMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/TInsuranceTypeStandardMapper.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/mapper/insurances/TInsuranceTypeStandardMapper.java

-package com.yifu.cloud.plus.v1.yifu.insurances.mapper;
+package com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/EkpSettleService.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-26 09:25:36
+ */
+public interface EkpSettleService extends IService<TInsuranceTypeRate> {
+
+	/**
+	 * 新增保险公司
+	 *
+	 * @author zhaji
+	 * @param id 新增类
+	 * @return {@link R}
+	 */
+	SettleVo getSettle(String id);
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/ekp/impl/EkpSettleServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpSettleMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * @author zhaji
+ * @description TODO
+ * @date 2022-08-26 09:25:51
+ */
+@Service
+public class EkpSettleServiceImpl implements EkpSettleService {
+
+	@Resource
+	EkpSettleMapper ekpSettleMapper;
+	@Override
+	public SettleVo getSettle(String id) {
+		return ekpSettleMapper.getSettle(id);
+	}
+
+	@Override
+	public boolean saveBatch(Collection<TInsuranceTypeRate> entityList, int batchSize) {
+		return false;
+	}
+
+	@Override
+	public boolean saveOrUpdateBatch(Collection<TInsuranceTypeRate> entityList, int batchSize) {
+		return false;
+	}
+
+	@Override
+	public boolean updateBatchById(Collection<TInsuranceTypeRate> entityList, int batchSize) {
+		return false;
+	}
+
+	@Override
+	public boolean saveOrUpdate(TInsuranceTypeRate entity) {
+		return false;
+	}
+
+	@Override
+	public TInsuranceTypeRate getOne(Wrapper<TInsuranceTypeRate> queryWrapper, boolean throwEx) {
+		return null;
+	}
+
+	@Override
+	public Map<String, Object> getMap(Wrapper<TInsuranceTypeRate> queryWrapper) {
+		return null;
+	}
+
+	@Override
+	public <V> V getObj(Wrapper<TInsuranceTypeRate> queryWrapper, Function<? super Object, V> mapper) {
+		return null;
+	}
+
+	@Override
+	public BaseMapper<TInsuranceTypeRate> getBaseMapper() {
+		return null;
+	}
+
+	@Override
+	public Class<TInsuranceTypeRate> getEntityClass() {
+		return null;
+	}
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceEkpServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
-import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceEkpMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEkpService;
-import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils;
-import com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam;
-import org.apache.commons.collections.CollectionUtils;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
-* @author Administrator
-* @description 针对表【t_insurance_ekp(ekp交互失败存储表)】的数据库操作Service实现
-* @createDate 2022-08-23 17:02:49
-*/
-@Service
-public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, TInsuranceEkp> implements TInsuranceEkpService {
-
-	@Override
-	public R resend() {
-		List<TInsuranceEkp> ekpRefundList = this.baseMapper.getEkpRefundList();
-		if (CollectionUtils.isNotEmpty(ekpRefundList)){
-			for (TInsuranceEkp tInsuranceEkp : ekpRefundList) {
-				EKPInteractiveParam ekpParam = new EKPInteractiveParam();
-				BeanCopyUtils.copyProperties(tInsuranceEkp,ekpParam);
-				String detailId = ekpParam.getDetailId();
-				String defaultSettleId = ekpParam.getDefaultSettleId();
-				//查询当前结算状态
-				String status = CommonConstants.ONE_STRING;
-				if(status.equals(CommonConstants.ONE_STRING)){
-
-				}
-			}
-			return R.ok("发送成功");
-		}else{
-			return R.failed("无需要发送的信息");
-		}
-	}
-}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceCompanyService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceCompanyService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceDetailService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceDetailService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -75,7 +75,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param paramList
 	 * @return {@link R<List<InsuranceAddParam>>}
 	 */
-	R<List<InsuranceAddParam>> addInsurance(List<InsuranceAddParam> paramList);
+	R<List<InsuranceAddParam>> addInsurance(List<InsuranceAddParam> paramList,String orderNo);
 
 	/**
 	 * 商险批增
@@ -84,7 +84,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param paramList
 	 * @return {@link R<List<InsuranceBatchParam>>}
 	 */
-	R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList);
+	R<List<InsuranceBatchParam>> batchInsurance(List<InsuranceBatchParam> paramList,String orderNo);
 	/**
 	 * 商险替换
 	 *
@@ -92,7 +92,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param paramList
 	 * @return {@link R<List<InsuranceReplaceParam>>}
 	 */
-	R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList);
+	R<List<InsuranceReplaceParam>> replaceInsurance(List<InsuranceReplaceParam> paramList,String orderNo);
 
 	/**
 	 * 通过id删除
@@ -187,7 +187,7 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @param insuranceRefundCheckList 减员表
 	 * @return {@link R}
 	 */
-	R saveInsuranceRefund(List<InsuranceRefundCheck> insuranceRefundCheckList);
+	R saveInsuranceRefund(List<InsuranceRefundCheck> insuranceRefundCheckList,String orderNo);
 
 	/**
 	 * 已投保列表分页查询
@@ -354,4 +354,33 @@ public interface TInsuranceDetailService extends IService<TInsuranceDetail> {
 	 * @return {@link R}
 	 */
 	IPage<InsuranceListByIdCardVo> getInsuranceListByIdCard(Page<TInsuranceDetail> page, String idCard,String deptNo);
+
+	/**
+	 * 新增订单商险
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R< List< InsuranceReplaceParam>>}
+	 */
+	R<List<InsuranceAddParam>> addOrderInsurance(InsuranceListOrderParam paramList);
+
+	/**
+	 * 批增订单商险
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R< List< InsuranceBatchParam>>}
+	 */
+	R<List<InsuranceBatchParam>> batchOrderInsurance(InsuranceOrderBatchParam paramList);
+
+	/**
+	 * 替换订单商险
+	 *
+	 * @author zhaji
+	 * @param paramList
+	 * @return {@link R< List< InsuranceReplaceParam>>}
+	 */
+	R<List<InsuranceReplaceParam>> replaceOrderInsurance(InsuranceOrderReplaceParam paramList);
+
+	R refundOrderInsurance(InsuranceOrderRefundParam paramList);
 }

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceEkpService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceEkpService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceEnclosureService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceEnclosureService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceOperateService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceOperateService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceRefundService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceRefundService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceReplaceService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceReplaceService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceSettleCancelService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceSettleCancelService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceSettleService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceSettleService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceTypeRateService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceTypeRateService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceTypeService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceTypeService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/TInsuranceTypeStandardService.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/TInsuranceTypeStandardService.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceCompanyServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceCompanyServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -14,13 +14,14 @@ import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceCompanyMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceCompanyMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceCompanyService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -102,6 +103,7 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 	 * @return {@link R}
 	 */
 	@Override
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R updateInsuranceCompany(TInsuranceCompany insuranceCompany) {
 		YifuUser user = SecurityUtils.getUser();
 		String id = insuranceCompany.getId();
@@ -164,6 +166,7 @@ public class TInsuranceCompanyServiceImpl extends ServiceImpl<TInsuranceCompanyM
 	 * @return {@link R}
 	 */
 	@Override
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R deleteById(String id) {
 		YifuUser user = SecurityUtils.getUser();
 		LambdaQueryWrapper<TInsuranceCompany> queryWrapper = new LambdaQueryWrapper<>();

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEkpServiceImpl.java

+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp;
+import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEkpMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.ekp.EkpSettleService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceDetailService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService;
+import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils;
+import com.yifu.cloud.plus.v1.yifu.insurances.util.BigDecimalUtils;
+import com.yifu.cloud.plus.v1.yifu.insurances.util.EKPUtil;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam;
+import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* @author Administrator
+* @description 针对表【t_insurance_ekp(ekp交互失败存储表)】的数据库操作Service实现
+* @createDate 2022-08-23 17:02:49
+*/
+@Service
+@Slf4j
+public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, TInsuranceEkp> implements TInsuranceEkpService {
+
+	@Resource
+	TInsuranceSettleService tInsuranceSettleService;
+	@Resource
+	@Lazy
+	TInsuranceDetailService tInsuranceDetailService;
+
+	@Resource
+	@Lazy
+	EkpSettleService ekpSettleService;
+
+
+	@Override
+	public R resend() {
+		List<TInsuranceEkp> ekpRefundList = this.baseMapper.getEkpRefundList();
+		List<TInsuranceEkp> failList = new ArrayList<>();
+		List<TInsuranceEkp> successLit = new ArrayList<>();
+		SettleVo settle = ekpSettleService.getSettle("12345");
+		String actualStatus = settle.getActualStatus();
+		log.info("settle:"+settle.toString());
+		log.info("actualStatus:"+actualStatus);
+		if (CollectionUtils.isNotEmpty(ekpRefundList)){
+			for (TInsuranceEkp tInsuranceEkp : ekpRefundList) {
+				Integer pushType = tInsuranceEkp.getPushType();
+				LambdaQueryWrapper<TInsuranceSettle> queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(TInsuranceSettle :: getId,tInsuranceEkp.getDefaultSettleId());
+				TInsuranceSettle insuranceSettle = tInsuranceSettleService.getOne(queryWrapper);
+				//如果当前需要重发预估保费的数据已发送，则过滤掉执行下一条数据
+				if(CommonConstants.ONE_INT == pushType && CommonConstants.ONE_INT == insuranceSettle.getIsEstimatePush()){
+					tInsuranceEkp.setResendFlag(CommonConstants.THREE_INT);
+					failList.add(tInsuranceEkp);
+					continue;
+				}
+				//如果当前需要重发实际保费的数据已发送，则过滤掉执行下一条数据
+				if(CommonConstants.TWO_INT == pushType && CommonConstants.ONE_INT == insuranceSettle.getIsActualPush()){
+					tInsuranceEkp.setResendFlag(CommonConstants.THREE_INT);
+					failList.add(tInsuranceEkp);
+					continue;
+				}
+				EKPInteractiveParam ekpParam = new EKPInteractiveParam();
+				BeanCopyUtils.copyProperties(tInsuranceEkp,ekpParam);
+				String detailId = ekpParam.getDetailId();
+				String defaultSettleId = ekpParam.getDefaultSettleId();
+				//查询当前结算状态
+				String status = CommonConstants.ONE_STRING;
+				if(actualStatus.equals(InsurancesConstants.SETTLE_ZERO)){
+					String s = EKPUtil.sendToEKP(ekpParam);
+					//如果发送成功
+					if (StringUtils.isNotBlank(s)){
+						//预估则更新预估保费
+						if(CommonConstants.ONE_INT == pushType){
+							LambdaUpdateWrapper<TInsuranceSettle> updateWrapper = new LambdaUpdateWrapper<>();
+							updateWrapper.eq(TInsuranceSettle :: getId,tInsuranceEkp.getDefaultSettleId())
+									.set(TInsuranceSettle :: getIsEstimatePush,CommonConstants.ONE_INT)
+									.set(TInsuranceSettle :: getEstimatePushTime, LocalDateTime.now());
+							tInsuranceSettleService.update(updateWrapper);
+						}
+						//预估则更新预估保费
+						if(CommonConstants.TWO_INT == pushType){
+							LambdaUpdateWrapper<TInsuranceSettle> updateWrapper = new LambdaUpdateWrapper<>();
+							updateWrapper.eq(TInsuranceSettle :: getId,tInsuranceEkp.getDefaultSettleId())
+									.set(TInsuranceSettle :: getIsActualPush,CommonConstants.ONE_INT)
+									.set(TInsuranceSettle :: getActualPushTime, LocalDateTime.now());
+							tInsuranceSettleService.update(updateWrapper);
+						}
+						//结算月则变更结算月
+						if(CommonConstants.THREE_INT == pushType){
+							LambdaUpdateWrapper<TInsuranceDetail> updateWrapper = new LambdaUpdateWrapper<>();
+							updateWrapper.eq(TInsuranceDetail :: getId,tInsuranceEkp.getDetailId())
+									.set(TInsuranceDetail :: getSettleMonth,tInsuranceEkp.getSettleMonth())
+									.set(TInsuranceDetail :: getUpdateTime, LocalDateTime.now());
+							tInsuranceDetailService.update(updateWrapper);
+						}
+						tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
+						successLit.add(tInsuranceEkp);
+					}else{
+						break;
+					}
+
+				}else{
+					//如果为作废信息，已结算和结算中发送红冲数据
+					if(CommonConstants.FOUR_INT == pushType){
+						//预估保费
+						BigDecimal estimatePremium = ekpParam.getEstimatePremium();
+						//实际保费
+						BigDecimal actualPremium = ekpParam.getActualPremium();
+						if(!BigDecimalUtils.isNullOrZero(estimatePremium)){
+							ekpParam.setEstimatePremium(estimatePremium.negate());
+						}
+						if(!BigDecimalUtils.isNullOrZero(actualPremium)){
+							ekpParam.setActualPremium(actualPremium.negate());
+						}
+						ekpParam.setInteractiveType(CommonConstants.ONE_INT);
+						String s = EKPUtil.sendToEKP(ekpParam);
+						if(StringUtils.isNotBlank(s)){
+							tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
+							successLit.add(tInsuranceEkp);
+						}else{
+							break;
+						}
+					//如果为红冲数据则正常发送
+					}else if(CommonConstants.FIVE_INT == pushType || CommonConstants.SIX_INT == pushType){
+						String s = EKPUtil.sendToEKP(ekpParam);
+						if(StringUtils.isNotBlank(s)){
+							tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
+							successLit.add(tInsuranceEkp);
+						}else{
+							break;
+						}
+					}else{
+						tInsuranceEkp.setResendFlag(CommonConstants.TWO_INT);
+						failList.add(tInsuranceEkp);
+					}
+				}
+			}
+			updateBatchById(successLit);
+			updateBatchById(failList);
+			return R.ok("发送成功");
+		}else{
+			return R.failed("无需要发送的信息");
+		}
+	}
+}

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceEnclosureServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEnclosureServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -7,13 +7,12 @@ import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.OSSUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
-import com.yifu.cloud.plus.v1.yifu.common.core.vo.FileVo;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEnclosure;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceEnclosureMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceEnclosureService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEnclosureMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEnclosureService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceEnclosureParam;
 import lombok.extern.slf4j.Slf4j;
@@ -54,6 +53,7 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
 	 */
 	@Override
 	public R uploadInsuranceEnclosure(MultipartFile file, String filePath, String remark) throws IOException {
+		YifuUser user = SecurityUtils.getUser();
 		if(Common.isEmpty(file)){
 			return R.failed(InsurancesConstants.INSURANCE_ENCLOSURE_IS_EMPTY);
 		}
@@ -85,8 +85,10 @@ public class TInsuranceEnclosureServiceImpl extends ServiceImpl<TInsuranceEnclos
 					insuranceEnclosure.setRemark(remark);
 				}
 			}
-			insuranceEnclosure.setEnclosureName(enclosureName);
+			insuranceEnclosure.setEnclosureName(file.getOriginalFilename());
 			insuranceEnclosure.setEnclosureAddress(key);
+			insuranceEnclosure.setCreateName(user.getNickname());
+			insuranceEnclosure.setCreateTime(LocalDateTime.now());
 			try {
 				this.save(insuranceEnclosure);
 			} catch (Exception e) {

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceOperateServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceOperateServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceOperateMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceOperateMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
 import org.springframework.stereotype.Service;
 
 

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceRefundServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceRefundServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceRefundMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceRefundService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceRefundMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceRefundService;
 import org.springframework.stereotype.Service;
 
 /**

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceReplaceServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceReplaceServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceReplace;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceReplaceMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceReplaceService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceReplaceMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceReplaceService;
 import org.springframework.stereotype.Service;
 
 /**

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceSettleCancelServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceSettleCancelServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceSettleCancelMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceSettleCancelService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceSettleCancelMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleCancelService;
 import org.springframework.stereotype.Service;
 
 /**

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceSettleServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceSettleServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceSettleMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceSettleService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceSettleMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService;
 import org.springframework.stereotype.Service;
 
 /**

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeRateServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceTypeRateServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
@@ -11,10 +10,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeRateMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeRateService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeRateMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeRateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -67,7 +66,7 @@ public class TInsuranceTypeRateServiceImpl extends ServiceImpl<TInsuranceTypeRat
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R deleteInsuranceTypeRate(String id) {
 		YifuUser user = SecurityUtils.getUser();
 		if(Common.isEmpty(id)){
@@ -95,7 +94,7 @@ public class TInsuranceTypeRateServiceImpl extends ServiceImpl<TInsuranceTypeRat
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R saveInsuranceTypeRate(TInsuranceTypeRate insuranceTypeRate) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(insuranceTypeRate)){

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceTypeServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,10 +12,10 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceCompanyService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceCompanyService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceTypeVo;
 import org.apache.commons.lang3.StringUtils;
@@ -61,7 +61,7 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R saveInsuranceType(TInsuranceType insuranceType) {
 		if(Common.isEmpty(insuranceType)){
 			return R.failed("新增的险种信息为空");
@@ -136,7 +136,7 @@ public class TInsuranceTypeServiceImpl extends ServiceImpl<TInsuranceTypeMapper,
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R updateInsuranceType(TInsuranceType insuranceType) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(insuranceType.getId())){

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/impl/TInsuranceTypeStandardServiceImpl.java → yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceTypeStandardServiceImpl.java

-package com.yifu.cloud.plus.v1.yifu.insurances.service.impl;
+package com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -9,15 +9,13 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
 import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
-import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType;
 import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard;
-import com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeStandardMapper;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceDetailService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceOperateService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeService;
-import com.yifu.cloud.plus.v1.yifu.insurances.service.TInsuranceTypeStandardService;
+import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeStandardMapper;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceOperateService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeService;
+import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceTypeStandardService;
 import com.yifu.cloud.plus.v1.yifu.insurances.util.ValidityUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -71,7 +69,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R deleteInsuranceTypeStandard(String id) {
 		YifuUser user = SecurityUtils.getUser();
 		if(Common.isEmpty(id)){
@@ -98,7 +96,7 @@ public class TInsuranceTypeStandardServiceImpl extends ServiceImpl<TInsuranceTyp
 	 * @return {@link R}
 	 */
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(value = "insurancesTransactionManager" ,rollbackFor = {Exception.class})
 	public R saveInsuranceTypeStandard(TInsuranceTypeStandard insuranceTypeStandard) {
 		YifuUser user = SecurityUtils.getUser();
 		if (Common.isEmpty(insuranceTypeStandard)){

yifu-insurances/yifu-insurances-biz/src/main/resources/application-test.yml

@@ -10,17 +10,19 @@ spring:
     port: 22379
     password: '@yf_2017'
   datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    username: root
-    password: yf_zsk
-    url: jdbc:mysql://192.168.1.65:22306/mvp_insurances?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    insurances:
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      username: root
+      password: yf_zsk
+      jdbc-url: jdbc:mysql://192.168.1.65:22306/mvp_insurances?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    ekp:
+      type: com.zaxxer.hikari.HikariDataSource
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      username: hroread
+      password: 123456
+      jdbc-url: jdbc:mysql://119.96.192.73:3306/ekp?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     hikari:
-      driver-class-name: ${spring.datasource.driver-class-name}
-      jdbc-url: ${spring.datasource.url}
-      username: ${spring.datasource.username}
-      password: ${spring.datasource.password}
-      pool-name: AmytangHikariCP
       minimum-idle: 10 # 最小空闲连接数量
       idle-timeout: 60000 # 空闲连接存活最大时间，默认600000（10分钟）
       maximum-pool-size: 12 # 连接池最大连接数，默认是10

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/ekp/EkpSettleMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+		PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.ekp.EkpSettleMapper">
+
+	<resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo">
+		<id property="id" column="fd_id" jdbcType="VARCHAR"/>
+		<result property="detailId" column="fd_3b05ba46bb042e" jdbcType="VARCHAR"/>
+		<result property="estimateStatus" column="fd_3b05ba4808a3ca" jdbcType="VARCHAR"/>
+		<result property="actualStatus" column="fd_3b05bd5ed0b976" jdbcType="VARCHAR"/>
+	</resultMap>
+
+	<sql id="Base_Column_List">
+		fd_id,fd_3b05ba46bb042e,fd_3b05ba4808a3ca,fd_3b05bd5ed0b976
+	</sql>
+
+	<select id="getSettle" resultMap="BaseResultMap">
+		select
+			<include refid="Base_Column_List"></include>
+		from
+			ekp_f80727b647a403b975ae
+		where
+			fd_3b05ba46bb042e = #{id}
+	</select>
+</mapper>
+
+
+
+

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceCompanyMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceCompanyMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceCompanyMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceCompanyMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceCompany">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceDetailMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceDetailMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail">
             <id property="id" column="ID" jdbcType="VARCHAR"/>
@@ -53,6 +53,9 @@
             <result property="deleteFlag" column="DELETE_FLAG" jdbcType="TINYINT"/>
 			<result property="handledBy" column="HANDLED_BY" jdbcType="VARCHAR"/>
 			<result property="handledTime" column="HANDLED_TIME" jdbcType="TIMESTAMP"/>
+			<result property="orderNo" column="ORDER_NO" jdbcType="VARCHAR"/>
+			<result property="createUserDeptId" column="CREATE_USER_DEPT_ID" jdbcType="VARCHAR"/>
+			<result property="createUserDeptName" column="CREATE_USER_DEPT_NAME" jdbcType="VARCHAR"/>
 	</resultMap>
 
     <sql id="Base_Column_List">
@@ -67,7 +70,8 @@
         BUY_HANDLE_STATUS,DEFAULT_SETTLE_ID,REDUCE_HANDLE_STATUS,
         IS_USE,IS_EFFECT,IS_OVERDUE,REMARK,
         CREATE_BY,CREATE_NAME,CREATE_TIME,
-        UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID,HANDLED_BY,HANDLED_TIME
+        UPDATE_BY,UPDATE_TIME,DELETE_FLAG,DEFAULT_SETTLE_ID,HANDLED_BY,HANDLED_TIME,ORDER_NO,CREATE_USER_DEPT_ID,CREATE_USER_DEPT_NAME
+
 	</sql>
 	<!--投保分页查询-->
 	<select id="getInsuranceListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceListVO">
@@ -86,12 +90,16 @@
 		detail.CREATE_NAME as createName,
 		detail.BUY_HANDLE_STATUS as buyHandleStatus,
 		detail.SETTLE_TYPE as settleType,
+		detail.CREATE_USER_DEPT_NAME as createUserDeptName,
 		detail.SETTLE_MONTH as settleMonth
 		from t_insurance_detail detail
 		where detail.DELETE_FLAG = 0
 		<if test="param.deptNo != null and param.deptNo.trim() != ''">
 			and detail.DEPT_NO = #{param.deptNo}
 		</if>
+		<if test="param.orderNo != null and param.orderNo.trim() != ''">
+			and detail.DEPT_NO = #{param.orderNo}
+		</if>
 		<if test="param.deptNo == null or param.deptNo.trim() == ''">
 			and detail.DEPT_NO in
 			<foreach collection="param.deptNoList" index="index" item="item" open="(" separator="," close=")">
@@ -392,6 +400,12 @@
 		</foreach>
 	</update>
 
+	<update id="updateInvoiceNoBatch">
+		<foreach collection="details" index="index" item="item" separator=";">
+			update t_insurance_detail set INVOICE_NO = #{item.invoiceNo} where ID = #{item.id}
+		</foreach>
+	</update>
+
 	<!-- ***********************减员办理******************************** -->
 	<!-- 已投保列表分页查询-->
 	<select id="getInsuredListPage" resultType="com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuredListVo">

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceEkpMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceEkpMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceEkpMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEkpMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp">
             <id property="id" column="id" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceEnclosureMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceEnclosureMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceEnclosureMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceEnclosureMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEnclosure">
             <id property="id" column="ID" jdbcType="INTEGER"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceOperateMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceOperateMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceOperateMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceOperateMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceOperate">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceRefundMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceRefundMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceRefundMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceRefundMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceRefund">
             <id property="id" column="ID" jdbcType="BIGINT"/>
@@ -13,23 +13,51 @@
             <result property="createTime" column="CREATE_TIME" jdbcType="TIMESTAMP"/>
             <result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
             <result property="createName" column="CREATE_NAME" jdbcType="VARCHAR"/>
-    </resultMap>
+			<result property="createBy" column="CREATE_BY" jdbcType="VARCHAR"/>
+			<result property="orderNo" column="ORDER_NO" jdbcType="VARCHAR"/>
+			<result property="createUserDeptId" column="CREATE_USER_DEPT_ID" jdbcType="VARCHAR"/>
+			<result property="createUserDeptName" column="CREATE_USER_DEPT_NAME" jdbcType="VARCHAR"/>
+	</resultMap>
 
     <sql id="Base_Column_List">
         ID,INS_DETAIL_ID,REDUCE_HANDLE_STATUS,
         REFUND_MONEY,REMARK,CREATE_TIME,
-        CREATE_BY,CREATE_NAME
+        CREATE_BY,CREATE_NAME,ORDER_NO,CREATE_USER_DEPT_ID,CREATE_USER_DEPT_NAME
 	</sql>
 	<update id="updateByInsDetailId">
 		update
 			t_insurance_refund
 		set
-			REDUCE_HANDLE_STATUS = #{reduceHandleStatus},
-			REMARK = #{remark},
-			UPDATE_BY = #{createBy},
-			UPDATE_TIME = #{createTime}
+			<if test="param.createName != null and param.createName.trim() != ''">
+				CREATE_NAME= #{param.createName},
+			</if>
+			<if test="param.createBy != null and param.createBy.trim() != ''">
+				CREATE_BY = #{param.createBy},
+			</if>
+			<if test="param.createTime != null">
+				CREATE_TIME = #{param.createTime},
+			</if>
+			<if test="param.updateBy != null and param.updateBy.trim() != ''">
+				UPDATE_BY = #{param.updateBy},
+			</if>
+			<if test="param.updateTime != null ">
+				UPDATE_TIME = #{param.updateTime},
+			</if>
+			<if test="param.createUserDeptName != null and param.createUserDeptName.trim() != ''">
+				CREATE_USER_DEPT_NAME= #{param.createUserDeptName},
+			</if>
+			<if test="param.createUserDeptId != null and param.createUserDeptId.trim() != ''">
+				CREATE_USER_DEPT_ID = #{param.createUserDeptId},
+			</if>
+			<if test="param.orderNo != null and param.orderNo.trim() != ''">
+				ORDER_NO = #{param.orderNo},
+			</if>
+			<if test="param.remark != null and param.remark.trim() != ''">
+				REMARK = #{param.remark},
+			</if>
+			REDUCE_HANDLE_STATUS = #{param.reduceHandleStatus}
 		where
-			INS_DETAIL_ID = #{insDetailId}
+			INS_DETAIL_ID = #{param.insDetailId}
 	</update>
 	<update id="updateRefundMoney">
 		update

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceReplaceMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceReplaceMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceReplaceMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceReplaceMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceReplace">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceSettleCancelMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceSettleCancelMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceSettleCancelMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceSettleCancelMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettleCancel">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceSettleMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceSettleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceSettleMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceSettleMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceSettle">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceTypeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceType">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeRateMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceTypeRateMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeRateMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeRateMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeRate">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/TInsuranceTypeStandardMapper.xml → yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceTypeStandardMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.TInsuranceTypeStandardMapper">
+<mapper namespace="com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceTypeStandardMapper">
 
     <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceTypeStandard">
             <id property="id" column="ID" jdbcType="VARCHAR"/>

yifu-order/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<artifactId>yifu</artifactId>
+		<groupId>com.yifu.cloud.plus.v1</groupId>
+		<version>1.0.0</version>
+	</parent>
+	<artifactId>yifu-order</artifactId>
+	<packaging>pom</packaging>
+
+	<!--项目子模块-->
+	<modules>
+		<module>yifu-order-api</module>
+		<module>yifu-order-biz</module>
+	</modules>
+
+</project>
\ No newline at end of file

yifu-order/yifu-order-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>yifu</artifactId>
+		<groupId>com.yifu.cloud.plus.v1</groupId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>yifu-order-api</artifactId>
+	<packaging>jar</packaging>
+	<description>yifu-order 接口模块</description>
+
+	<dependencies>
+		<!-- core 工具类 -->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-core</artifactId>
+		</dependency>
+		<!--swagger 注解-->
+		<dependency>
+			<groupId>io.swagger.core.v3</groupId>
+			<artifactId>swagger-annotations</artifactId>
+		</dependency>
+		<!--mybatis 依赖-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-mybatis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>fastjson</artifactId>
+		</dependency>
+	</dependencies>
+
+</project>
\ No newline at end of file

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/constants/OrderConstants.java

+package com.yifu.cloud.plus.v1.yifu.order.constants;
+
+/**
+ * @author licancan
+ * @description 订单常量
+ * @date 2022-08-29 11:36:21
+ */
+public class OrderConstants {
+	/**
+	 * 状态不合法
+	 */
+	public static final String STATUS_ERROR = "状态不合法";
+	/**
+	 * 数据不存在
+	 */
+	public static final String DATA_IS_EMPTY = "数据不存在";
+	/**
+	 * 订单id不可为空
+	 */
+	public static final String ORDER_ID_IS_EMPTY = "订单id不可为空";
+	/**
+	 * 订单已办结，不可操作
+	 */
+	public static final String ORDER_IS_HANDLED= "订单已办结，不可操作";
+	/**
+	 * 操作成功
+	 */
+	public static final String OPERATE_SUCCESS = "操作成功";
+}

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/entity/TOrder.java

+package com.yifu.cloud.plus.v1.yifu.order.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author licancan
+ * @description 订单表 t_order
+ * @date 2022-08-26 17:20:16
+ */
+@Data
+@TableName("t_order")
+@Schema(description = "订单表")
+public class TOrder implements Serializable {
+    /**
+     * 主键
+     */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+    private String id;
+
+    /**
+     * 订单编号
+     */
+	@Schema(description = "订单编号")
+    private String orderNo;
+
+    /**
+     * 客户名称
+     */
+	@Schema(description = "客户名称")
+    private String customerName;
+
+    /**
+     * 项目名称
+     */
+	@Schema(description = "项目名称")
+    private String deptName;
+
+    /**
+     * 项目编码
+     */
+	@Schema(description = "项目编码")
+    private String deptNo;
+
+    /**
+     * 订单状态 0待办理 1办理中 2已办结
+     */
+	@Schema(description = "订单状态 0待办理 1办理中 2已办结")
+    private Integer orderStatus;
+
+    /**
+     * 订单内容
+     */
+	@Schema(description = "订单内容")
+    private String orderContent;
+
+    /**
+     * 创建人姓名（下单人）
+     */
+	@Schema(description = "创建人姓名（下单人）")
+    private String createName;
+
+    /**
+     * 创建时间（下单时间）
+     */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "创建时间（下单时间）")
+	@TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+	@Schema(description = "更新人")
+    private String updateBy;
+
+    /**
+     * 更新人姓名
+     */
+	@Schema(description = "更新人姓名")
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "更新时间")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 是否删除 0未删除/1删除
+     */
+	@Schema(description = "是否删除 0未删除/1删除")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
+
+}
\ No newline at end of file

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/entity/TOrderEnclosure.java

+package com.yifu.cloud.plus.v1.yifu.order.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author licancan
+ * @description 订单附件表 t_order_enclosure
+ * @date 2022-08-26 17:20:16
+ */
+@Data
+@TableName("t_order_enclosure")
+@Schema(description = "订单附件表")
+public class TOrderEnclosure implements Serializable {
+    /**
+     * 主键
+     */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+    private Integer id;
+
+    /**
+     * 订单编号
+     */
+	@Schema(description = "订单编号")
+    private String orderNo;
+
+    /**
+     * 附件名
+     */
+	@Schema(description = "附件名")
+    private String enclosureName;
+
+    /**
+     * 备注
+     */
+	@Schema(description = "备注")
+    private String remark;
+
+    /**
+     * 附件标识 0订单附件 1回复附件
+     */
+	@JsonIgnore
+    private Integer enclosureFlag;
+
+    /**
+     * 附件地址
+     */
+	@Schema(description = "附件地址")
+    private String enclosureAddress;
+
+    /**
+     * 删除标识
+     */
+	@Schema(description = "删除标识")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/entity/TOrderReply.java

+package com.yifu.cloud.plus.v1.yifu.order.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author licancan
+ * @description 订单回复表 t_order_reply
+ * @date 2022-08-26 17:20:16
+ */
+@Data
+@TableName("t_order_reply")
+@Schema(description = "订单回复表")
+public class TOrderReply implements Serializable {
+    /**
+     * 主键
+     */
+	@TableId(type = IdType.ASSIGN_ID)
+	@Schema(description = "主键")
+    private Integer id;
+
+    /**
+     * 订单编号
+     */
+	@Schema(description = "订单编号")
+    private String orderNo;
+
+    /**
+     * 回复内容
+     */
+	@Schema(description = "回复内容")
+    private String replyContent;
+
+    /**
+     * 创建人姓名（回复人）
+     */
+	@Schema(description = "创建人姓名（回复人）")
+    private String createName;
+
+    /**
+     * 创建时间（回复时间）
+     */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "创建时间（回复时间）")
+	@TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 删除标识
+     */
+	@Schema(description = "删除标识")
+    private Integer deleteFlag;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderListParam.java

+package com.yifu.cloud.plus.v1.yifu.order.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author licancan
+ * @description 订单列表入参
+ * @date 2022-08-29 09:10:02
+ */
+@Data
+@Schema(description = "订单列表入参")
+public class OrderListParam implements Serializable {
+	private static final long serialVersionUID = 2575913025864285604L;
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+	/**
+	 * 订单开始时间
+	 */
+	@Schema(description = "订单开始时间")
+	private String startDate;
+
+	/**
+	 * 订单结束时间
+	 */
+	@Schema(description = "订单结束时间")
+	private String endDate;
+
+	/**
+	 * 创建人姓名（下单人）
+	 */
+	@Schema(description = "创建人姓名（下单人）")
+	private String createName;
+
+	/**
+	 * 客户名称
+	 */
+	@Schema(description = "客户名称")
+	private String customerName;
+
+	/**
+	 * 项目名称
+	 */
+	@Schema(description = "项目名称")
+	private String deptName;
+
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 订单状态 0待办理 1办理中 2已办结
+	 */
+	@Schema(description = "订单状态 0待办理 1办理中 2已办结")
+	private Integer orderStatus;
+
+	/**
+	 * 订单id集合
+	 */
+	@Schema(description = "订单id集合")
+	private List<String> idList;
+
+}

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderListVO.java

+package com.yifu.cloud.plus.v1.yifu.order.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author licancan
+ * @description 订单列表VO
+ * @date 2022-08-29 09:16:07
+ */
+@Data
+@Schema(description = "订单列表VO")
+public class OrderListVO implements Serializable{
+	private static final long serialVersionUID = 4067597933537194227L;
+
+	/**
+	 * 主键
+	 */
+	@Schema(description = "主键")
+	private String id;
+
+	/**
+	 * 订单编号
+	 */
+	@Schema(description = "订单编号")
+	private String orderNo;
+
+	/**
+	 * 创建时间（下单时间）
+	 */
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+	@Schema(description = "创建时间（下单时间）")
+	private LocalDateTime createTime;
+
+	/**
+	 * 创建人姓名（下单人）
+	 */
+	@Schema(description = "创建人姓名（下单人）")
+	private String createName;
+
+	/**
+	 * 客户名称
+	 */
+	@Schema(description = "客户名称")
+	private String customerName;
+
+	/**
+	 * 项目名称
+	 */
+	@Schema(description = "项目名称")
+	private String deptName;
+
+	/**
+	 * 项目编码
+	 */
+	@Schema(description = "项目编码")
+	private String deptNo;
+
+	/**
+	 * 订单状态 0待办理 1办理中 2已办结
+	 */
+	@Schema(description = "订单状态 0待办理 1办理中 2已办结")
+	private Integer orderStatus;
+}

yifu-order/yifu-order-biz/Dockerfile

+FROM moxm/java:1.8-full
+
+RUN mkdir -p /yifu-order-biz
+
+WORKDIR yifu-order-biz
+
+ARG JAR_FILE=target/yifu-order-biz.jar
+
+COPY ${JAR_FILE} app.jar
+
+EXPOSE 5002
+
+ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom"
+
+CMD sleep 60; java -jar app.jar $JAVA_OPTS

yifu-order/yifu-order-biz/build-prd.sh

+#!/usr/bin/env bash
+mvn clean package -Pprd -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file

yifu-order/yifu-order-biz/build-test.sh

+#!/usr/bin/env bash
+mvn clean package -Ptest -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file

yifu-order/yifu-order-biz/build.sh

+#!/usr/bin/env bash
+mvn clean package -Dmaven.test.skip=true docker:build -DpushImage
\ No newline at end of file

yifu-order/yifu-order-biz/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<artifactId>yifu</artifactId>
+		<groupId>com.yifu.cloud.plus.v1</groupId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>yifu-order-biz</artifactId>
+	<packaging>jar</packaging>
+	<description>yifu-order 业务模块</description>
+
+	<dependencies>
+		<!-- seata 依赖 -->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-seata</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-order-api</artifactId>
+			<version>1.0.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<!--选配: orm 模块-->
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		<!--必备：安全模块-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-security</artifactId>
+		</dependency>
+		<!--必备：日志处理-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-log</artifactId>
+		</dependency>
+		<!--必备：swagger-->
+		<dependency>
+			<groupId>com.yifu.cloud.plus.v1</groupId>
+			<artifactId>yifu-common-swagger</artifactId>
+		</dependency>
+		<!--必备：undertow容器-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<version>5.8.0</version>
+			<artifactId>hutool-all</artifactId>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/commons-collections/commons-collections -->
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>3.2.2</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<serverId>docker-hub</serverId>
+					<!--指定生成的镜像名-->
+					<imageName>${my.hub.host}/${map.group.name}/${project.artifactId}:${project.version}</imageName>
+					<dockerDirectory>${project.basedir}/</dockerDirectory>
+					<!--指定远程 docker api地址-->
+					<!--<dockerHost>http://172.16.66.232:2375</dockerHost>-->
+					<!--  这里是复制 jar 包到 docker 容器指定目录配置-->
+					<resources>
+						<resource>
+							<targetPath>/</targetPath>
+							<!--jar 包所在的路径  此处配置的 即对应 target 目录-->
+							<directory>${project.build.directory}</directory>
+							<!-- 需要包含的 jar包 ，这里对应的是 Dockerfile中添加的文件名　-->
+							<include>${project.build.finalName}.jar</include>
+						</resource>
+					</resources>
+					<forceTags>true</forceTags>
+				</configuration>
+			</plugin>
+		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>**/*.xlsx</exclude>
+					<exclude>**/*.xls</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>false</filtering>
+				<includes>
+					<include>**/*.xlsx</include>
+					<include>**/*.xls</include>
+				</includes>
+			</resource>
+		</resources>
+	</build>
+
+</project>
\ No newline at end of file

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/YifuOrderApplication.java

+package com.yifu.cloud.plus.v1.yifu.order;
+
+import com.yifu.cloud.plus.v1.yifu.common.security.annotation.EnableYifuResourceServer;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @author licancan
+ * @description 项目启动类
+ * @date 2022-08-26 14:39:44
+ */
+@EnableYifuResourceServer
+@SpringBootApplication
+public class YifuOrderApplication {
+	public static void main(String[] args) {
+		SpringApplication.run(YifuOrderApplication.class, args);
+	}
+}

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/controller/OrderController.java

+package com.yifu.cloud.plus.v1.yifu.order.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
+import com.yifu.cloud.plus.v1.yifu.order.service.TOrderService;
+import com.yifu.cloud.plus.v1.yifu.order.vo.OrderListParam;
+import com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author licancan
+ * @description 订单controller
+ * @date 2022-08-29 09:05:23
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/order")
+@Tag(name = "订单相关")
+public class OrderController {
+	@Resource
+	private TOrderService tOrderService;
+
+	/**
+	 * 订单列表分页查询
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link R<IPage<OrderListVO>>}
+	 */
+	@Operation(summary = "订单列表分页查询", description = "订单列表分页查询")
+	@GetMapping("/getOrderPageList")
+	public R<IPage<OrderListVO>> getOrderPageList(Page<OrderListParam> page, OrderListParam param) {
+		return R.ok(tOrderService.getOrderPageList(page,param));
+	}
+
+	/**
+	 * 订单列表不分页查询
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link R<List<OrderListVO>>}
+	 */
+	@Operation(summary = "订单列表不分页查询", description = "订单列表不分页查询")
+	@GetMapping("/getOrderList")
+	public R<List<OrderListVO>> getOrderList(OrderListParam param) {
+		return R.ok(tOrderService.getOrderList(param));
+	}
+
+	/**
+	 * 变更订单状态
+	 *
+	 * @author licancan
+	 * @param id
+	 * @param status
+	 * @return {@link R< String>}
+	 */
+	@GetMapping("/handleOrder")
+	@Operation(summary = "变更订单状态", description = "变更订单状态")
+	public R<String> handleOrder(@RequestParam String id,@RequestParam Integer status) {
+		return tOrderService.handleOrder(id,status);
+	}
+
+}

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/mapper/TOrderEnclosureMapper.java

+package com.yifu.cloud.plus.v1.yifu.order.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.order.entity.TOrderEnclosure;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author licancan
+ * @description 针对表【t_order_enclosure(订单附件表)】的数据库操作Mapper
+ * @date 2022-08-26 17:22:18
+ */
+@Mapper
+public interface TOrderEnclosureMapper extends BaseMapper<TOrderEnclosure> {
+
+
+}

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/mapper/TOrderMapper.java

+package com.yifu.cloud.plus.v1.yifu.order.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yifu.cloud.plus.v1.yifu.order.entity.TOrder;
+import com.yifu.cloud.plus.v1.yifu.order.vo.OrderListParam;
+import com.yifu.cloud.plus.v1.yifu.order.vo.OrderListVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author licancan
+ * @description 针对表【t_order(订单表)】的数据库操作Mapper
+ * @date 2022-08-26 17:22:18
+ */
+@Mapper
+public interface TOrderMapper extends BaseMapper<TOrder> {
+
+	/**
+	 * 订单列表分页查询
+	 *
+	 * @author licancan
+	 * @param page
+	 * @param param
+	 * @return {@link IPage<OrderListVO>}
+	 */
+    IPage<OrderListVO> getOrderPageList(Page<OrderListParam> page,@Param("param") OrderListParam param);
+
+	/**
+	 * 导出勾选查询结果
+	 *
+	 * @author licancan
+	 * @param idList
+	 * @return {@link List<OrderListVO>}
+	 */
+	List<OrderListVO> getOrderListBySelect(@Param("idList") List<String> idList);
+
+	/**
+	 * 导出非勾选查询结果
+	 *
+	 * @author licancan
+	 * @param param
+	 * @return {@link List< OrderListVO>}
+	 */
+	List<OrderListVO> getOrderList(@Param("param") OrderListParam param);
+}

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/mapper/TOrderReplyMapper.java

+package com.yifu.cloud.plus.v1.yifu.order.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yifu.cloud.plus.v1.yifu.order.entity.TOrderReply;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author licancan
+ * @description 针对表【t_order_reply(订单回复表)】的数据库操作Mapper
+ * @date 2022-08-26 17:22:18
+ */
+@Mapper
+public interface TOrderReplyMapper extends BaseMapper<TOrderReply> {
+
+
+}

yifu-order/yifu-order-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/order/service/TOrderEnclosureService.java

+package com.yifu.cloud.plus.v1.yifu.order.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yifu.cloud.plus.v1.yifu.order.entity.TOrderEnclosure;
+
+/**
+ * @author licancan
+ * @description 针对表【t_order_enclosure(订单附件表)】的数据库操作Service
+ * @date 2022-08-26 17:22:41
+ */
+public interface TOrderEnclosureService extends IService<TOrderEnclosure> {
+
+}