订单补录 修改

authentication/src/main/java/com/jzg/config/JzgAuthenticationProvider.java

@@ -6,7 +6,6 @@ import com.jzg.commons.entity.po.SysRoleDataScope;
 import com.jzg.commons.entity.po.SysRoleDataScopeLink;
 import com.jzg.commons.entity.po.SysSystem;
 import com.jzg.commons.entity.vo.SysRoleDataScopeVo;
-import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.entity.SysRolePerms;
@@ -102,7 +101,6 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
         String name = "",workNumber = "",headSculpture = "";
         if(!system.equals(SystemConstants.SYSTEM_PLATFORM.getCode())){
             SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId(),system);
-            AssertionUtils.isFail(Objects.isNull(jzgUserInfo),"暂无权限登录系统");
             name = jzgUserInfo.getName();
             workNumber = jzgUserInfo.getWorkNumber();
         }else{

authentication/src/main/resources/application.yml

@@ -1,3 +1,6 @@
+server:
+  port: 8081
+
 spring:
   profiles:
     active: dev

commons/pom.xml

@@ -88,8 +88,20 @@
             <version>5.2.1</version> <!-- 请使用最新版本 -->
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
-<!--    <build>-->
+    <!--    <build>-->
 <!--        <directory>${project.basedir}/target</directory>-->
 
 <!--        <plugins>-->

commons/src/main/java/com/jzg/commons/aop/OperatorTrajectory.java

@@ -25,6 +25,15 @@ public @interface OperatorTrajectory {
     //主键的名称
     String primary() default "id";
 
+    //模块名称
+    String moduleName() default "";
+
+    //实体类
+    String entity() default "";
+
+    //是否记录日志
+    String isRecorded() default "";
+
 }
 
 

commons/src/main/java/com/jzg/commons/aop/aspect/OperatorTrajectoryAspect.java

@@ -1,18 +1,26 @@
 package com.jzg.commons.aop.aspect;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jzg.commons.aop.OperatorTrajectory;
+import com.jzg.commons.async.AsyncFactory;
+import com.jzg.commons.async.AsyncManager;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.base.HistoryDataService;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.service.OperatorTrajectoryService;
+import com.jzg.commons.util.StringUtils;
 import com.jzg.commons.util.idgen.IdGenerate;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
-import org.aspectj.lang.annotation.*;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -21,8 +29,10 @@ import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
+import java.util.Map;
 import java.util.Objects;
 
+@Slf4j
 @Aspect
 @Component
 @RequiredArgsConstructor
@@ -57,8 +67,11 @@ public class OperatorTrajectoryAspect {
                 com.jzg.commons.entity.po.OperatorTrajectory byId = operatorTrajectoryService.getById(context.getId());
                 if(result.getCode() == 200){
                     if(byId.getOperatorType().equals("C")){
-                        JSONObject jsonObject = JSON.parseObject(result.getData().toString());
-                        byId.setPrimaryValue(jsonObject.getString(annotation.primary()));
+                        Object data = result.getData();
+                        if (ObjectUtil.isNotEmpty(data)){
+                            JSONObject jsonObject = JSON.parseObject(data.toString());
+                            byId.setPrimaryValue(jsonObject.getString(annotation.primary()));
+                        }
                     }
                     byId.setExecuteStatus(1);
                 }else{
@@ -76,15 +89,21 @@ public class OperatorTrajectoryAspect {
     @AfterThrowing(pointcut = "@annotation(com.jzg.commons.aop.OperatorTrajectory)", throwing = "ex")
     public void doAfterThrowing(JoinPoint joinPoint, Throwable ex) {
         MethodContext context = methodContext.get();
-        if (context != null) {
-            String methodName = context.getMethodName();
-            if(joinPoint.getSignature().getName().equals(methodName)){
+        log.info("异常信息：{}", ex.getMessage());
+        log.info("ID：{}", context.getId());
+        log.info("ID：{}", ex.toString());
+        operatorTrajectoryService.deleteById(context.getId(),baseController.getUserSystemCode());
+
+
+//        if (context != null) {
+//            String methodName = context.getMethodName();
+//            if(joinPoint.getSignature().getName().equals(methodName)){
 //                com.jzg.commons.entity.po.OperatorTrajectory byId = operatorTrajectoryService.getById(context.getId());
 //                byId.setExecuteStatus(2);
 //                byId.setErrorMsg(ex.getMessage());
 //                operatorTrajectoryService.updateById(byId);
-            }
-        }
+//            }
+//        }
         // 清除上下文
         methodContext.remove();
     }
@@ -99,16 +118,20 @@ public class OperatorTrajectoryAspect {
         }else if(operatorTrajectory.type().equals("D")){
             id = point.getArgs()[0].toString();
         }
-
+        if (isRecorded(operatorTrajectory.isRecorded(),obj)){
+            return;
+        }
         com.jzg.commons.entity.po.OperatorTrajectory trajectory = new com.jzg.commons.entity.po.OperatorTrajectory();
         String trajectoryId = IdGenerate.nextId();
         trajectory.setId(trajectoryId);
         trajectory.setOperatorType(operatorTrajectory.type());
         trajectory.setSystemCode(operatorTrajectory.systemCode());
         trajectory.setServiceTag(operatorTrajectory.serviceTag());
+        trajectory.setModuleName(operatorTrajectory.moduleName());
         trajectory.setCreateTime(LocalDateTime.now());
         trajectory.setCreateBy(baseController.getUserName());
-
+        trajectory.setSystemCode(baseController.getUserSystemCode());
+        trajectory.setEntityName(operatorTrajectory.entity());
         if(!Objects.isNull(obj)) {
             trajectory.setAfterJson(JSON.toJSONString(obj));
         }
@@ -124,7 +147,7 @@ public class OperatorTrajectoryAspect {
                 break;
             //更新
             case "U":
-                historyDataService = (HistoryDataService)applicationContext.getBean(operatorTrajectory.serviceTag());
+                historyDataService = (HistoryDataService)applicationContext.getBean(operatorTrajectory.serviceTag() + "Impl");
                 jsonObject = JSON.parseObject(JSONObject.toJSONString(obj));
                 trajectory.setPrimaryValue(jsonObject.getString(operatorTrajectory.primary()));
                 beforeData = historyDataService.getHistoryData(jsonObject.getString(operatorTrajectory.primary()));
@@ -145,6 +168,31 @@ public class OperatorTrajectoryAspect {
         methodContext.set(new MethodContext(point.getSignature().getName(), trajectoryId));
     }
 
+    public boolean isRecorded(String isRecorded,Object obj) {
+        if(StringUtils.isNotBlank(isRecorded)){
+            Map<String,Object> map = JSONObject.parseObject(JSONObject.toJSONString(obj), Map.class);
+            if (isRecorded.contains(".")){
+                String[] split = isRecorded.split("\\.");
+                Map<String,Object> o = (Map<String, Object>) map.get(split[0]);
+                String value = String.valueOf(o.get(split[1]));
+                if (StringUtils.isNotBlank(value) && value.equals("1")){
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+
+    public void saveRecord(com.jzg.commons.entity.po.OperatorTrajectory operatorTrajectory) {
+        AsyncManager.getInstance().execute(AsyncFactory.saveRecord(operatorTrajectory));
+    }
+
+
+    public void deleteById(String id,String systemCode) {
+        AsyncManager.getInstance().execute(AsyncFactory.deleteById(id,systemCode));
+    }
+
 
     private static class MethodContext {
         private final String methodName;

commons/src/main/java/com/jzg/commons/constants/CompanyConstants.java

@@ -83,13 +83,4 @@ public enum CompanyConstants {
     
     public final String companyCode;
     public final String companyName;
-
-    public static String getCompanyNameByCode(String companyCode) {
-        for (CompanyConstants companyConstant : CompanyConstants.values()) {
-            if (companyConstant.companyCode.equals(companyCode)) {
-                return companyConstant.companyName;
-            }
-        }
-        return null;
-    }
 }

commons/src/main/java/com/jzg/commons/constants/dict/InsOrderStatusEnum.java

@@ -13,19 +13,28 @@ import java.util.Objects;
 public enum InsOrderStatusEnum implements IBaseEnum {
 
     //所有未提交核保的均为报价中（包括拒保订单 ）
-    QUOTE_ING("0", "订单已提交", 1, 0),
+    QUOTE_ING("0", "报价完成", 1, 0),
 
     //已提交核保，并转人工核保状态
     WAIT_AUDIT("1", "待核保", 2, 0),
 
     //自动核保或者人工核保审核通过
-    AUDIT_ING("2", "核保中", 3, 0),
-    STAFF_PROCESS("3", "人工处理", 3, 0),
-    PAY_PENDING("4", "待缴费", 3, 0),
-    UNDERWRITED("5", "已承保", 3, 0),
-    QUOTE_FAIL("6", "报价失败", 3, 0),
-    AUDIT_FAIL("7", "核保失败", 3, 0),
-    ORDER_CLOSE("8", "订单关闭", 3, 0),
+    WAIT_PAY("2", "已核保待缴费", 3, 0),
+
+    //客户缴费完成生成保单状态
+    ACCEPT_INSURANCE("3", "已承保", 4, 0),
+
+    //人工核保退回状态，直至再次提交核保，状态修改为待核保
+    TO_BACK("4", "核保退回", 6, 0),
+
+    //报价失败
+    QUOTE_FAILED("10","报价失败",8,0),
+
+    //重复投保
+    REPEAT_INSURE("11","重复投保",9,0)
+
+    //撤回二维码
+//    BACK_QR_CODE("5", "撤销二维码", 7, 0),
     ;
 
 
@@ -49,8 +58,8 @@ public enum InsOrderStatusEnum implements IBaseEnum {
         return result;
     }
 
-//    public static String[] getRefuseUnderwriting() {
-//        return new String[]{WAIT_AUDIT.getCode(), TO_BACK.getCode()};
-//    }
+    public static String[] getRefuseUnderwriting() {
+        return new String[]{WAIT_AUDIT.getCode(), TO_BACK.getCode()};
+    }
 
 }

commons/src/main/java/com/jzg/commons/core/base/HistoryDataService.java

@@ -1,6 +1,9 @@
 package com.jzg.commons.core.base;
 
 
+import org.springframework.stereotype.Service;
+
+@Service
 public interface HistoryDataService {
 
     public Object getHistoryData(String id);

commons/src/main/java/com/jzg/commons/entity/dto/InsOrdersAdd.java

@@ -1,38 +0,0 @@
-package com.jzg.commons.entity.dto;
-
-
-import com.jzg.commons.entity.orders.po.*;
-import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-@Schema(description = "订单录入保存")
-public class InsOrdersAdd {
-
-    @Schema(description = "订单信息")
-    private InsOrders insOrders;
-
-    @Schema(description = "车辆信息")
-    private InsOrdersCarInfo carInfoVo;
-
-    @Schema(description = "订单车辆人员信息")
-    private List<InsOrdersCarUserInfo> carUserInfoList;
-
-    @Schema(description = "订单险种信息")
-    private InsuranceInfo insuranceInfo;
-
-    @Schema(description = "订单其他信息")
-    private InsOrdersOtherInfoVo insOrdersOtherInfo;
-
-    @Schema(description = "电子保单")
-    private InsOrdersExternalPolicy ordersExternalPolicy;
-
-    @Schema(description = "费用信息")
-    private InsOrdersExternalFee ordersExternal;
-
-
-
-}

commons/src/main/java/com/jzg/commons/entity/dto/InsOrdersParam.java

@@ -5,7 +5,31 @@ import com.jzg.commons.core.base.PageRequest;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @Schema(description = "订单录入分页列表查询参数")
 public class InsOrdersParam extends PageRequest {
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "是否暂存 0-否；1-是")
+    private int isTemporarily;
+
+    @Schema(description = "保险公司")
+    private String companyName;
+
+    @Schema(description = "业务员")
+    private String salesman;
+
+    @Schema(description = "0-待审核；1-已审核;2-已驳回")
+    private String auditStatus;
+
+    @Schema(description = "业务员归属")
+    private String salesmanCompany;
+
+    @Schema(description = "录单时间")
+    private List<String> recordingTime;
+
 }

commons/src/main/java/com/jzg/commons/entity/dto/InsuranceInfo.java

@@ -1,25 +0,0 @@
-package com.jzg.commons.entity.dto;
-
-
-import com.jzg.commons.entity.orders.po.InsOrdersKind;
-import com.jzg.commons.entity.orders.po.InsOrdersRisk;
-import com.jzg.commons.entity.orders.po.InsOrdersTax;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import java.util.List;
-
-@Schema(description = "保险信息")
-@Data
-public class InsuranceInfo {
-
-    @Schema(description = "险种类型")
-    private List<InsOrdersKind> insOrdersKindList;
-
-    @Schema(description = "车船税")
-    private InsOrdersTax insOrdersTax;
-
-    @Schema(description = "险种信息")
-    private List<InsOrdersRisk> insOrdersRiskList;
-
-}

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrders.java

@@ -7,6 +7,7 @@ import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
@@ -15,10 +16,10 @@ public class InsOrders extends BaseModel {
 
     @Schema(description = "订单ID")
     @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
+    private Long id;
 
     @Schema(description = "报价订单号")
-    private String quoteNo;
+    private Long quoteNo;
 
     @Schema(description = "协议ID")
     private String agreementId;
@@ -54,14 +55,14 @@ public class InsOrders extends BaseModel {
     private String auditName;
 
     @Schema(description = "核保时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime auditTime;
 
     @Schema(description = "核保意见")
     private String auditOpinion;
 
     @Schema(description = "支付时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime payTime;
 
     @Schema(description = "支付链接")
@@ -71,14 +72,14 @@ public class InsOrders extends BaseModel {
     private String insOrderNo;
 
     @Schema(description = "签单时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime signingTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate signingTime;
 
     @Schema(description = "是否暂存0-保存；1-暂存")
-    private byte isTemporarily;
+    private int isTemporarily;
 
     @Schema(description = "审核状态0-待审核；1-已审核;2-已驳回")
-    private byte auditStatus;
+    private int auditStatus;
 
     @Schema(description = "审核意见")
     private String auditComments;

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersCarInfo.java

@@ -13,10 +13,10 @@ import java.time.LocalDateTime;
 public class InsOrdersCarInfo extends BaseModel {
 
     @Schema(description = "订单号")
-    private String orderNo;
+    private Long orderNo;
 
     @Schema(description = "是否已上牌")
-    private boolean isRegistered;
+    private int isRegistered;
 
     @Schema(description = "车牌号")
     private String licenseNo;
@@ -89,8 +89,13 @@ public class InsOrdersCarInfo extends BaseModel {
     private LocalDateTime transferDate;
 
     @Schema(description = "是否过户")
-    private String transfer;
+    private int transfer;
 
     @Schema(description = "是否商业过户")
-    private String transferBi;
+    private int transferBi;
+
+
+
+    @Schema(description = "车辆所属性质 1个人 2企业 3机关")
+    private String property;
 }

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersCarUserInfo.java

@@ -13,11 +13,12 @@ import java.time.LocalDateTime;
 @Data
 @Schema(description = "订单人员信息表")
 public class InsOrdersCarUserInfo extends BaseModel {
-    @Schema(description = "主键id")
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
+
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
     @Schema(description = "订单号")
-    private String orderNo;
+    private Long orderNo;
 
     @Schema(description = "保单人员类型 1 车主 2 投保人 3 被保人")
     private Integer policyPersonType;

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersCosts.java

@@ -1,7 +1,5 @@
 package com.jzg.commons.entity.orders.po;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.data.annotation.Id;
@@ -14,7 +12,7 @@ public class InsOrdersCosts {
 
     @Id
     @Schema(description = "订单号")
-    private String orderNo;
+    private Long orderNo;
 
     @Schema(description = "交强险保费")
     private BigDecimal jqPremium;

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersExternalPolicy.java

@@ -1,10 +1,14 @@
 package com.jzg.commons.entity.orders.po;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.jzg.commons.core.base.BaseModel;
+import com.jzg.commons.entity.po.SysUploadFiles;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @Schema(description = "电子保单")
 public class InsOrdersExternalPolicy extends BaseModel {
@@ -24,4 +28,23 @@ public class InsOrdersExternalPolicy extends BaseModel {
     @Schema(description = "交强电子标志")
     private String jqSign;
 
+    @Schema(description = "交强保单")
+    @TableField(exist = false)
+    private String jqPolicyPreviewUrl;
+
+    @Schema(description = "商业保单")
+    @TableField(exist = false)
+    private String syPolicyPreviewUrl;
+
+    @Schema(description = "非车保单")
+    @TableField(exist = false)
+    private String noPolicyPreviewUrl;
+
+    @Schema(description = "交强电子标志")
+    @TableField(exist = false)
+    private String jqSignPreviewUrl;
+
+    @TableField(exist = false)
+    private List<SysUploadFiles> uploadFiles;
+
 }

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersKind.java

@@ -1,6 +1,8 @@
 package com.jzg.commons.entity.orders.po;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -10,8 +12,11 @@ import java.math.BigDecimal;
 @Schema(description = "保险订单险种信息")
 public class InsOrdersKind {
 
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
     @Schema(description = "订单号")
-    private String orderNo;
+    private Long orderNo;
 
     @Schema(description = "金额或数量")
     private BigDecimal amount;

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersOther.java

@@ -11,7 +11,7 @@ import java.math.BigDecimal;
 public class InsOrdersOther {
 
     @Schema(description = "订单号")
-    private String orderNo;
+    private Long orderNo;
 
     @Schema(description = "总评分")
     private String scope;

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersRisk.java

@@ -13,12 +13,12 @@ import java.time.LocalDateTime;
 @Data
 @Schema(description = "保险订单险种信息")
 public class InsOrdersRisk {
-    @Schema(description = "主键")
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private String id;
 
-    @Schema(description = "订单号")
-    private String orderNo;
+    @TableId(type = IdType.ASSIGN_ID)
+    private Long id;
+
+    @Schema(description = "订单号",requiredMode = Schema.RequiredMode.REQUIRED)
+    private Long orderNo;
 
     @Schema(description = "险种名称")
     private String riskName;
@@ -48,4 +48,25 @@ public class InsOrdersRisk {
     @Schema(description = "终保时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endDate;
+
+
+
+    // 数据校验（可根据实际需求引入更多校验规则）
+    public void validate() {
+        if (orderNo == null || riskName == null || riskCode == null || startDate == null || endDate == null) {
+            throw new IllegalArgumentException("关键字段不能为空");
+        }
+        if (amount != null && amount.compareTo(BigDecimal.ZERO) < 0) {
+            throw new IllegalArgumentException("金额不能为负数");
+        }
+        if (noTaxPremium != null && noTaxPremium.compareTo(BigDecimal.ZERO) < 0) {
+            throw new IllegalArgumentException("保费金额不能为负数");
+        }
+        if (commissionRate != null && (commissionRate.compareTo(BigDecimal.ZERO) < 0 || commissionRate.compareTo(BigDecimal.ONE) > 0)) {
+            throw new IllegalArgumentException("折扣必须在0到1之间");
+        }
+    }
+
+
+
 }

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersTax.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 public class InsOrdersTax {
 
     @Schema(description = "订单号")
-    private String orderNo;
+    private Long orderNo;
 
     @Schema(description = "减免税凭证号（减免税时必传）")
     private String extendChar2;

commons/src/main/java/com/jzg/commons/entity/po/OperatorTrajectory.java

@@ -1,10 +1,9 @@
 package com.jzg.commons.entity.po;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 操作日志记录表 oper_log
@@ -15,6 +14,8 @@ import java.util.Date;
 public class OperatorTrajectory{
     private String id;
 
+    private String moduleName;
+
     private String systemCode;
 
     private String serviceTag;
@@ -37,5 +38,9 @@ public class OperatorTrajectory{
 
     private String errorMsg;
 
+    private String entityName;
+
+    @TableField(exist = false)
+    private String operatorName;
 
 }

commons/src/main/java/com/jzg/commons/entity/po/QrBarcodeConfig.java

@@ -22,31 +22,37 @@ public class QrBarcodeConfig extends BaseModel {
     /**
      * 保险公司id
      */
+    @Schema(description = "保险公司id")
     private Long companyId;
 
     /**
      * 保险公司id
      */
+    @Schema(description = "保险公司CODE")
     private String companyCode;
 
     /**
      * 保险公司名称简称
      */
+    @Schema(description = "保险公司名称简称")
     private String companyName;
 
     /**
      * 类型   0：url   1：base码   2：h5
      */
+    @Schema(description = "类型   0：url   1：base码   2：h5")
     private Integer type;
 
     /**
      * 请求类型 1：api 2：python
      */
+    @Schema(description = "请求类型 1：api 2：python")
     private Integer apiType;
 
     /**
      * 系统编码
      */
+    @Schema(description = "系统编码")
     private String systemCode;
 
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/AccidentalDrivingVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.quote.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -23,38 +24,47 @@ public class AccidentalDrivingVo implements Serializable {
     /**
      * 险种编码
      */
+    @Schema(description = "险种编码")
     private String riskCode;
     /**
      * 险种名称
      */
+    @Schema(description = "险种名称")
     private String riskName;
     /**
      * 产品编码
      */
+    @Schema(description = "产品编码")
     private String productCode;
     /**
      * 产品名称
      */
+    @Schema(description = "产品名称")
     private String productName;
     /**
      * 产品分类编码
      */
+    @Schema(description = "产品分类编码")
     private String productCategoryCode;
     /**
      * 产品分类编码
      */
+    @Schema(description = "产品分类名称")
     private String productCategoryName;
     /**
      * 份数
      */
+    @Schema(description = "份数")
     private int quantity;
     /**
      * 总保额
      */
+    @Schema(description = "总保额")
     private String sumAmount;
     /**
      * 总保费
      */
+    @Schema(description = "总保费")
     private String sumPremium;
 
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/CarInfoVo.java

@@ -3,6 +3,7 @@ package com.jzg.commons.entity.quote.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.util.StringUtils;
@@ -29,63 +30,75 @@ public class CarInfoVo implements Serializable {
     /**
      * 车牌
      */
+    @Schema(description = "车牌号")
     private String licenseNo;
 
     /**
      * 车架号
      */
+    @Schema(description = "车架号")
     private String vinNo;
 
     /**
      * 品牌型号
      */
+    @Schema(description = "品牌型号")
     private String brandName;
 
     /**
      * 发动机号
      */
+    @Schema(description = "发动机号")
     private String engineNo;
 
     /**
      * 年款
      */
+    @Schema(description = "年款")
     private String carYear;
 
     /**
      * 座位数[座]
      */
+    @Schema(description = "座位数")
     private String seatCount;
 
     /**
      * 整备质量[千克(kg)]
      */
+    @Schema(description = "整备质量")
     private String completeKerbMass;
 
     /**
      * 核定载质量[千克(kg)]
      */
+    @Schema(description = "核定载质量")
     private String limitLoad;
 
     /**
      * 功率[千瓦(Kw)]
      */
+    @Schema(description = "功率")
     private String powerScale;
 
     /**
      * 新车购置价[元]
      */
+    @Schema(description = "新车购置价")
     private String purchasePrice;
 
     /**
      * @see com.jzg.quotation.commons.constant.enums.quote.CarNatureCode
      * 使用性质代码
      */
+    @Schema(description = "使用性质代码")
     private String carNatureCode;
 
     /**
      * @see com.jzg.quotation.commons.constant.enums.quote.VehicleUseCode
      * 车辆用途代码
      */
+    @Schema(description = "车辆用途代码")
     private String vehicleUseCode;
 
     /**
@@ -93,68 +106,87 @@ public class CarInfoVo implements Serializable {
      * 例如 K33 轿车 H31 轻型普通货车
      * 车辆类型代码
      */
+    @Schema(description = "车辆类型代码")
     private String carTypeCode;
 
     /**
      * @see com.jzg.quotation.commons.constant.enums.quote.CarKindCode
      * 车辆种类代码
      */
+    @Schema(description = "车辆种类代码")
     private String carKindCode;
 
     /**
      * @see com.jzg.quotation.commons.constant.enums.quote.EnergyTypeCode
      * 能源种类代码
      */
+    @Schema(description = "能源种类代码")
     private String energyTypeCode;
     /**
      * @see com.jzg.quotation.commons.constant.enums.quote.PropertyCode
      * 所属性质代码
      */
+    @Schema(description = "所属性质代码")
     private String propertyCode;
     /**
      * @see com.jzg.quotation.commons.constant.enums.quote.LicenseColorCode
      * 号牌颜色代码
      */
+    @Schema(description = "号牌颜色代码")
     private String licenseColorCode;
     /**
      * @see com.jzg.quotation.commons.constant.enums.quote.CarKindDetailIdCode
      * 车种明细
      */
+    @Schema(description = "车种明细")
     private String carKindDetailIdCode;
     /**
      * @see com.jzg.quotation.commons.constant.enums.quote.LicenseKindCode
      * 号牌种类
      */
+    @Schema(description = "号牌种类")
     private String licenseKindCode;
 
     /**
      * 注册日期
      */
+    @Schema(description = "注册日期")
     private String registerDate;
     /**
      * 发证日期
      */
+    @Schema(description = "发证日期")
     private String issueDate;
     /**
      * 过户车(如果存在交强险商业险分开的情况是转为交强险过户)
      */
-    private boolean transfer = false;
+    private boolean transfer;
     /**
      * 商业险过户
      */
-    private boolean ciTransfer = false;
+    @Schema(description = "商业险过户")
+    private boolean biTransfer;
+
     /**
      * 是否贷款车 true 贷款车
      */
-    private boolean loanStatus = false;
+    @Schema(description = "是否贷款车")
+    private boolean loanStatus;
+    /* *
+     * 所属性质（1个人 2企业 3机关）
+     */
+    @Schema(description = "所属性质")
+    private String property;
     /**
      * 新能源标志 true 新能源
      */
-    private boolean newEnergyMark = false;
+    @Schema(description = "新能源标志")
+    private boolean newEnergyMark;
 
     /**
      * 过户日期：发证日期的正确格式为yyyy-MM-dd
      */
+    @Schema(description = "过户日期")
     private String transferDate;
 
     /**
@@ -183,5 +215,7 @@ public class CarInfoVo implements Serializable {
     /**
      * 排量（单位：升(L)，能源种类为燃油时必传
      */
+    @Schema(description = "排量")
     private String displacement;
+
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/CustomerInfoVo.java

@@ -1,6 +1,7 @@
 package com.jzg.commons.entity.quote.vo;
 
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -24,99 +25,127 @@ public class CustomerInfoVo implements Serializable {
     /**
      * 姓名
      */
+    @Schema(description = "姓名")
     private String name;
     /**
      * 身份证号
      */
+    @Schema(description = "身份证号")
     private String identifyNumber;
     /**
      * 生日
      */
+    @Schema(description = "生日")
     private String birthday;
     /**
      * 年龄
      */
+    @Schema(description = "年龄")
     private String age;
     /**
      * 性别
      */
+    @Schema(description = "性别")
     private String gender;
     /**
      * 身份证有效起期
      */
+    @Schema(description = "身份证有效起期")
     private String identifyValidDate;
     /**
      * 身份证有效止期
      */
+    @Schema(description = "身份证有效止期")
     private String identifyValidEndDate;
     /**
      * 证件类型代码
      */
+    @Schema(description = "证件类型代码")
     private String documentsTypeCode;
     /**
      * 组织机构代码
      */
+    @Schema(description = "组织机构代码")
     private String organizationCode;
     /**
      * 地址
      */
+    @Schema(description = "地址")
     private String addr;
     /**
      * 省 区划编码
      */
+    @Schema(description = "省 区划编码")
     private String provinceCode;
     /**
      * 省
      */
+    @Schema(description = "省")
     private String province;
     /**
      * 市 区划编码
      */
+    @Schema(description = "市 区划编码")
     private String cityCode;
     /**
      * 市
      */
+    @Schema(description = "市")
     private String city;
     /**
      * 县 区划编码
      */
+    @Schema(description = "县 区划编码")
     private String countyCode;
     /**
      * 县
      */
+    @Schema(description = "县")
     private String county;
     /**
      * 邮箱
      */
+    @Schema(description = "邮箱")
     private String email;
     /**
      * 手机号
      */
+    @Schema(description = "手机号")
     private String mobile;
 
     /**
      * 固定电话
      */
+    @Schema(description = "固定电话")
     private String telephone;
 
     /**
      * 客户类型
      */
+    @Schema(description = "客户类型")
     private String property;
     /**
      * 法人
      */
+    @Schema(description = "法人")
     private String legalPerson;
     /**
      * 法人身份证号
      */
+    @Schema(description = "法人身份证")
     private String leaderIdentifyNumber;
     /**
      * 法人身份证止期
      */
+    @Schema(description = "法人身份证止期")
     private String leaderOtherEffectiveDate;
     /**
      * 注册资本金
      */
+    @Schema(description = "注册资本金")
     private String registeredCapital;
+
+    @Schema(description = "保单人员类型 1 车主 2 投保人 3 被保人")
+    private String policyPersonType;
+
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/KindInfoVo.java

@@ -1,7 +1,9 @@
 package com.jzg.commons.entity.quote.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
@@ -12,50 +14,64 @@ import java.io.Serializable;
  * @date: 2025/2/18 14:18
  **/
 @AllArgsConstructor
+@NoArgsConstructor
 @Data
 public class KindInfoVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 3390946390254782785L;
+
+    private String id;
+
     /**
      * 险种编码
      */
+    @Schema(description = "险种编码")
     private String kindCode;
     /**
      * 险种名称
      */
+    @Schema(description = "险种名称")
     private String kindName;
     /**
      * 平台险种编码
      */
+    @Schema(description = "平台险种编码")
     private String platformKindCode;
     /**
      * 平台险种名称
      */
+    @Schema(description = "平台险种名称")
     private String platformKindName;
     /**
      * 保额
      */
+    @Schema(description = "保额")
     private String amount;
     /**
      * 每座保额
      */
+    @Schema(description = "每座保额")
     private String unitAmount;
     /**
      * 座位数
      */
+    @Schema(description = "座位数")
     private String quantity;
     /**
      * 保费
      */
+    @Schema(description = "保费")
     private String premium;
     /**
      * 附加绝对免赔率
      */
+    @Schema(description = "附加绝对免赔率")
     private String deductibleRate;
     /**
      * 服务次数
      */
+    @Schema(description = "服务次数")
     private String serviceTimes;
 
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/RiskInfoVo.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.quote.vo;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -25,23 +26,27 @@ public class RiskInfoVo implements Serializable {
     /**
      * 险种代码
      */
+    @Schema(description = "险种代码")
     private String riskCode;
 
     /**
      * 起保日期
      */
+    @Schema(description = "起保日期")
     private String startDate;
 
     /**
      * 终保日期
      */
+    @Schema(description = "终保日期")
     private String endDate;
 
     /**
      * 是否及时起保
      * true 及时起保 false 不及时起保
      */
-    private boolean instantFlag = false;
+    @Schema(description = "是否及时起保")
+    private boolean instantFlag;
 
 
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/VehicleAndVesselTaxVo.java

@@ -1,65 +1,88 @@
 package com.jzg.commons.entity.quote.vo;
 
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 
 @Data
 @AllArgsConstructor
+@NoArgsConstructor
 public class VehicleAndVesselTaxVo implements Serializable {
+
+    /**
+     * 订单号
+     */
+    @Schema(description = "订单号")
+    private String orderNo;
+
     /**
      * 减免税凭证号 减免税时必传
      */
+    @Schema(description = "减免税凭证号 减免税时必传")
     private String extendChar2;
     /**
      * 减免比例  减税时必传
      */
+    @Schema(description = "减免比例  减税时必传")
     private String taxRelief;
     /**
      * 减免税原因代码  减免税时必传
      */
+    @Schema(description = "减免税原因代码  减免税时必传")
     private String relifReason;
     /**
      * 开具税务机关代码 减免完税时必传
      */
+    @Schema(description = "开具税务机关代码 减免完税时必传")
     private String taxComCode;
     /**
      * 开具凭证的税务机关名称 减免完税时必传
      */
+    @Schema(description = "开具税务机关名称 减免完税时必传")
     private String taxComName;
     /**
      * 完税凭证填发日期 完税时必传
      */
+    @Schema(description = "开具税务机关名称 减免完税时必传")
     private String taxDocumentDate;
     /**
      * 开具完税凭证地区代码 完税时必传
      */
+    @Schema(description = "开具税务机关名称 减免完税时必传")
     private String taxPaidAreaCode;
     /**
      * 完完税凭证号 完税时必传
      */
+    @Schema(description = "开具税务机关名称 减免完税时必传")
     private String paidFreeCertificate;
     /**
      * 纳税人名称 正常缴税时必传
      */
+    @Schema(description = "纳税人名称 正常缴税时必传")
     private String taxpayerName;
     /**
      * 纳税人证件类型 正常缴税时必传
      */
+    @Schema(description = "纳税人证件类型 正常缴税时必传")
     private String taxpayerIdentifier;
     /**
      * 纳税人证件号码 正常缴税时必传
      */
+    @Schema(description = "纳税人证件号码 正常缴税时必传")
     private String identifyNumber;
     /**
      * 车船税标志 1-正常交税； 2-免税； 3-减税； 4-完税
      */
+    @Schema(description = "车船税标志 1-正常交税； 2-免税； 3-减税； 4-完税")
     private String taxRelifFlag;
     /**
      * 组织机构代码
      */
+    @Schema(description = "组织机构代码")
     private String organizationCode;
 
 }

commons/src/main/java/com/jzg/commons/entity/scheme/vo/SchemeResultVo.java

@@ -1,6 +1,5 @@
 package com.jzg.commons.entity.scheme.vo;
 
-import com.jzg.commons.entity.po.JyxBlame;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -95,6 +94,5 @@ public class SchemeResultVo {
         private String coverage;
         private String premium;
         private String quantity;
-        private List<JyxBlame> blames = new ArrayList<>();
     }
 }

commons/src/main/java/com/jzg/commons/entity/vo/InsOrdersOtherInfoVo.java

@@ -3,6 +3,9 @@ package com.jzg.commons.entity.vo;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 
@@ -17,8 +20,8 @@ public class InsOrdersOtherInfoVo {
     private String companyName;
 
     @Schema(description = "签单时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime signingTime;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate signingTime;
 
     @Schema(description = "评分")
     private String scope;
@@ -50,4 +53,50 @@ public class InsOrdersOtherInfoVo {
     @Schema(description = "总保费")
     private String sumPremium;
 
+    @Schema(description = "是否过户")
+    private Integer transfer;
+
+    @Schema(description = "过户时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime transferDate;
+
+    @Schema(description = "是否商业过户")
+    private Integer transferBi;
+
+    @Schema(description = "订单号")
+    private Long orderNo;
+
+    @Schema(description = "交强评分")
+    private String jqScope;
+
+    @Schema(description = "商业评分")
+    private String syScope;
+
+    @Schema(description = "总赔付率")
+    private BigDecimal lossRation;
+
+    @Schema(description = "交强赔付率")
+    private BigDecimal jqLossRation;
+
+    @Schema(description = "商业赔付率")
+    private BigDecimal syLossRation;
+
+
+    @Schema(description = "交强出险次数")
+    private byte jqClaims;
+
+    @Schema(description = "商业出险次数")
+    private byte syClaims;
+
+    @Schema(description = "是否是真假单交")
+    private byte isDjq;
+
+    @Schema(description = "交强折扣")
+    private BigDecimal jqAdjustRate;
+
+    @Schema(description = "商业折扣")
+    private BigDecimal syAdjustRate;
+
+    @Schema(description = "太平绿黄红区间评分")
+    private String tpColorScore;
 }

commons/src/main/java/com/jzg/commons/entity/vo/InsTaskImagesVo.java

@@ -4,35 +4,16 @@ package com.jzg.commons.entity.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 @Schema(description = "订单影像资料VO")
 public class InsTaskImagesVo {
 
-    @Schema(description = "主键")
-    private String id;
-
     @Schema(description = "订单号")
     private String quoteNo;
 
-    @Schema(description = "图片类型(C01车辆影像，C02车主身份证，C03投保人身份证，C04被保人身份证，C05验车照)")
-    private String imageType;
-
-    @Schema(description = "文件存储ID")
-    private String imageId;
-
-    @Schema(description = "排序")
-    private String sort;
-
-    @Schema(description = "图片地址")
-    private String fileName;
-
-    @Schema(description = "图片地址")
-    private String fileType;
-
-    @Schema(description = "图片地址")
-    private String bucketName;
-
-    @Schema(description = "预览地址")
-    private String previewUrl;
+    @Schema(description = "影像资料")
+    private List<ImagesVo> images;
 
 }

commons/src/main/java/com/jzg/commons/entity/vo/OrdersListVo.java

@@ -1,9 +1,12 @@
 package com.jzg.commons.entity.vo;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 @Data
 @Schema(description = "订单列表VO")
 public class OrdersListVo {
@@ -29,7 +32,6 @@ public class OrdersListVo {
     @Schema(description = "车牌号")
     private String licenseNo;
 
-
     @Schema(description = "交强险保费")
     private String jqPremium;
 
@@ -45,4 +47,11 @@ public class OrdersListVo {
     @Schema(description = "车船税费用")
     private String taxPremium;
 
+    @Schema(description = "订单录入时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime createTime;
+
+    @Schema(description = "订单录入人")
+    private String createBy;
+
 }

commons/src/main/java/com/jzg/commons/mapper/OperatorTrajectoryMapper.java

@@ -2,8 +2,13 @@ package com.jzg.commons.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.OperatorTrajectory;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface OperatorTrajectoryMapper extends BaseMapper<OperatorTrajectory>{
+
+    @Delete("delete from operator_trajectory where id = #{id} and system_code = #{systemCode}")
+    void deleteById(@Param("id") String id,@Param("systemCode") String systemCode);
 }

commons/src/main/java/com/jzg/commons/service/OperatorTrajectoryService.java

@@ -1,8 +1,12 @@
 package com.jzg.commons.service;
 
 
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.entity.dto.LogParam;
 import com.jzg.commons.entity.po.OperatorTrajectory;
+import com.jzg.commons.util.comparble.CompareResult;
+
+import java.util.List;
 
 /**
  * 操作日志 服务层
@@ -17,6 +21,12 @@ public interface OperatorTrajectoryService
     boolean save(OperatorTrajectory operatorTrajectory);
 
 
+    void deleteById(String id,String systemCode);
+
+
+    List<CompareResult> selectById(String id);
+
+    Page<OperatorTrajectory> list(LogParam logParam);
 
 
 }

commons/src/main/java/com/jzg/commons/service/impl/OperatorTrajectoryServiceImpl.java

@@ -1,15 +1,23 @@
 package com.jzg.commons.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.constants.Crud;
+import com.jzg.commons.entity.dto.LogParam;
 import com.jzg.commons.entity.po.OperatorTrajectory;
 import com.jzg.commons.mapper.OperatorTrajectoryMapper;
 import com.jzg.commons.service.OperatorTrajectoryService;
+import com.jzg.commons.util.StringUtils;
+import com.jzg.commons.util.comparble.CompareResult;
+import com.jzg.commons.util.comparble.CompatibleUtils;
 import jakarta.annotation.Resource;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @Service
 public class OperatorTrajectoryServiceImpl implements OperatorTrajectoryService {
     @Resource
@@ -24,4 +32,36 @@ public class OperatorTrajectoryServiceImpl implements OperatorTrajectoryService
     public boolean save(OperatorTrajectory operatorTrajectory) {
         return operatorTrajectoryMapper.insert(operatorTrajectory) > 0;
     }
+
+    @Override
+    public void deleteById(String id,String systemCode) {
+        operatorTrajectoryMapper.deleteById(id,systemCode);
+    }
+
+    @Override
+    public List<CompareResult> selectById(String id) {
+        OperatorTrajectory operatorTrajectory = operatorTrajectoryMapper.selectById(id);
+        if (ObjectUtil.isNotEmpty(operatorTrajectory)){
+            return new ArrayList<>(0);
+        }
+        List<CompareResult> compareResults = CompatibleUtils.compareFieldsMap(operatorTrajectory);
+        return compareResults;
+    }
+
+    @Override
+    public Page<OperatorTrajectory> list(LogParam logParam) {
+
+        LambdaQueryWrapper<OperatorTrajectory> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getOperator()),OperatorTrajectory::getCreateBy,logParam.getOperator());
+        lambdaQueryWrapper.like(StringUtils.isNotEmpty(logParam.getFunction()),OperatorTrajectory::getModuleName,logParam.getFunction());
+        Page page = operatorTrajectoryMapper.selectPage(logParam.getPage(), lambdaQueryWrapper);
+        if (page.getTotal() > 0){
+            List<OperatorTrajectory> list = page.getRecords();
+            list.stream().forEach(item->{
+                String nameByCode = Crud.getNameByCode(item.getOperatorType());
+                item.setOperatorName(nameByCode);
+            });
+        }
+        return page;
+    }
 }

gateway/src/main/resources/application-dev.yml

@@ -23,7 +23,7 @@ spring:
         - id: platform_route
           uri: http://localhost:8083/
           predicates:
-            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**,/sysDept/**,/manager/**
+            - Path=/userRole/**,/system/**,/file/**,/user/**,/esmInsCompany/**,/jyxConfig/**,/qrBarcode/**,/sysDept/**,/manager/**,/operatorTrajectory/**
 
         - id: tenant_route
           uri: http://localhost:8084/
@@ -33,4 +33,4 @@ spring:
         - id: summary_route
           uri: http://localhost:9898/
           predicates:
-            - Path= /order/identify/** ,/supplementOrder/**
+            - Path= /order/identify/** ,/supplementOrder/**,/order/carModel/**

platform/src/main/java/com/jzg/controller/FileUploadController.java

@@ -1,7 +1,5 @@
 package com.jzg.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
@@ -56,9 +54,9 @@ public class FileUploadController extends BaseController {
             String objectName = generateObjectName(originalFileName, fileMd5, extension);
             String fileEtag = FileUtils.getFileETag(file);
             // 查找文件是否已经存在于MinIO
-            if (isFileExistsInMinIo(objectName, fileEtag)) {
-                return HttpResult.ok(getFileFromDatabase(fileEtag,objectName, extension));
-            }
+//            if (isFileExistsInMinIo(objectName, fileEtag)) {
+//                return HttpResult.ok(getFileFromDatabase(fileEtag,objectName, extension));
+//            }
             //如果文件不存在，执行上传操作
             SysUploadFiles sysUploadFiles = uploadFileToMinIo(file, objectName, fileEtag, extension);
             return HttpResult.ok(sysUploadFiles);

platform/src/main/java/com/jzg/controller/QrBarcodeController.java

@@ -2,6 +2,7 @@ package com.jzg.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.QrBarcodeConfigAdd;
 import com.jzg.commons.entity.dto.QrBarcodeConfigEnd;
@@ -41,6 +42,7 @@ public class QrBarcodeController {
     }
 
 
+    @OperatorTrajectory(moduleName = "二维码配置",serviceTag = "QrBarcodeService",entity = "QrBarcodeConfig")
     @PostMapping("/save")
     @Schema(description = "二维码配置新增")
     public HttpResult save(@Valid  @RequestBody QrBarcodeConfigAdd barcodeConfigAdd) {
@@ -50,6 +52,7 @@ public class QrBarcodeController {
         return qrBarcodeService.save(BeanUtil.copyProperties(barcodeConfigAdd, QrBarcodeConfig.class)) ? HttpResult.ok("保存成功") : HttpResult.error("保存失败");
     }
 
+    @OperatorTrajectory(moduleName = "二维码配置",serviceTag = "qrBarcodeService", type = "U",entity = "QrBarcodeConfig")
     @PostMapping("/updateById")
     @Schema(description = "二维码配置修改")
     public HttpResult updateById(@Valid @RequestBody QrBarcodeConfigEnd barcodeConfigEnd) {

platform/src/main/java/com/jzg/service/impl/QrBarcodeServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.constants.Constants;
+import com.jzg.commons.core.base.HistoryDataService;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.QrBarcodeConfigParam;
 import com.jzg.commons.entity.po.QrBarcodeConfig;
@@ -17,7 +18,7 @@ import org.springframework.stereotype.Service;
 
 
 @Service
-public class QrBarcodeServiceImpl extends ServiceImpl<QrBarcodeMapper, QrBarcodeConfig> implements QrBarcodeService {
+public class QrBarcodeServiceImpl extends ServiceImpl<QrBarcodeMapper, QrBarcodeConfig> implements QrBarcodeService,HistoryDataService {
 
     @Override
     public HttpResult queryPage(QrBarcodeConfigParam barcodeConfigParam) {
@@ -35,4 +36,9 @@ public class QrBarcodeServiceImpl extends ServiceImpl<QrBarcodeMapper, QrBarcode
         QrBarcodeConfig qrBarcodeConfig = baseMapper.selectById(id);
         return HttpResult.ok(BeanUtil.copyProperties(qrBarcodeConfig, QrBarcodeConfigVo.class));
     }
+
+    @Override
+    public Object getHistoryData(String id) {
+        return baseMapper.selectById(id);
+    }
 }

platform/src/main/resources/application.yml

@@ -49,6 +49,7 @@ tenant:
     - jyx_config
     - jyx_setting
     - ptl_agreement_attribution_dept
+    - operator_trajectory
   ignoreLoginNames:
 
   ignoreFunction:

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/client/PlatformClient.java

@@ -2,7 +2,6 @@ package com.jzg.quotation.commons.client;
 
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.agreement.po.PtlAgreementAttribution;
-import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.vo.PersonAreaVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,9 +22,4 @@ public interface PlatformClient {
             @RequestParam("agreementId") String agreementId,
             @RequestHeader("Authorization") String authToken);
 
-    @GetMapping("/esmInsCompany/findById")
-    public HttpResult<EsmInsCompany> findById(
-            @RequestParam("id") String id,
-            @RequestHeader("Authorization") String authToken);
-
 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/constant/enums/base/ProductsType.java

@@ -1,6 +1,5 @@
 package com.jzg.quotation.commons.constant.enums.base;
 
-import com.jzg.commons.constants.CompanyConstants;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -24,14 +23,5 @@ public enum ProductsType {
     // 说明
     private final String desc;
 
-    public static String getProductNameByCode(String code) {
-        for (ProductsType productsType : ProductsType.values()) {
-            if (productsType.code.equals(code)) {
-                return productsType.desc;
-            }
-        }
-        return null;
-    }
-
 
 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/QuoteVo.java

@@ -3,6 +3,7 @@ package com.jzg.quotation.commons.entity.vo.aggregated;
 
 import com.jzg.commons.entity.quote.vo.*;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -32,38 +33,47 @@ public class QuoteVo implements Serializable {
     /**
      * 车辆信息
      */
+    @Schema(description = "车辆信息")
     private CarInfoVo carInfoVo;
     /**
      * 车主
      */
+    @Schema(description = "车主")
     private CustomerInfoVo ownersInfo;
     /**
      * 投保人
      */
+    @Schema(description = "投保人")
     private CustomerInfoVo policyHolderInfo;
     /**
      * 被保人
      */
+    @Schema(description = "被保人")
     private CustomerInfoVo insuredPersonInfo;
     /**
      * 交强险 险种信息
      */
+    @Schema(description = "交强险 险种信息")
     private RiskInfoVo ciRiskInfoVo;
     /**
      * 商业险 险种信息
      */
+    @Schema(description = "商业险 险种信息")
     private RiskInfoVo biRiskInfoVo;
     /**
      * 商业险信息
      */
+    @Schema(description = "商业险信息")
     private List<KindInfoVo> kindInfoVo;
     /**
      * 非车险
      */
+    @Schema(description = "非车险")
     private List<AccidentalDrivingVo> accidentalDrivings;
     /**
      * 车船税信息
      */
+    @Schema(description = "车船税信息")
     private VehicleAndVesselTaxVo vehicleAndVesselTax;
 
 }

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/aggregated/UnderwritingResultsVo.java

@@ -1,25 +0,0 @@
-package com.jzg.quotation.commons.entity.vo.aggregated;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @description: 核保 返回结果
- * @author quchen
- * @date 2025/3/26 10:24
- */
-
-@NoArgsConstructor
-@AllArgsConstructor
-@Data
-public class UnderwritingResultsVo implements Serializable {
-    /**
-     * 交互唯一订单
-     */
-    private String ordersNo;
-
-
-}

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/base/OrderBase.java

@@ -24,11 +24,6 @@ public class OrderBase implements Serializable {
      */
     private String ordersNo;
 
-    /**
-     * 报价号 用于处理影像上传
-     */
-    private String quoteNo;
-
     /**
      * 保险公司代码
      */

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/orders/InsOrdersAdd.java

@@ -0,0 +1,35 @@
+package com.jzg.quotation.commons.entity.vo.orders;
+
+
+import com.jzg.commons.entity.dto.InsTaskImagesAdd;
+import com.jzg.commons.entity.orders.po.InsOrders;
+import com.jzg.commons.entity.orders.po.InsOrdersExternalFee;
+import com.jzg.commons.entity.orders.po.InsOrdersExternalPolicy;
+import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
+import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+@Schema(description = "订单录入保存")
+public class InsOrdersAdd extends QuoteVo {
+
+    @Schema(description = "是否暂存0-保存；1-暂存")
+    private int isTemporarily;
+
+    @Schema(description = "订单信息")
+    private InsOrders insOrders;
+
+    @Schema(description = "订单其他信息")
+    private InsOrdersOtherInfoVo insOrdersOtherInfo;
+
+    @Schema(description = "费用信息")
+    private InsOrdersExternalFee ordersExternal;
+
+    @Schema(description = "订单影像资料")
+    private InsTaskImagesAdd imagesAdds;
+
+    @Schema(description = "保单信息")
+    private InsOrdersExternalPolicy insOrdersExternalPolicy;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/InsOrdersVo.java → tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/entity/vo/orders/InsOrdersVo.java

@@ -1,12 +1,11 @@
-package com.jzg.commons.entity.vo;
+package com.jzg.quotation.commons.entity.vo.orders;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.jzg.commons.entity.dto.InsuranceInfo;
-import com.jzg.commons.entity.orders.po.InsOrders;
-import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
-import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
-import com.jzg.commons.entity.orders.po.InsOrdersOther;
+import com.jzg.commons.entity.orders.po.*;
+import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
+import com.jzg.commons.entity.vo.InsTaskImagesVo;
+import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -15,7 +14,7 @@ import java.util.List;
 
 @Data
 @Schema(description = "订单录入VO")
-public class InsOrdersVo {
+public class InsOrdersVo extends QuoteVo {
 
     @Schema(description = "id")
     private Long id;
@@ -48,16 +47,23 @@ public class InsOrdersVo {
     @Schema(description = "订单信息")
     private InsOrders insOrders;
 
-    @Schema(description = "车辆信息")
-    private InsOrdersCarInfo carInfoVo;
-
     @Schema(description = "订单车辆人员信息")
     private List<InsOrdersCarUserInfo> carUserInfoList;
 
-    @Schema(description = "订单险种信息")
-    private InsuranceInfo insuranceInfo;
-
     @Schema(description = "订单其他信息")
-    private InsOrdersOther insOrdersOther;
+    private InsOrdersOtherInfoVo insOrdersOtherInfo;
+
+    @Schema(description = "订单信息")
+    private List<InsOrdersRisk> insOrdersRiskList;
+
+    @Schema(description = "费用信息")
+    private InsOrdersExternalFee ordersExternal;
+
+    @Schema(description = "订单影像资料")
+    private InsTaskImagesVo imagesAdds;
+
+    @Schema(description = "保单信息")
+    private InsOrdersExternalPolicy insOrdersExternalPolicy;
+
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrdersController.java

@@ -1,9 +1,11 @@
 package com.jzg.quotation.summary.controller;
 
 
+import com.jzg.commons.aop.OperatorTrajectory;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsOrdersParam;
-import com.jzg.commons.entity.dto.InsOrdersAdd;
+import com.jzg.quotation.commons.entity.vo.orders.InsOrdersAdd;
+import com.jzg.quotation.commons.entity.vo.orders.InsOrdersEnd;
 import com.jzg.quotation.summary.service.InsOrdersService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -11,6 +13,7 @@ import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.constraints.NotNull;
 
 @RestController
@@ -23,6 +26,7 @@ public class InsOrdersController {
     @Resource
     private InsOrdersService insOrdersService;
 
+    @OperatorTrajectory(moduleName = "车险订单（补录）",serviceTag = "insOrdersService",entity = "com.jzg.commons.entity.orders.po.InsOrders",isRecorded = "insOrders.isTemporarily")
     @Operation(summary = "录入订单新增")
     @PostMapping("saveOrders")
     public HttpResult saveOrUpdate(@RequestBody InsOrdersAdd ordersAdd) {
@@ -32,8 +36,8 @@ public class InsOrdersController {
 
     @Operation(summary = "录入订单修改")
     @PostMapping("updateOrders")
-    public HttpResult updateOrders(@RequestBody InsOrdersAdd ordersAdd) {
-        return insOrdersService.updateOrders(ordersAdd);
+    public HttpResult updateOrders(@RequestBody InsOrdersEnd ordersEnd) {
+        return insOrdersService.updateOrders(ordersEnd);
     }
 
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -1,40 +1,25 @@
 package com.jzg.quotation.summary.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.orders.po.InsOrders;
-import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
-import com.jzg.commons.entity.orders.po.InsOrders;
-import com.jzg.commons.entity.po.EsmInsCompany;
-import com.jzg.commons.util.AssertionUtils;
-import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
-import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteResultsVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
 import com.jzg.quotation.commons.entity.vo.aggregated.UnderwritingVo;
 import com.jzg.quotation.commons.service.QuotationApiBaseService;
 import com.jzg.quotation.commons.client.PlatformClient;
-import com.jzg.quotation.commons.utils.SnowFlakeUtil;
 import com.jzg.quotation.summary.factory.CompanyFactory;
-import com.jzg.quotation.summary.service.*;
-import com.jzg.quotation.summary.service.InsOrdersCarInfoService;
-import com.jzg.quotation.summary.service.InsOrdersService;
 import com.jzg.quotation.summary.service.InsOrdersService;
 import com.jzg.quotation.summary.service.SysQuoteConfigService;
 import com.jzg.quotation.summary.service.SysQuoteRedisService;
-import com.thoughtworks.xstream.mapper.LambdaMapper;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Objects;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("/unify/order")
@@ -60,52 +45,13 @@ public class UnifyOrderManager {
     @Autowired
     InsOrdersService insOrdersService;
 
-    @Autowired
-    InsOrdersCarInfoService insOrdersCarInfoService;
-
-
-    @Autowired
-    InsOrdersCarUserInfoService insOrdersCarUserInfoService;
-
-
-    /**\
-     * 获取报价号
-     * @param licenseNo
-     * @param vinNo
-     * @param engineNo
-     * @return
-     */
-    @Operation(summary = "获取报价号")
-    @GetMapping("/getQuoteNo")
-    public HttpResult getQuoteNo(@Schema(description = "车牌号") String licenseNo,
-                                 @Schema(description = "车架号") String vinNo,
-                                 @Schema(description = "发动机号") String engineNo) {
-        String quoteNo = String.valueOf(SnowFlakeUtil.getSnowFlakeId());
-        InsOrdersCarInfo carInfo = insOrdersCarInfoService.getOne(new LambdaQueryWrapper<InsOrdersCarInfo>()
-                .eq(InsOrdersCarInfo::getLicenseNo, licenseNo)
-                .eq(InsOrdersCarInfo::getVinNo, vinNo)
-                .eq(InsOrdersCarInfo::getEngineNo, engineNo));
-        if(Objects.nonNull(carInfo)){
-            InsOrders insOrders = insOrdersService.getById(carInfo.getOrderNo());
-            if(Objects.nonNull(insOrders)){
-                quoteNo = String.valueOf(insOrders.getQuoteNo());
-            }
-        }
-        return HttpResult.ok(quoteNo);
-    }
-
-
     /**
      * 统一报价
      * @param quoteVo
      * @return
      */
-    @Operation(summary = "统一报价")
     @PostMapping("/quote")
     public HttpResult quote(@RequestBody QuoteVo quoteVo) throws JsonProcessingException {
-        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(quoteVo.getOrder().getInsuranceCompanyCode(), baseController.getToken());
-        AssertionUtils.isFail(esmInsCompanyHttpResult.getCode() != 200,esmInsCompanyHttpResult.getMsg());
-        quoteVo.getOrder().setInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCompanyCode());
         //获取保司实体
         QuotationApiBaseService quoteService = companyFactory.getQuoteService(
                 quoteVo.getOrder().getInsuranceCompanyCode(),
@@ -113,7 +59,6 @@ public class UnifyOrderManager {
                 platformClient,
                 baseController);
         // 生成订单
-        insOrdersService.generateOrders(quoteVo);
 
 
         // 报价
@@ -122,8 +67,6 @@ public class UnifyOrderManager {
         // 报价后更新订单
 
 
-
-
         return HttpResult.ok(quote);
     }
 
@@ -135,12 +78,7 @@ public class UnifyOrderManager {
                 sysQuoteConfigService,sysQuoteRedisService,
                 platformClient,
                 baseController);
-        InsOrders insOrders = insOrdersService.getById(underwritingVo.getOrder().getOrdersNo());
-        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getByOrderId(insOrders.getId());
-        List<InsOrdersCarUserInfo> insOrdersCarUserInfos = insOrdersCarUserInfoService.getByOrderId(insOrders.getId());
-        underwritingVo.setInsOrders(insOrders);
-        underwritingVo.setInsOrdersCarInfo(insOrdersCarInfo);
-        underwritingVo.setInsOrdersCarUserInfoList(insOrdersCarUserInfos);
+
         quoteService.underwriting(underwritingVo);
         return HttpResult.ok();
     }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/factory/decorator/QuoteDispatchDecorator.java

@@ -52,8 +52,6 @@ public class QuoteDispatchDecorator implements QuotationApiBaseService {
         String token = baseController.getToken();
         HttpResult<PtlAgreementAttribution> agreementAttribution = platformClient.getAgreementAttribution(agreementId,token);
         AssertionUtils.isFail(agreementAttribution.getCode() == 500,"获取协议属性失败");
-        // API类型设置
-        quoteVo.getOrder().setApiType(Integer.parseInt(agreementAttribution.getData().getApiType()));
         Map<String, String> fieldMap = agreementAttribution.getData().getFields().stream()
                 .map(obj -> new JSONObject((Map<String, Object>) obj))  // 转换为 JSONObject
                 .collect(Collectors.toMap(

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersCarUserInfoMapper.java

@@ -3,8 +3,12 @@ package com.jzg.quotation.summary.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface InsOrdersCarUserInfoMapper extends BaseMapper<InsOrdersCarUserInfo> {
+
+    @Delete("delete from ins_orders_car_user_info where order_no = #{orderNo}")
+    void deleteOrderNo(Long orderNo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersKindMapper.java

@@ -2,8 +2,12 @@ package com.jzg.quotation.summary.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.orders.po.InsOrdersKind;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface InsOrdersKindMapper extends BaseMapper<InsOrdersKind> {
+
+    @Delete("delete from ins_orders_kind where order_no = #{orderNo}")
+    void deleteOrderNo(Long orderNo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.orders.po.InsOrders;
-import com.jzg.commons.entity.vo.InsOrdersVo;
+import com.jzg.quotation.commons.entity.vo.orders.InsOrdersVo;
 import com.jzg.commons.entity.vo.OrdersListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersPolicyMapper.java

@@ -1,9 +0,0 @@
-package com.jzg.quotation.summary.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface InsOrdersPolicyMapper extends BaseMapper<InsOrdersPolicy> {
-}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersRiskMapper.java

@@ -2,8 +2,12 @@ package com.jzg.quotation.summary.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.orders.po.InsOrdersRisk;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface InsOrdersRiskMapper extends BaseMapper<InsOrdersRisk> {
+
+    @Delete("delete from ins_orders_risk where order_no = #{orderNo}")
+    void deleteOrderNo(Long orderNo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsTaskImagesMapper.java

@@ -4,17 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.InsTaskImages;
 import com.jzg.commons.entity.vo.InsTaskImagesVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.util.List;
 
 @Mapper
 public interface InsTaskImagesMapper extends BaseMapper<InsTaskImages> {
 
 
 
-    @Select("SELECT t.id, t.quote_no, t.image_type, t.image_id, f.file_name, f.file_type, f.bucket_name FROM ins_task_images t LEFT JOIN sys_upload_files f ON f.id = t.image_id where t.quote_no = #{quoteNo}")
-    List<InsTaskImagesVo> selectByQuoteNo(String quoteNo);
+
+    InsTaskImagesVo selectByQuoteNo(String quoteNo);
 
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersCarInfoService.java

@@ -1,16 +1,7 @@
 package com.jzg.quotation.summary.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
-import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
-import com.jzg.commons.entity.quote.vo.CarInfoVo;
-
-import java.time.format.DateTimeFormatter;
-import java.util.List;
 
 public interface InsOrdersCarInfoService extends IService<InsOrdersCarInfo> {
-    InsOrdersCarInfo createCarInfo(InsOrders insOrders, CarInfoVo carInfoVo, DateTimeFormatter formatter);
-
-    InsOrdersCarInfo getByOrderId(String orderId);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersCarUserInfoService.java

@@ -1,16 +1,10 @@
 package com.jzg.quotation.summary.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
-import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
-
-import java.time.format.DateTimeFormatter;
-import java.util.List;
 
 public interface InsOrdersCarUserInfoService extends IService<InsOrdersCarUserInfo> {
-    InsOrdersCarUserInfo createUserInfo(String orderNo, CustomerInfoVo customerInfoVo, DateTimeFormatter formatter,Integer policyPersonType);
 
 
-    List<InsOrdersCarUserInfo> getByOrderId(String orderId);
+    void deleteOrderNo(Long orderNo);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersCostsService.java

@@ -1,9 +1,7 @@
 package com.jzg.quotation.summary.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCosts;
 
 public interface InsOrdersCostsService extends IService<InsOrdersCosts> {
-    void createCosts(InsOrders insOrders);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersKindService.java

@@ -1,12 +1,12 @@
 package com.jzg.quotation.summary.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersKind;
-import com.jzg.commons.entity.quote.vo.KindInfoVo;
-
-import java.util.List;
+import org.apache.ibatis.annotations.Delete;
 
 public interface InsOrdersKindService extends IService<InsOrdersKind> {
-    void createKind(InsOrders insOrders, List<KindInfoVo> kindInfoVo, String companyCode);
+
+
+    void deleteOrderNo(Long orderNo);
+
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersOtherService.java

@@ -1,9 +1,7 @@
 package com.jzg.quotation.summary.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersOther;
 
 public interface InsOrdersOtherService extends IService<InsOrdersOther> {
-    void createOther(InsOrders insOrders);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersPolicyService.java

@@ -1,10 +0,0 @@
-package com.jzg.quotation.summary.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.orders.po.InsOrders;
-import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
-
-public interface InsOrdersPolicyService extends IService<InsOrdersPolicy> {
-    void createPolicy(InsOrders insOrders);
-
-}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersRiskService.java

@@ -1,11 +1,11 @@
 package com.jzg.quotation.summary.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersRisk;
-import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 
 public interface InsOrdersRiskService extends IService<InsOrdersRisk> {
-    void createRisk(InsOrders insOrders, RiskInfoVo ciRiskInfoVo, RiskInfoVo biRiskInfoVo);
+
+
+    void deleteOrderNo(Long orderNo);
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersService.java

@@ -3,15 +3,12 @@ package com.jzg.quotation.summary.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.dto.InsOrdersAdd;
 import com.jzg.commons.entity.dto.InsOrdersParam;
 import com.jzg.commons.entity.orders.po.InsOrders;
-import com.jzg.commons.entity.vo.InsOrdersVo;
+import com.jzg.quotation.commons.entity.vo.orders.InsOrdersVo;
 import com.jzg.commons.entity.vo.OrdersListVo;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
-
-import java.lang.reflect.InvocationTargetException;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.quotation.commons.entity.vo.orders.InsOrdersAdd;
+import com.jzg.quotation.commons.entity.vo.orders.InsOrdersEnd;
 
 public interface InsOrdersService extends IService<InsOrders> {
 
@@ -25,21 +22,7 @@ public interface InsOrdersService extends IService<InsOrders> {
     InsOrdersVo selectById(Long id);
 
 
-    HttpResult updateOrders(InsOrdersAdd ordersAdd);
-
-    /**
-     * 根据报价参数生成订单
-     */
-
-    void generateOrders(QuoteVo quoteVo);
-
-    /**
-     * 保存报价的订单
-     * @return
-     */
-    boolean saveQuoteOrders(QuoteVo quoteVo) throws InvocationTargetException, IllegalAccessException;
-
-
+    HttpResult updateOrders(InsOrdersEnd ordersEnd);
 
 
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrdersTaxService.java

@@ -1,9 +1,7 @@
 package com.jzg.quotation.summary.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersTax;
 
 public interface InsOrdersTaxService extends IService<InsOrdersTax> {
-    void createTax(InsOrders insOrders);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsTaskImagesService.java

@@ -6,14 +6,12 @@ import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.po.InsTaskImages;
 import com.jzg.commons.entity.vo.InsTaskImagesVo;
 
-import java.util.List;
-
 public interface InsTaskImagesService extends IService<InsTaskImages> {
 
 
     HttpResult save(InsTaskImagesAdd insTaskImagesAddList);
 
-    List<InsTaskImagesVo> selectByQuoteNo(String quoteNo);
+    InsTaskImagesVo selectByQuoteNo(String quoteNo);
 
 
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/IdentifyServiceImpl.java

@@ -43,6 +43,11 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class IdentifyServiceImpl implements IdentifyService {
 
+    private static final Map<String, String> USE_NATURE_MAP = Map.of(
+            "营运", "营业",
+            "货运", "营业",
+            "非营运", "非营业"
+    );
 
     @Resource
     private RedissonClient redissonClient;
@@ -163,20 +168,15 @@ public class IdentifyServiceImpl implements IdentifyService {
      */
     private CardUserInfo  convertUseNatureCode(CardUserInfo cardUserInfo) {
         String useNature = cardUserInfo.getUseNature();
-        if(useNature!=null && !"".equals(useNature)){
-            if("营运".equals(useNature) || "货运".equals(useNature)){
-                useNature="营业";
-            }else if("非营运".equals(useNature)){
-                useNature="非营业";
-            }else{
-                useNature="";
-            }
+        if (StringUtils.isEmpty(useNature)) {
+            return cardUserInfo;
         }
-        String useNatureKey = getString(useNature);
+        String useNatureKey = getString(USE_NATURE_MAP.getOrDefault(useNature, ""));
         cardUserInfo.setUseNature(useNatureKey==null?"":useNatureKey);
         return cardUserInfo;
     }
 
+
     private static String getString(String useNature) {
         Map<String, String> enumMap= new HashMap<>();
         Map<String, DictionaryManagement> m = DictEnumConfig.getDmMap();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersCarInfoServiceImpl.java

@@ -1,67 +1,11 @@
 package com.jzg.quotation.summary.service.impl;
 
-import cn.hutool.core.date.DateTime;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
-import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
-import com.jzg.commons.entity.po.SysUserJzgInfo;
-import com.jzg.commons.entity.quote.vo.CarInfoVo;
 import com.jzg.quotation.summary.mapper.InsOrdersCarInfoMapper;
 import com.jzg.quotation.summary.service.InsOrdersCarInfoService;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Objects;
-
 @Service
 public class InsOrdersCarInfoServiceImpl extends ServiceImpl<InsOrdersCarInfoMapper, InsOrdersCarInfo> implements InsOrdersCarInfoService {
-
-    @Override
-    public InsOrdersCarInfo createCarInfo(InsOrders insOrders, CarInfoVo carInfoVo, DateTimeFormatter formatter) {
-        InsOrdersCarInfo info = new InsOrdersCarInfo();
-        info.setOrderNo(insOrders.getId());
-        info.setBrandName(carInfoVo.getBrandName());
-        info.setLicenseNo(carInfoVo.getLicenseNo());
-        info.setRegistered(Objects.isNull(carInfoVo.getLicenseNo()) && carInfoVo.getLicenseNo().isEmpty());
-        info.setVinNo(carInfoVo.getVinNo());
-        info.setEngineNo(carInfoVo.getEngineNo());
-        info.setCarYear(carInfoVo.getCarYear());
-        info.setDisplacement(carInfoVo.getDisplacement());
-        info.setSeatCount(Integer.parseInt(carInfoVo.getSeatCount()));
-        info.setCompleteKerbMass(new BigDecimal(carInfoVo.getCompleteKerbMass()));
-        info.setLimitLoad(new BigDecimal(carInfoVo.getLimitLoad()));
-        info.setPowerScale(new BigDecimal(carInfoVo.getPowerScale()));
-        info.setPurchasePrice(new BigDecimal(carInfoVo.getPurchasePrice()));
-        info.setCarNatureCode(carInfoVo.getCarNatureCode());
-        info.setVehicleUseCode(carInfoVo.getVehicleUseCode());
-        info.setCarTypeCode(carInfoVo.getCarTypeCode());
-        info.setCarKindCode(carInfoVo.getCarKindCode());
-        info.setEnergyTypeCode(carInfoVo.getEnergyTypeCode());
-        info.setPropertyCode(carInfoVo.getPropertyCode());
-        info.setLicenseColorCode(carInfoVo.getLicenseColorCode());
-        info.setCarKindDetailIdCode(carInfoVo.getCarKindDetailIdCode());
-        info.setLicenseKindCode(carInfoVo.getLicenseKindCode());
-        info.setRegisterDate(LocalDate.parse(carInfoVo.getRegisterDate(), formatter).atStartOfDay());
-        info.setIssueDate(LocalDate.parse(carInfoVo.getIssueDate(),formatter).atStartOfDay());
-        info.setTransfer(carInfoVo.isTransfer() ? "1" : "0");
-        if (info.getTransfer().equals("1")) {
-            info.setTransferDate(LocalDate.parse(carInfoVo.getTransferDate(),formatter).atStartOfDay());
-        } else {
-            info.setTransferDate(null);
-        }
-        info.setTransferBi(carInfoVo.isCiTransfer() ? "1" : "0");
-        this.save(info);
-        return info;
-    }
-
-    @Override
-    public InsOrdersCarInfo getByOrderId(String orderId) {
-        return baseMapper.selectById(orderId);
-    }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersCarUserInfoServiceImpl.java

@@ -1,53 +1,15 @@
 package com.jzg.quotation.summary.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
-import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
 import com.jzg.quotation.summary.mapper.InsOrdersCarUserInfoMapper;
 import com.jzg.quotation.summary.service.InsOrdersCarUserInfoService;
-import net.sf.cglib.core.Local;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-
 @Service
 public class InsOrdersCarUserInfoServiceImpl extends ServiceImpl<InsOrdersCarUserInfoMapper, InsOrdersCarUserInfo> implements InsOrdersCarUserInfoService {
     @Override
-    public InsOrdersCarUserInfo createUserInfo(String orderNo, CustomerInfoVo customerInfoVo, DateTimeFormatter formatter, Integer policyPersonType) {
-        InsOrdersCarUserInfo info = new InsOrdersCarUserInfo();
-        info.setOrderNo(orderNo);
-        info.setPolicyPersonType(policyPersonType); // 车主
-        info.setPersonType(Integer.parseInt(customerInfoVo.getProperty()));
-        info.setName(customerInfoVo.getName());
-        info.setIdentifyNumber(customerInfoVo.getIdentifyNumber());
-//        info.setAge(Integer.parseInt(customerInfoVo.getAge()));
-//        info.setGender(customerInfoVo.getGender());
-        info.setAddr(customerInfoVo.getAddr());
-        info.setIdentifyValidDate(LocalDate.parse(customerInfoVo.getIdentifyValidDate(), formatter).atStartOfDay());
-        info.setIdentifyValidEndDate(LocalDate.parse(customerInfoVo.getIdentifyValidEndDate(), formatter).atStartOfDay());
-        info.setMobile(customerInfoVo.getMobile());
-        info.setEmail(customerInfoVo.getEmail());
-
-        if (customerInfoVo.getProperty().equals("1")) {
-            info.setCerType(1); // 个人
-        } else {
-            info.setCerType(2); // 法人
-            info.setProvinceCode(customerInfoVo.getProvinceCode());
-            info.setCityCode(customerInfoVo.getCityCode());
-            info.setCountyCode(customerInfoVo.getCountyCode());
-        }
-        return info;
+    public void deleteOrderNo(Long orderNo) {
+        baseMapper.deleteOrderNo(orderNo);
     }
-
-    @Override
-    public List<InsOrdersCarUserInfo> getByOrderId(String orderId) {
-        return baseMapper.selectList(new LambdaQueryWrapper<InsOrdersCarUserInfo>().eq(InsOrdersCarUserInfo::getOrderNo, orderId));
-    }
-
-
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersCostsServiceImpl.java

@@ -1,23 +1,11 @@
 package com.jzg.quotation.summary.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCosts;
 import com.jzg.quotation.summary.mapper.InsOrdersCostsMapper;
 import com.jzg.quotation.summary.service.InsOrdersCostsService;
 import org.springframework.stereotype.Service;
 
-/**
- * @author quchen
- * @date 2025/3/28 14:59
- */
-
 @Service
 public class InsOrdersCostsServiceImpl extends ServiceImpl<InsOrdersCostsMapper, InsOrdersCosts> implements InsOrdersCostsService {
-    @Override
-    public void createCosts(InsOrders insOrders) {
-        InsOrdersCosts insOrdersCosts = new InsOrdersCosts();
-        insOrdersCosts.setOrderNo(insOrders.getId());
-        this.save(insOrdersCosts);
-    }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersKindServiceImpl.java

@@ -1,38 +1,15 @@
 package com.jzg.quotation.summary.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersKind;
-import com.jzg.commons.entity.quote.vo.KindInfoVo;
-import com.jzg.commons.exception.SystemException;
-import com.jzg.quotation.commons.constant.enums.base.QuoteRuleCategory;
-import com.jzg.quotation.commons.entity.vo.base.OrderBase;
-import com.jzg.quotation.summary.converter.QuoteInfoConverter;
-import com.jzg.quotation.summary.entity.po.QuoteRuleMapping;
 import com.jzg.quotation.summary.mapper.InsOrdersKindMapper;
 import com.jzg.quotation.summary.service.InsOrdersKindService;
-import com.jzg.quotation.summary.service.QuoteRuleMappingService;
-import com.sun.tools.javac.Main;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
-
-import javax.security.auth.login.AppConfigurationEntry;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 @Service
 public class InsOrdersKindServiceImpl extends ServiceImpl<InsOrdersKindMapper, InsOrdersKind> implements InsOrdersKindService {
     @Override
-    public void createKind(InsOrders insOrders, List<KindInfoVo> kindInfoVo, String companyCode) {
+    public void deleteOrderNo(Long orderNo) {
+        baseMapper.deleteOrderNo(orderNo);
     }
-
-
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersOtherServiceImpl.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.summary.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersOther;
 import com.jzg.quotation.summary.mapper.InsOrdersOtherMapper;
 import com.jzg.quotation.summary.service.InsOrdersOtherService;
@@ -9,10 +8,4 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class InsOrdersOtherServiceImpl extends ServiceImpl<InsOrdersOtherMapper, InsOrdersOther> implements InsOrdersOtherService {
-    @Override
-    public void createOther(InsOrders insOrders) {
-        InsOrdersOther insOrdersOther = new InsOrdersOther();
-        insOrdersOther.setOrderNo(insOrders.getId());
-        this.save(insOrdersOther);
-    }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersPolicyServiceImpl.java

@@ -1,24 +0,0 @@
-package com.jzg.quotation.summary.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.orders.po.InsOrders;
-import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
-import com.jzg.quotation.summary.mapper.InsOrdersPolicyMapper;
-import com.jzg.quotation.summary.service.InsOrdersPolicyService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author quchen
- * @date 2025/3/29 10:12
- */
-
-@Service
-public class InsOrdersPolicyServiceImpl extends ServiceImpl<InsOrdersPolicyMapper, InsOrdersPolicy> implements InsOrdersPolicyService {
-
-    @Override
-    public void createPolicy(InsOrders insOrders) {
-        InsOrdersPolicy insOrdersPolicy = new InsOrdersPolicy();
-        insOrdersPolicy.setOrderNo(insOrders.getId());
-        this.save(insOrdersPolicy);
-    }
-}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersRiskServiceImpl.java

@@ -1,43 +1,15 @@
 package com.jzg.quotation.summary.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersRisk;
-import com.jzg.commons.entity.quote.vo.RiskInfoVo;
 import com.jzg.quotation.summary.mapper.InsOrdersRiskMapper;
 import com.jzg.quotation.summary.service.InsOrdersRiskService;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-
 @Service
 public class InsOrdersRiskServiceImpl extends ServiceImpl<InsOrdersRiskMapper, InsOrdersRisk> implements InsOrdersRiskService {
     @Override
-    public void createRisk(InsOrders insOrders, RiskInfoVo ciRiskInfoVo, RiskInfoVo biRiskInfoVo) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-        List<InsOrdersRisk> insOrdersRiskList = new ArrayList<>();
-        if (Objects.nonNull(ciRiskInfoVo)) {
-            InsOrdersRisk ciInsOrdersRisk = new InsOrdersRisk();
-            ciInsOrdersRisk.setOrderNo(insOrders.getId());
-            ciInsOrdersRisk.setRiskName("交强险");
-            ciInsOrdersRisk.setRiskCode(ciRiskInfoVo.getRiskCode());
-            ciInsOrdersRisk.setStartDate(LocalDateTime.parse(ciRiskInfoVo.getStartDate(), formatter));
-            ciInsOrdersRisk.setEndDate(LocalDateTime.parse(ciRiskInfoVo.getEndDate(), formatter));
-            insOrdersRiskList.add(ciInsOrdersRisk);
-        }
-        if (Objects.nonNull(biRiskInfoVo)) {
-            InsOrdersRisk biInsOrdersRisk = new InsOrdersRisk();
-            biInsOrdersRisk.setOrderNo(insOrders.getId());
-            biInsOrdersRisk.setRiskName("商业险");
-            biInsOrdersRisk.setRiskCode(biRiskInfoVo.getRiskCode());
-            biInsOrdersRisk.setStartDate(LocalDateTime.parse(biRiskInfoVo.getStartDate(), formatter));
-            biInsOrdersRisk.setEndDate(LocalDateTime.parse(biRiskInfoVo.getEndDate(), formatter));
-            insOrdersRiskList.add(biInsOrdersRisk);
-        }
-        this.saveBatch(insOrdersRiskList);
+    public void deleteOrderNo(Long orderNo) {
+        baseMapper.deleteOrderNo(orderNo);
     }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -1,68 +1,57 @@
 package com.jzg.quotation.summary.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.constants.CompanyConstants;
-import com.jzg.commons.constants.dict.InsOrderStatusEnum;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.dto.InsOrdersAdd;
 import com.jzg.commons.entity.dto.InsOrdersParam;
-import com.jzg.commons.entity.dto.InsuranceInfo;
+import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.orders.po.*;
-import com.jzg.commons.entity.quote.vo.CustomerInfoVo;
+import com.jzg.commons.entity.po.InsTaskImages;
+import com.jzg.commons.entity.quote.vo.*;
 import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
-import com.jzg.commons.entity.vo.InsOrdersVo;
+import com.jzg.commons.entity.vo.InsTaskImagesVo;
 import com.jzg.commons.entity.vo.OrdersListVo;
-import com.jzg.commons.util.StringUtils;
-import com.jzg.commons.util.idgen.IdGenerate;
-import com.jzg.quotation.commons.constant.enums.base.ProductsType;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
-import com.jzg.commons.util.idgen.IdGenerate;
-import com.jzg.quotation.commons.entity.vo.aggregated.QuoteVo;
+import com.jzg.commons.util.MinioUtils;
+import com.jzg.quotation.commons.entity.vo.orders.InsOrdersAdd;
+import com.jzg.quotation.commons.entity.vo.orders.InsOrdersEnd;
+import com.jzg.quotation.commons.entity.vo.orders.InsOrdersVo;
 import com.jzg.quotation.commons.utils.SnowFlakeUtil;
 import com.jzg.quotation.summary.mapper.InsOrdersMapper;
 import com.jzg.quotation.summary.service.*;
-import org.apache.commons.beanutils.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 
+@RequiredArgsConstructor
 @Service
 public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders> implements InsOrdersService {
 
-    @Autowired
-    private InsOrdersMapper insOrdersMapper;
+    private final InsOrdersMapper insOrdersMapper;
 
-    @Autowired
-    private InsOrdersCarInfoService ordersCarInfoService;
+    private final InsOrdersCarInfoService ordersCarInfoService;
 
-    @Autowired
-    private InsOrdersCarUserInfoService ordersCarUserInfoService;
+    private final InsOrdersCarUserInfoService ordersCarUserInfoService;
+    
+    private final InsOrdersOtherService insOrdersOtherService;
+    
+    private final InsOrdersKindService insOrdersKindService;
+    
+    private final InsOrdersRiskService insOrdersRiskService;
+    
+    private final InsOrdersTaxService insOrdersTaxService;
 
-    @Autowired
-    private InsOrdersOtherService insOrdersOtherService;
+    private final InsTaskImagesService insTaskImagesService;
 
-    @Autowired
-    private InsOrdersKindService insOrdersKindService;
+    private final InsOrdersExternalPolicyService policyService;
 
-    @Autowired
-    private InsOrdersRiskService insOrdersRiskService;
-
-    @Autowired
-    private InsOrdersTaxService insOrdersTaxService;
-
-    @Autowired
-    private InsOrdersCostsService insOrdersCostsService;
-
-    @Autowired
-    private InsOrdersPolicyService insOrdersPolicyService;
+    private final InsOrdersCostsService ordersCostsService;
 
     /**
      * 保存订单信息
@@ -74,22 +63,21 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Transactional(rollbackFor = Exception.class)
     public HttpResult saveOrders(InsOrdersAdd ordersAdd) {
         // 检查输入参数是否为空，如果为空则返回错误信息
-        if (ordersAdd == null || ordersAdd.getInsOrders() == null || ordersAdd.getCarInfoVo() == null
-                || ordersAdd.getCarUserInfoList() == null || ordersAdd.getInsOrdersOtherInfo() == null
-                || ordersAdd.getInsuranceInfo() == null) {
-            return HttpResult.error("参数不能为空");
-        }
+
 
         try {
             // 获取订单对象并设置引用编号
             InsOrders insOrders = ordersAdd.getInsOrders();
-            String quoteNo = String.valueOf(SnowFlakeUtil.getSnowFlakeId());
+            Long quoteNo = SnowFlakeUtil.getSnowFlakeId();
             // 如果生成的引用编号为空，则返回错误信息
             if (quoteNo == null) {
                 return HttpResult.error("生成引用编号失败");
             }
-            insOrders.setQuoteNo(String.valueOf(quoteNo));
-
+            insOrders.setQuoteNo(quoteNo);
+            insOrders.setCompanyId(ordersAdd.getInsOrdersOtherInfo().getCompanyId());
+            insOrders.setCompanyName(ordersAdd.getInsOrdersOtherInfo().getCompanyName());
+            insOrders.setSigningTime(ordersAdd.getInsOrdersOtherInfo().getSigningTime());
+            insOrders.setIsTemporarily(ordersAdd.getIsTemporarily());
             // 插入订单信息，如果插入失败，则返回错误信息
             int insertResult = insOrdersMapper.insert(insOrders);
             if (insertResult <= 0) {
@@ -98,42 +86,76 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
 
             // 获取车辆信息对象，并设置订单编号，然后保存车辆信息
-            InsOrdersCarInfo carInfoVo = ordersAdd.getCarInfoVo();
-            carInfoVo.setOrderNo(String.valueOf(quoteNo));
-            ordersCarInfoService.save(carInfoVo);
+            CarInfoVo carInfoVo = ordersAdd.getCarInfoVo();
+            InsOrdersCarInfo insOrdersCarInfo = BeanUtil.copyProperties(carInfoVo, InsOrdersCarInfo.class);
+            insOrdersCarInfo.setOrderNo(quoteNo);
+            ordersCarInfoService.save(insOrdersCarInfo);
 
             // 获取用户信息对象，并设置订单编号，然后保存用户信息
-            List<InsOrdersCarUserInfo> carUserInfoList = ordersAdd.getCarUserInfoList();
-            for (InsOrdersCarUserInfo carUserInfo : carUserInfoList) {
-                carUserInfo.setOrderNo(String.valueOf(quoteNo));
-            }
-            ordersCarUserInfoService.saveBatch(carUserInfoList);
+            List<InsOrdersCarUserInfo> userInfos = new ArrayList<>();
+            InsOrdersCarUserInfo ownersInfo = BeanUtil.copyProperties(ordersAdd.getOwnersInfo(), InsOrdersCarUserInfo.class);
+            ownersInfo.setPolicyPersonType(1);
+            ownersInfo.setOrderNo(quoteNo);
+            userInfos.add(ownersInfo);
+            InsOrdersCarUserInfo policyHolderInfo = BeanUtil.copyProperties(ordersAdd.getPolicyHolderInfo(), InsOrdersCarUserInfo.class);
+            policyHolderInfo.setOrderNo(quoteNo);
+            policyHolderInfo.setPolicyPersonType(2);
+            userInfos.add(policyHolderInfo);
+            InsOrdersCarUserInfo insuredPersonInfo = BeanUtil.copyProperties(ordersAdd.getInsuredPersonInfo(), InsOrdersCarUserInfo.class);
+            insuredPersonInfo.setOrderNo(quoteNo);
+            insuredPersonInfo.setPolicyPersonType(3);
+            userInfos.add(insuredPersonInfo);
+            ordersCarUserInfoService.saveBatch(userInfos);
 
             // 保险订单其他信息
             InsOrdersOtherInfoVo insOrdersOtherInfo = ordersAdd.getInsOrdersOtherInfo();
-//            insOrdersOther.setOrderNo(quoteNo);
-//            insOrdersOtherService.save(insOrdersOther);
 
-            // 保险信息
-            InsuranceInfo insuranceInfo = ordersAdd.getInsuranceInfo();
+            InsOrdersOther insOrdersOther = BeanUtil.copyProperties(insOrdersOtherInfo, InsOrdersOther.class);
+
+            insOrdersOther.setOrderNo(quoteNo);
+            insOrdersOtherService.save(insOrdersOther);
+
+            InsOrdersCosts insOrdersCosts = BeanUtil.copyProperties(insOrdersOtherInfo, InsOrdersCosts.class);
+            insOrdersCosts.setOrderNo(quoteNo);
+            ordersCostsService.save(insOrdersCosts);
+
             // 保险种类信息
-            List<InsOrdersKind> insOrdersKindList = insuranceInfo.getInsOrdersKindList();
-            for (InsOrdersKind insOrdersKind : insOrdersKindList) {
+            List<KindInfoVo> kindInfoVo = ordersAdd.getKindInfoVo();
+            List<InsOrdersKind> insOrdersKinds = BeanUtil.copyToList(kindInfoVo, InsOrdersKind.class);
+            for (InsOrdersKind insOrdersKind : insOrdersKinds) {
                 insOrdersKind.setOrderNo(quoteNo);
             }
-            insOrdersKindService.saveBatch(insOrdersKindList);
+            insOrdersKindService.saveBatch(insOrdersKinds);
 
             // 税费信息
-            InsOrdersTax insOrdersTax = insuranceInfo.getInsOrdersTax();
+            VehicleAndVesselTaxVo vehicleAndVesselTax = ordersAdd.getVehicleAndVesselTax();
+            InsOrdersTax insOrdersTax = BeanUtil.copyProperties(vehicleAndVesselTax, InsOrdersTax.class);
             insOrdersTax.setOrderNo(quoteNo);
             insOrdersTaxService.save(insOrdersTax);
 
-            // 风险信息
-            List<InsOrdersRisk> insOrdersRiskList = insuranceInfo.getInsOrdersRiskList();
-            for (InsOrdersRisk insOrdersRisk : insOrdersRiskList) {
-                insOrdersRisk.setOrderNo(quoteNo);
+            // 交强险 险种信息
+            RiskInfoVo ciRiskInfoVo = ordersAdd.getCiRiskInfoVo();
+            InsOrdersRisk insuranceInfo = BeanUtil.copyProperties(ciRiskInfoVo, InsOrdersRisk.class);
+            insuranceInfo.setOrderNo(quoteNo);
+            insOrdersRiskService.save(insuranceInfo);
+            // 商业险 险种信息
+            InsOrdersRisk biRiskInfoVo = BeanUtil.copyProperties(ordersAdd.getBiRiskInfoVo(), InsOrdersRisk.class);
+            biRiskInfoVo.setOrderNo(quoteNo);
+            insOrdersRiskService.save(biRiskInfoVo);
+
+            InsTaskImagesAdd imagesAdds = ordersAdd.getImagesAdds();
+            if (ObjectUtil.isNotEmpty(imagesAdds)){
+                List<InsTaskImages> insTaskImages = BeanUtil.copyToList(imagesAdds.getImages(), InsTaskImages.class);
+                insTaskImages.forEach(image->{
+                    image.setQuoteNo(imagesAdds.getQuoteNo());
+                    insTaskImagesService.save(image);
+                });
             }
-            insOrdersRiskService.saveBatch(insOrdersRiskList);
+
+            InsOrdersExternalPolicy ordersExternalPolicy = ordersAdd.getInsOrdersExternalPolicy();
+            ordersExternalPolicy.setOrderNo(String.valueOf(quoteNo));
+            policyService.save(ordersExternalPolicy);
+
 
             // 返回成功信息，表示订单、车辆和用户信息保存成功
             return HttpResult.ok("保存成功");
@@ -147,36 +169,91 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
 
     @Override
-    public HttpResult updateOrders(InsOrdersAdd ordersAdd) {
+    public HttpResult updateOrders(InsOrdersEnd ordersEnd) {
+        try {
+            // 获取订单对象并设置引用编号
+            InsOrders insOrders = ordersEnd.getInsOrders();
+            InsOrdersOtherInfoVo ordersOtherInfo = ordersEnd.getInsOrdersOtherInfo();
+            if (ObjectUtil.isNotEmpty(ordersOtherInfo)){
+                insOrders.setCompanyId(ordersOtherInfo.getCompanyId());
+                insOrders.setCompanyName(ordersOtherInfo.getCompanyName());
+                insOrders.setSigningTime(ordersOtherInfo.getSigningTime());
+            }
+            // 插入订单信息，如果插入失败，则返回错误信息
+            int insertResult = insOrdersMapper.updateById(insOrders);
+            if (insertResult <= 0) {
+                log.error("订单插入失败，订单信息: {}");
+                return HttpResult.error("修改订单失败");
+            }
 
-        return null;
-    }
+            // 获取车辆信息对象，并设置订单编号，然后保存车辆信息
+            InsOrdersCarInfo insOrdersCarInfo = BeanUtil.copyProperties(ordersEnd.getCarInfoVo(), InsOrdersCarInfo.class);
+            ordersCarInfoService.update(insOrdersCarInfo,new LambdaUpdateWrapper<>(InsOrdersCarInfo.class).eq(InsOrdersCarInfo::getOrderNo,insOrders.getQuoteNo()));
 
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public boolean saveQuoteOrders(QuoteVo quoteVo) throws InvocationTargetException, IllegalAccessException {
-        InsOrders insOrders = new InsOrders();
-        insOrders.setId(IdGenerate.nextId());
-        insOrders.setQuoteNo(quoteVo.getOrder().getQuoteNo());
-        insOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_ING.getCode());
-        insOrders.setCompanyId(quoteVo.getOrder().getInsuranceCompanyCode());
-        insOrders.setProductId(quoteVo.getOrder().getProductsCode());
-//        insOrdersMapper.insert(insOrders);
+            // 获取用户信息对象，并设置订单编号，然后保存用户信息
+            List<InsOrdersCarUserInfo> userInfos = new ArrayList<>();
+            InsOrdersCarUserInfo ownersInfo = BeanUtil.copyProperties(ordersEnd.getOwnersInfo(), InsOrdersCarUserInfo.class);
 
-        InsOrdersCarInfo carInfo = new InsOrdersCarInfo();
-        BeanUtils.copyProperties(carInfo,quoteVo.getCarInfoVo());
-        carInfo.setOrderNo(insOrders.getId());
+            userInfos.add(ownersInfo);
+            InsOrdersCarUserInfo policyHolderInfo = BeanUtil.copyProperties(ordersEnd.getPolicyHolderInfo(), InsOrdersCarUserInfo.class);
 
-        InsOrdersCarUserInfo ownersInfo = new InsOrdersCarUserInfo();
-        BeanUtils.copyProperties(ownersInfo,quoteVo.getOwnersInfo());
+            userInfos.add(policyHolderInfo);
+            InsOrdersCarUserInfo insuredPersonInfo = BeanUtil.copyProperties(ordersEnd.getInsuredPersonInfo(), InsOrdersCarUserInfo.class);
+
+            userInfos.add(insuredPersonInfo);
+            //
+            ordersCarUserInfoService.updateBatchById(userInfos);
+
+            // 保险订单其他信息
+            InsOrdersOtherInfoVo insOrdersOtherInfo = ordersEnd.getInsOrdersOtherInfo();
 
-        InsOrdersCarUserInfo insuredPersonInfo = new InsOrdersCarUserInfo();
-        BeanUtils.copyProperties(insuredPersonInfo,quoteVo.getInsuredPersonInfo());
+            InsOrdersOther insOrdersOther = BeanUtil.copyProperties(insOrdersOtherInfo, InsOrdersOther.class);
 
-        InsOrdersCarUserInfo policyHolderInfo = new InsOrdersCarUserInfo();
-        BeanUtils.copyProperties(policyHolderInfo,quoteVo.getPolicyHolderInfo());
+            insOrdersOtherService.update(insOrdersOther,new LambdaUpdateWrapper<>(InsOrdersOther.class).eq(InsOrdersOther::getOrderNo,insOrders.getQuoteNo()));
+            // 保存其他信息
+            InsOrdersCosts insOrdersCosts = BeanUtil.copyProperties(insOrdersOtherInfo, InsOrdersCosts.class);
+            insOrdersCosts.setOrderNo(insOrders.getQuoteNo());
+            ordersCostsService.update(insOrdersCosts,new LambdaUpdateWrapper<>(InsOrdersCosts.class).eq(InsOrdersCosts::getOrderNo,insOrders.getQuoteNo()));
 
-        return true;
+            // 保险种类信息
+            List<KindInfoVo> kindInfoVo = ordersEnd.getKindInfoVo();
+            List<InsOrdersKind> insOrdersKinds = BeanUtil.copyToList(kindInfoVo, InsOrdersKind.class);
+            insOrdersKindService.updateBatchById(insOrdersKinds);
+
+            // 税费信息
+            VehicleAndVesselTaxVo vehicleAndVesselTax = ordersEnd.getVehicleAndVesselTax();
+            InsOrdersTax insOrdersTax = BeanUtil.copyProperties(vehicleAndVesselTax, InsOrdersTax.class);
+            insOrdersTaxService.update(insOrdersTax,new LambdaUpdateWrapper<>(InsOrdersTax.class).eq(InsOrdersTax::getOrderNo,insOrders.getQuoteNo()));
+
+            // 交强险 险种信息
+            RiskInfoVo ciRiskInfoVo = ordersEnd.getCiRiskInfoVo();
+            InsOrdersRisk insuranceInfo = BeanUtil.copyProperties(ciRiskInfoVo, InsOrdersRisk.class);
+            insOrdersRiskService.update(insuranceInfo,new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo,insOrders.getQuoteNo()));
+            // 商业险 险种信息
+            InsOrdersRisk biRiskInfoVo = BeanUtil.copyProperties(ordersEnd.getBiRiskInfoVo(), InsOrdersRisk.class);
+            insOrdersRiskService.update(biRiskInfoVo,new LambdaUpdateWrapper<>(InsOrdersRisk.class).eq(InsOrdersRisk::getOrderNo,insOrders.getQuoteNo()));
+
+            InsTaskImagesAdd imagesAdds = ordersEnd.getImagesAdds();
+            if (ObjectUtil.isNotEmpty(imagesAdds)){
+                List<InsTaskImages> insTaskImages = BeanUtil.copyToList(imagesAdds.getImages(), InsTaskImages.class);
+                insTaskImages.forEach(image->{
+                    image.setQuoteNo(imagesAdds.getQuoteNo());
+                    insTaskImagesService.save(image);
+                });
+            }
+
+            InsOrdersExternalPolicy ordersExternalPolicy = ordersEnd.getInsOrdersExternalPolicy();
+            policyService.update(ordersExternalPolicy,new LambdaUpdateWrapper<>(InsOrdersExternalPolicy.class).eq(InsOrdersExternalPolicy::getOrderNo,ordersExternalPolicy.getOrderNo()));
+
+
+            // 返回成功信息，表示订单、车辆和用户信息修改成功
+            return HttpResult.ok("修改成功");
+
+        } catch (Exception e) {
+            // 如果在保存过程中发生异常，则记录日志并抛出运行时异常
+            log.error("修改订单时发生异常", e);
+            throw new RuntimeException("修改订单失败，请检查输入数据", e);
+        }
     }
 
 
@@ -188,58 +265,68 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     @Override
     public InsOrdersVo selectById(Long id) {
-        return insOrdersMapper.selectById(id);
+        // 1. 查询订单信息
+        InsOrdersVo insOrdersVo = insOrdersMapper.selectById(id);
+        if (insOrdersVo == null) {
+            throw new IllegalArgumentException("查询结果为空，无法处理订单信息");
+        }
+        // 2. 处理车辆用户信息列表
+        if (CollectionUtil.isNotEmpty(insOrdersVo.getCarUserInfoList())) {
+            for (InsOrdersCarUserInfo carUserInfo : insOrdersVo.getCarUserInfoList()) {
+                // 使用映射逻辑处理用户信息
+                CustomerInfoVo customerInfoVo = mapCarUserInfoToCustomerInfo(carUserInfo);
+                setPolicyPersonInfo(insOrdersVo, carUserInfo.getPolicyPersonType(), customerInfoVo);
+            }
+            insOrdersVo.setCarUserInfoList(null);
+        }
+        InsTaskImagesVo imagesAdds = insOrdersVo.getImagesAdds();
+        if (ObjectUtil.isNotEmpty(imagesAdds)){
+            imagesAdds.getImages().forEach(image -> {
+                image.setPreviewUrl(MinioUtils.getPresignedObjectUrl(image.getBucketName(), image.getFileName()));
+            });
+        }
+        setInsOrdersExternalPolicy(insOrdersVo.getInsOrdersExternalPolicy());
+        return insOrdersVo;
     }
 
 
-    @Override
-    public void generateOrders(QuoteVo quoteVo) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        // 保存主订单信息
-        InsOrders insOrders = new InsOrders();
-        insOrders.setQuoteNo(String.valueOf(SnowFlakeUtil.getSnowFlakeId()));
-        insOrders.setAgreementId(quoteVo.getOrder().getAgreementId());
-        insOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_ING.getCode()); // 订单状态 报价中
-        insOrders.setApiType(String.valueOf(quoteVo.getOrder().getApiType()));
-        insOrders.setCompanyId(quoteVo.getOrder().getInsuranceCompanyCode());
-        String companyName = CompanyConstants.getCompanyNameByCode(quoteVo.getOrder().getInsuranceCompanyCode());
-        insOrders.setCompanyName(companyName);
-        insOrders.setProductId(quoteVo.getOrder().getProductsCode());
-        String productName = ProductsType.getProductNameByCode(quoteVo.getOrder().getProductsCode());
-        insOrders.setProductName(productName);
-        insOrdersMapper.insert(insOrders);
-
-        // 保存订单车辆信息
-        ordersCarInfoService.createCarInfo(insOrders, quoteVo.getCarInfoVo(), formatter);
-
-        // 保存订单用户信息
-        List<InsOrdersCarUserInfo> insOrdersCarUserInfoList = new ArrayList<>();
-        // 添加车主信息
-        insOrdersCarUserInfoList.add(ordersCarUserInfoService.createUserInfo(insOrders.getId(), quoteVo.getOwnersInfo(), formatter,1));
-        // 添加投保人信息
-        insOrdersCarUserInfoList.add(ordersCarUserInfoService.createUserInfo(insOrders.getId(), quoteVo.getPolicyHolderInfo(), formatter,2));
-        // 添加被保险人信息
-        insOrdersCarUserInfoList.add(ordersCarUserInfoService.createUserInfo(insOrders.getId(), quoteVo.getInsuredPersonInfo(), formatter,3));
-        ordersCarUserInfoService.saveBatch(insOrdersCarUserInfoList);
-
-        // 保存订单费用信息 ins_orders_costs
-        insOrdersCostsService.createCosts(insOrders);
-
-        // 保存订单其他信息 ins_orders_other
-        insOrdersOtherService.createOther(insOrders);
-
-        // 保存订单投保单号 保单号信息 ins_orders_policy
-        insOrdersPolicyService.createPolicy(insOrders);
-
-        // 保存订单险种信息 ins_orders_risk
-        insOrdersRiskService.createRisk(insOrders, quoteVo.getCiRiskInfoVo(),quoteVo.getBiRiskInfoVo());
-
-        // 保存订单险种信息 ins_orders_kind
-        insOrdersKindService.createKind(insOrders, quoteVo.getKindInfoVo(),quoteVo.getOrder().getInsuranceCompanyCode());
-
-        // 保存订单车船税税信息 ins_orders_tax
-        insOrdersTaxService.createTax(insOrders);
+    public void setInsOrdersExternalPolicy(InsOrdersExternalPolicy ordersExternalPolicy) {
+        if (ObjectUtil.isNotEmpty(ordersExternalPolicy) && CollectionUtil.isNotEmpty(ordersExternalPolicy.getUploadFiles())){
+            ordersExternalPolicy.getUploadFiles().stream().forEach(sysUploadFiles -> {
+                sysUploadFiles.setDownloadUrl(MinioUtils.getPresignedObjectUrl(sysUploadFiles.getBucketName(), sysUploadFiles.getFileName()));
+            });
+        }
+    }
 
+    /**
+     * 将 InsOrdersCarUserInfo 转换为 CustomerInfoVo
+     */
+    private CustomerInfoVo mapCarUserInfoToCustomerInfo(InsOrdersCarUserInfo carUserInfo) {
+        return BeanUtil.copyProperties(carUserInfo, CustomerInfoVo.class);
+    }
+
+    /**
+     * 根据 policyPersonType 设置对应的用户信息
+     */
+    private void setPolicyPersonInfo(InsOrdersVo insOrdersVo, Integer policyPersonType, CustomerInfoVo customerInfoVo) {
+        if (ObjectUtil.isEmpty(policyPersonType)){
+            return;
+        }
+        switch (policyPersonType) {
+            case 1:
+                insOrdersVo.setOwnersInfo(customerInfoVo);
+                break;
+            case 2:
+                insOrdersVo.setPolicyHolderInfo(customerInfoVo);
+                break;
+            case 3:
+                insOrdersVo.setInsuredPersonInfo(customerInfoVo);
+                break;
+            default:
+                // 记录未知类型，避免逻辑遗漏
+                log.warn("未知的 policyPersonType: {}");
+                break;
+        }
     }
 
 

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersTaxServiceImpl.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.summary.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersTax;
 import com.jzg.quotation.summary.mapper.InsOrdersTaxMapper;
 import com.jzg.quotation.summary.service.InsOrdersTaxService;
@@ -9,9 +8,4 @@ import org.springframework.stereotype.Service;
 
 @Service
 public class InsOrdersTaxServiceImpl extends ServiceImpl<InsOrdersTaxMapper, InsOrdersTax> implements InsOrdersTaxService {
-    public void createTax(InsOrders insOrders) {
-        InsOrdersTax insOrdersTax = new InsOrdersTax();
-        insOrdersTax.setOrderNo(insOrders.getId());
-        this.save(insOrdersTax);
-    }
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsTaskImagesServiceImpl.java

@@ -1,10 +1,10 @@
 package com.jzg.quotation.summary.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.po.InsTaskImages;
+import com.jzg.commons.entity.vo.ImagesVo;
 import com.jzg.commons.entity.vo.InsTaskImagesVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.MinioUtils;
@@ -38,13 +38,13 @@ public class  InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper,
     }
 
     @Override
-    public List<InsTaskImagesVo> selectByQuoteNo(String quoteNo) {
+    public InsTaskImagesVo selectByQuoteNo(String quoteNo) {
        try {
-           List<InsTaskImagesVo> insTaskImagesVos = baseMapper.selectByQuoteNo(quoteNo);
-           for (InsTaskImagesVo insTaskImagesVo : insTaskImagesVos) {
+           InsTaskImagesVo taskImagesVo = baseMapper.selectByQuoteNo(quoteNo);
+           for (ImagesVo insTaskImagesVo : taskImagesVo.getImages()) {
                insTaskImagesVo.setPreviewUrl(MinioUtils.getPresignedObjectUrl(insTaskImagesVo.getBucketName(), insTaskImagesVo.getFileName()));
            }
-           return insTaskImagesVos;
+           return taskImagesVo;
        }catch (Exception e){
            throw new SystemException("查询失败");
        }

tenant/insurance/quotation-summary/src/main/resources/application.yaml

@@ -81,13 +81,4 @@ yangguang:
     secret: 6CPxxlHwLLphTR7gVg3hJLsH
     referer: SXJZG
 
-chengtai:
-  api:
-    partnerCode: JZG_TYTQ_SX
-    baseUrl: http://39.98.238.167/chengtai/app/SERVER_V2/4001/
-    ctPublicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvuUnoPTFin84nDdpNZFDiGZgUKn6d9fbp6F4/fqrb6pFoJX/wLMr0IsheP0ZnVCPpLGKLjflPNHJo/P9WRRTSM67D8fRD8GKoq+7CtSJkdIticASpN/U8AgJiNV6xdReJcMkaAWJ1ZbOQ+nYLg9OE0qQ6cuXqhy/wVrqx72CrvwIDAQAB
-    publicKey: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCyVlpqmibguria884GdAYEuqCV4aQRl2N21+7l8Vxocoyz+M8KYyXqmlLKqApNL/U5pUVTjS6vpC6ojS+wvNbawijeMsm8r2NOlTHBnQ5vN0azjjPPtSrxgHL8/EYBa4lmBcexdmcUrUyWjAIYqfO8dlY+RuXvbiw7fBHZ7xpAvQIDAQAB
-    privateKey: MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALJWWmqaJuC6uJrzzgZ0BgS6oJXhpBGXY3bX7uXxXGhyjLP4zwpjJeqaUsqoCk0v9TmlRVONLq+kLqiNL7C81trCKN4yybyvY06VMcGdDm83RrOOM8+1KvGAcvz8RgFriWYFx7F2ZxStTJaMAhip87x2Vj5G5e9uLDt8EdnvGkC9AgMBAAECgYEAsEOHdEvOV1pWMdj9bgVpGW14YQu3RSfTSFheqGkpg5aMmSk3QbYDeOB1KhZysB3Ri9tdLRqi5TkqYK/DTjUnSUMs0iMhx0XaY2z3w16AMpvuJ0FZ4S2h8oAFfOWe4F6bpUYU8qmXANAaXcMm6HjU8k1QuTbjlSOeLujl8W7zk8ECQQDlHbUQ911kWmsSo8NE4S1+dq/6T+yIGCJlXzlNh/z6giMpjp8Dzm3fxDHLeZa+DCrhpT1qe6O3oGwx3HeR/85NAkEAx0NUy6pX5WolV+YAoLNHAmcCP26wQTB7LZ7mXbxww4yNNH9CWHE9PaBuV4Ws4NxSAnRDxrgArkz5+wgqnXzUMQJAHr16orkdra43+XtBYsd3jCUufT4l9SiPzNwW2yEovw+g2h2JlkAnG8O+DpfUstD9G+NItzW5hJSgj5wN6ufQbQJACEtdND0a+4m3lDkWvZm40vjGty08WPpTpkp+/FfjucAYAJ9re5L7IZ2T+kCuOY3yO/fq+lKedKLvpOtqGrQfgQJBAJ1wMccz+1ez8qpyTWbzj2h0O+GV+YDHqJ9SwRWcSacZOeAyO7UMgIZEwoYfs4nhye7DZH9e4BfkwBmFHJKwJNs=
-
-
 

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -26,10 +26,9 @@
         <result property="isTemporarily" column="is_temporarily" jdbcType="VARCHAR"/>
     </resultMap>
     <!--    订单 车辆信息-->
-    <resultMap id="carInfoMap" type="com.jzg.commons.entity.orders.po.InsOrdersCarInfo">
+    <resultMap id="carInfoMap" type="com.jzg.commons.entity.quote.vo.CarInfoVo">
         <id property="orderNo" column="order_no" jdbcType="VARCHAR"/>
         <result property="licenseNo" column="license_no" jdbcType="VARCHAR"/>
-        <result property="isRegistered" column="is_registered" jdbcType="VARCHAR"/>
         <result property="vinNo" column="vin_no" jdbcType="VARCHAR"/>
         <result property="brandName" column="brand_name" jdbcType="VARCHAR"/>
         <result property="engineNo" column="engine_no" jdbcType="VARCHAR"/>
@@ -103,7 +102,7 @@
     </resultMap>
 
     <!-- 订单 其他属性 -->
-    <resultMap id="InsOrdersOtherMap" type="com.jzg.commons.entity.orders.po.InsOrdersOther">
+    <resultMap id="InsOrdersOtherMap" type="com.jzg.commons.entity.vo.InsOrdersOtherInfoVo">
         <id property="orderNo" column="order_no" jdbcType="VARCHAR"/>
         <result property="jqScope" column="jq_scope" jdbcType="VARCHAR"/>
         <result property="scope" column="scope" jdbcType="VARCHAR"/>
@@ -119,6 +118,8 @@
         <result property="jqAdjustRate" column="jq_adjust_rate" jdbcType="VARCHAR"/>
         <result property="syAdjustRate" column="sy_adjust_rate" jdbcType="VARCHAR"/>
         <result property="tpColorScore" column="tp_color_score" jdbcType="VARCHAR"/>
+        <result property="signingTime" column="signing_time" jdbcType="VARCHAR"/>
+        <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--订单 险种-->
@@ -154,7 +155,7 @@
     </resultMap>
 
 
-    <resultMap id="InsOrdersVoMap" type="com.jzg.commons.entity.vo.InsOrdersVo">
+    <resultMap id="InsOrdersVoMap" type="com.jzg.quotation.commons.entity.vo.orders.InsOrdersVo">
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="quoteNo" column="quote_no" jdbcType="VARCHAR"/>
         <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
@@ -164,16 +165,115 @@
         <result property="auditId" column="audit_id" jdbcType="VARCHAR"/>
         <result property="auditName" column="audit_name" jdbcType="VARCHAR"/>
         <association property="insOrders" column="{id=id}" select="selectOrdersById" />
-        <association property="carInfoVo" column="{orderNo  = quote_no}" select="selectOrdersCarInfoByOrderNo" />
-        <association property="insOrdersOther" column="{orderNo  = quote_no}" select="selectOrdersOtherByOrderNo" />
-        <association property="insuranceInfo"  javaType="com.jzg.commons.entity.dto.InsuranceInfo" >
-            <association property="insOrdersTax"  column="{orderNo  = quote_no}" select="selectOrdersTax" />
-            <collection property="insOrdersKindList" column="{orderNo  = quote_no}" select="selectOrdersKind" />
-            <collection property="insOrdersRiskList"  column="{orderNo  = quote_no}" select="selectOrdersRisk" />
-        </association>
-        <collection property="carUserInfoList"  column="{orderNo  = quote_no}"  select="selectCarUserInfo" />
+        <association property="carInfoVo" column="{orderNo=quote_no}" select="selectOrdersCarInfoByOrderNo" />
+        <association property="insOrdersOtherInfo" column="{orderNo=quote_no}" select="selectOrdersOtherByOrderNo" />
+        <association property="ordersExternal" column="{orderNo=quote_no}" select="selectOrdersExternalFeeByOrderNo" />
+        <association property="insOrdersExternalPolicy" column="{orderNo=quote_no}" select="selectExternalPolicyMap" />
+        <association property="vehicleAndVesselTax" column="{orderNo=quote_no}" select="selectOrdersTaxMap" />
+        <association property="imagesAdds" column="{orderNo=quote_no}" select="selectImageByOrderNo" />
+        <collection property="insOrdersRiskList"  column="{orderNo=quote_no}" select="selectOrdersRisk" />
+        <collection property="carUserInfoList"  column="{orderNo=quote_no}"  select="selectCarUserInfo" />
+        <collection property="kindInfoVo" column="{orderNo=quote_no}" select="selectKindMap" />
+    </resultMap>
+
+    <resultMap id="InsOrdersExternalPolicyMap" type="com.jzg.commons.entity.orders.po.InsOrdersExternalPolicy">
+        <id property="orderNo" column="order_no" jdbcType="VARCHAR"/>
+        <result property="jqPolicy" column="jq_policy" jdbcType="VARCHAR"/>
+        <result property="syPolicy" column="sy_policy" jdbcType="VARCHAR"/>
+        <result property="noPolicy" column="no_policy" jdbcType="VARCHAR"/>
+        <result property="jqSign" column="jq_sign" jdbcType="VARCHAR"/>
+        <collection property="uploadFiles" column="concatenated_string" notNullColumn="concatenated_string" select="selectUploadFilesIds"/>
     </resultMap>
 
+<!--影像资料-->
+    <resultMap id="ImageMap" type="com.jzg.commons.entity.vo.InsTaskImagesVo">
+        <result property="quoteNo" column="quote_no" jdbcType="VARCHAR"/>
+        <collection property="images" ofType="com.jzg.commons.entity.vo.ImagesVo">
+            <result property="id" column="id" jdbcType="VARCHAR"/>
+            <result property="imageType" column="image_type" jdbcType="VARCHAR"/>
+            <result property="imageId" column="image_id" jdbcType="VARCHAR"/>
+            <result property="fileName" column="file_name" jdbcType="VARCHAR"/>
+            <result property="fileType" column="file_type" jdbcType="VARCHAR"/>
+            <result property="bucketName" column="bucket_name" jdbcType="VARCHAR"/>
+            <result property="previewUrl" column="preview_url" jdbcType="VARCHAR"/>
+        </collection>
+    </resultMap>
+<!--费用-->
+    <resultMap id="insOrdersExternalFeeMap" type="com.jzg.commons.entity.orders.po.InsOrdersExternalFee">
+        <id property="orderNo" column="order_no" jdbcType="VARCHAR"/>
+        <result property="costFlag" column="cost_flag" jdbcType="VARCHAR"/>
+        <result property="costId" column="cost_id" jdbcType="VARCHAR"/>
+        <result property="jqSuperviseCostsProportion" column="jq_supervise_costs_proportion" jdbcType="VARCHAR"/>
+        <result property="jqOtherCostsProportion" column="jq_other_costs_proportion" jdbcType="VARCHAR"/>
+        <result property="sySuperviseCostsProportion" column="sy_supervise_costs_proportion" jdbcType="VARCHAR"/>
+        <result property="syOtherCostsProportion" column="sy_other_costs_proportion" jdbcType="VARCHAR"/>
+        <result property="noSuperviseCostsProportion" column="no_supervise_costs_proportion" jdbcType="VARCHAR"/>
+        <result property="noOtherCostsProportion" column="no_other_costs_proportion" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <resultMap id="sys_upload_files_map" type="com.jzg.commons.entity.po.SysUploadFiles">
+        <result property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="fileName" column="file_name" jdbcType="VARCHAR"/>
+        <result property="fileType" column="file_type" jdbcType="VARCHAR"/>
+        <result property="fileSize" column="file_size" jdbcType="VARCHAR"/>
+        <result property="bucketName" column="bucket_name" jdbcType="VARCHAR"/>
+    </resultMap>
+    
+    <resultMap id="OrdersTaxMap" type="com.jzg.commons.entity.quote.vo.VehicleAndVesselTaxVo">
+        <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
+        <result property="extendChar2" column="extend_char2" jdbcType="VARCHAR"/>
+        <result property="taxRelief" column="tax_relief" jdbcType="VARCHAR"/>
+        <result property="relifReason" column="relif_reason" jdbcType="VARCHAR"/>
+        <result property="taxComCode" column="tax_com_code" jdbcType="VARCHAR"/>
+        <result property="taxComName" column="tax_com_name" jdbcType="VARCHAR"/>
+        <result property="taxDocumentDate" column="tax_document_date" jdbcType="VARCHAR"/>
+        <result property="taxPaidAreaCode" column="tax_paid_area_code" jdbcType="VARCHAR"/>
+        <result property="paidFreeCertificate" column="paid_free_certificate" jdbcType="VARCHAR"/>
+        <result property="taxpayerName" column="taxpayer_name" jdbcType="VARCHAR"/>
+        <result property="taxpayerIdentifier" column="taxpayer_identifier" jdbcType="VARCHAR"/>
+        <result property="identifyNumber" column="identify_number" jdbcType="VARCHAR"/>
+        <result property="taxRelifFlag" column="tax_relif_flag" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <resultMap id="KindMap" type="com.jzg.commons.entity.quote.vo.KindInfoVo">
+        <result property="kindCode" column="kind_code" jdbcType="VARCHAR"/>
+        <result property="kindName" column="kind_name" jdbcType="VARCHAR"/>
+        <result property="platformKindCode" column="platform_kind_code" jdbcType="VARCHAR"/>
+        <result property="platformKindName" column="platform_kind_name" jdbcType="VARCHAR"/>
+        <result property="amount" column="amount" jdbcType="VARCHAR"/>
+        <result property="unitAmount" column="unit_amount" jdbcType="VARCHAR"/>
+        <result property="quantity" column="quantity" jdbcType="VARCHAR"/>
+        <result property="premium" column="premium" jdbcType="VARCHAR"/>
+        <result property="deductibleRate" column="deductible_rate" jdbcType="VARCHAR"/>
+        <result property="serviceTimes" column="service_times" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <select id="selectKindMap" resultMap="KindMap">
+        select id, order_no, amount, kind_code, service_times, kind_name, unit_amount, deductible_rate from  ins_orders_kind  where order_no = #{orderNo}
+    </select>
+
+
+    <select id="selectUploadFilesIds" resultMap="sys_upload_files_map">
+        select id, file_name, bucket_name  from sys_upload_files where id in (${concatenated_string})
+    </select>
+
+    <select id="selectOrdersTaxMap" resultMap="OrdersTaxMap">
+        select order_no, extend_char2, tax_relief, relif_reason, tax_com_code, tax_com_name, tax_document_date, tax_paid_area_code, paid_free_certificate, taxpayer_name, taxpayer_identifier, identify_number, tax_relif_flag from ins_orders_tax where order_no = #{orderNo}
+    </select>
+    
+    <select id="selectExternalPolicyMap" resultMap="InsOrdersExternalPolicyMap">
+        select order_no, jq_policy, sy_policy, no_policy, jq_sign,
+               IF(CONCAT_WS( ', ', jq_policy, sy_policy, no_policy, jq_sign ) = '',NULL,CONCAT_WS( ', ', jq_policy, sy_policy, no_policy, jq_sign ))  AS concatenated_string
+        from ins_orders_external_policy where order_no = #{orderNo}
+    </select>
+
+    <select id="selectImageByOrderNo" resultMap="ImageMap">
+        SELECT t.id, t.quote_no, t.image_type, t.image_id, f.file_name, f.file_type, f.bucket_name FROM ins_task_images t LEFT JOIN sys_upload_files f ON f.id = t.image_id where t.quote_no = #{orderNo}
+    </select>
+
+    <select id="selectOrdersExternalFeeByOrderNo" resultMap="insOrdersExternalFeeMap">
+        select order_no, cost_flag, cost_id, jq_supervise_costs_proportion, jq_other_costs_proportion, sy_supervise_costs_proportion, sy_other_costs_proportion, no_supervise_costs_proportion, no_other_costs_proportion from ins_orders_external_fee where order_no = #{orderNo}
+    </select>
 
     <select id="selectOrdersRisk" resultMap="InsOrdersRiskMap">
         select order_no,risk_name,amount,commission_rate,premium,risk_code,no_tax_premium,commission_amount,start_date,end_date from  ins_orders_risk where order_no = #{orderNo}
@@ -190,6 +290,7 @@
 
     <select id="pageList" resultType="com.jzg.commons.entity.vo.OrdersListVo">
         SELECT
+            o.id,
             o.quote_no,
             o.audit_id,
             o.audit_name,
@@ -206,6 +307,30 @@
             ins_orders o
                 LEFT JOIN ins_orders_car_info c ON c.order_no = o.quote_no
                 LEFT JOIN ins_orders_costs s ON o.quote_no = s.order_no
+        <where>
+            <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
+                AND o.quote_no = #{insOrdersParam.orderNo}
+            </if>
+            <if test="insOrdersParam.isTemporarily != null">
+                AND o.is_temporarily = #{insOrdersParam.isTemporarily}
+            </if>
+            <if test="insOrdersParam.companyName != null and insOrdersParam.companyName != ''">
+                AND o.company_name = #{insOrdersParam.companyName}
+            </if>
+            <if test="insOrdersParam.salesman != null and insOrdersParam.salesman != ''">
+                AND o.salesman = #{insOrdersParam.salesman}
+            </if>
+            <if test="insOrdersParam.salesmanCompany != null and insOrdersParam.salesmanCompany != ''">
+                AND o.salesman_company = #{insOrdersParam.salesmanCompany}
+            </if>
+            <if test="insOrdersParam.auditStatus != null and insOrdersParam.auditStatus != ''">
+                AND o.audit_status = #{insOrdersParam.auditStatus}
+            </if>
+            <if test="insOrdersParam.recordingTime != null and insOrdersParam.recordingTime.size() > 0">
+                AND o.create_time BETWEEN #{insOrdersParam.recordingTime[0]} AND #{insOrdersParam.recordingTime[1]}
+            </if>
+        </where>
+        order by o.create_time desc
     </select>
 
     <select id="selectOrdersById" resultMap="InsOrdersMap">
@@ -228,7 +353,28 @@
 
 
     <select id="selectOrdersOtherByOrderNo" resultMap="InsOrdersOtherMap">
-        select order_no,scope,jq_scope,sy_scope,loss_ration,jq_loss_ration,sy_loss_ration,jq_renewal,sy_renewal,jq_claims,sy_claims,is_djq,jq_adjust_rate,sy_adjust_rate,tp_color_score from ins_orders_other where order_no = #{orderNo}
+        SELECT
+            ot.order_no,
+            ot.scope,
+            ot.jq_scope,
+            ot.sy_scope,
+            ot.loss_ration,
+            ot.jq_loss_ration,
+            ot.sy_loss_ration,
+            ot.jq_renewal,
+            ot.sy_renewal,
+            ot.jq_claims,
+            ot.sy_claims,
+            ot.is_djq,
+            ot.jq_adjust_rate,
+            ot.sy_adjust_rate,
+            ot.tp_color_score,
+            o.signing_time,
+            o.company_name
+        FROM
+            ins_orders_other ot
+                LEFT JOIN ins_orders o ON o.quote_no = ot.order_no
+         where ot.order_no = #{orderNo}
     </select>
     
     <select id="selectById" resultMap="InsOrdersVoMap">

tenant/insurance/quotation-taiping/pom.xml

@@ -25,5 +25,17 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangSubmitRequest.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo;
-import com.jzg.quotation.commons.entity.vo.aggregated.UnderwritingVo;
 import com.jzg.quotation.commons.entity.vo.base.OrderBase;
 import com.jzg.quotation.yangguang.api.entity.YangGuangConfigureParameters;
 import lombok.Data;
@@ -130,20 +129,9 @@ public class YangGuangSubmitRequest extends YangGuangBaseRequest{
     @JSONField(name = "NonVehicleProductInformationList")
     private List<NonVehicleProductInformationList> NonVehicleProductInformationList;
 
-    public YangGuangSubmitRequest(UnderwritingVo underwritingVo, YangGuangConfigureParameters ygConfigureParameters) {
-        InsOrders insOrders = underwritingVo.getInsOrders();
-        InsOrdersCarInfo insOrdersCarInfo = underwritingVo.getInsOrdersCarInfo();
-        InsOrdersCarUserInfo owner = underwritingVo.getInsOrdersCarUserInfoList()
-                .stream().filter(insOrdersCarUserInfo -> insOrdersCarUserInfo.getPolicyPersonType().equals(1))
-                .findFirst().orElse(null);
-        InsOrdersCarUserInfo policyHolder = underwritingVo.getInsOrdersCarUserInfoList()
-                .stream().filter(insOrdersCarUserInfo -> insOrdersCarUserInfo.getPolicyPersonType().equals(2))
-                .findFirst().orElse(null);
-        InsOrdersCarUserInfo insured = underwritingVo.getInsOrdersCarUserInfoList()
-                .stream().filter(insOrdersCarUserInfo -> insOrdersCarUserInfo.getPolicyPersonType().equals(3))
-                .findFirst().orElse(null);
+    public YangGuangSubmitRequest(InsOrders insOrders,InsOrdersCarInfo insOrdersCarInfo,InsOrdersCarUserInfo policyHolder,InsOrdersCarUserInfo insured,YangGuangConfigureParameters ygConfigureParameters) {
         //判断是否是企业车 1个人 2企业 3机关
-        if (insOrdersCarInfo.getPropertyCode().equals("2") || insOrdersCarInfo.getPropertyCode().equals("3")) {
+        if (insOrdersCarInfo.getProperty().equals("2") || insOrdersCarInfo.getProperty().equals("3")) {
             this.customerList = YangGuangSubmitRequest.CustomerList.toCustomerList(policyHolder, insured);
         }
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java

@@ -144,8 +144,21 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
         YangGuangConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(YangGuangConfigureParameters.class, orderBase
                 .getAttributionInformationVo()
                 .getConfigInfo());
+//        // 根据订单号获取车辆信息
+//        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getById(orderBase.getOrdersNo());
+//        // 根据订单号获取 车主 投保人 被保人信息
+//        List<InsOrdersCarUserInfo> insOrdersCarUserInfoList = insOrdersCarUserInfoService
+//                .list(new LambdaQueryWrapper<InsOrdersCarUserInfo>().eq(InsOrdersCarUserInfo::getOrderNo, orderBase.getOrdersNo()));
+//        InsOrdersCarUserInfo policyHolder = insOrdersCarUserInfoList
+//                .stream()
+//                .filter(insOrdersCarUserInfo -> insOrdersCarUserInfo.getPolicyPersonType().equals(2))
+//                .findFirst().orElse(null);
+//        InsOrdersCarUserInfo insured = insOrdersCarUserInfoList
+//                .stream()
+//                .filter(insOrdersCarUserInfo -> insOrdersCarUserInfo.getPolicyPersonType().equals(3))
+//                .findFirst().orElse(null);
         // 根据订单号获取车辆信息
-        YangGuangSubmitRequest yangGuangSubmitRequest = new YangGuangSubmitRequest(underwritingVo,parameters);
+//        YangGuangSubmitRequest yangGuangSubmitRequest = new YangGuangSubmitRequest(insOrders,insOrdersCarInfo,policyHolder,insured,parameters);
 
     }
 

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/entity/request/QuoteRequest.java

@@ -1094,8 +1094,8 @@ public class QuoteRequest {
 
             @JsonProperty("CvrgJQ")
             @JacksonXmlElementWrapper(useWrapping = false)
-            @JacksonXmlProperty(localName = "cvrgJQ")
-            private List<CvrgJQ> cvrgJQ;
+            @JacksonXmlProperty(localName = "CvrgJQ")
+            private List<CvrgJQ> CvrgJQ;
 
             @Data
             public static class CvrgJQ {
@@ -1640,7 +1640,7 @@ public class QuoteRequest {
             @JacksonXmlProperty(localName = "CMassCarMrk")
             private String CMassCarMrk;
 
-            public Applicant(CustomerInfoVo ownerInfo, CustomerInfoVo policyHolderInfo,YcApiConfigurationProperties ycApiConfigurationProperties) {
+            public Applicant(CustomerInfoVo ownerInfo, CustomerInfoVo policyHolderInfo) {
 
                 //投保人类型： 0:法人 1:个人（中国籍） 2: 个人（非中国籍）
                 String property = policyHolderInfo.getProperty();
@@ -1679,7 +1679,7 @@ public class QuoteRequest {
                     this.setCSex(IDCardUtils.GetYcSex(policyHolderInfo.getIdentifyNumber()));
                     this.setCCntrNme(policyHolderInfo.getName());
                     // 增加团车标志
-                    this.setCMassCarMrk(ycApiConfigurationProperties.getCCntrNme());
+//                    applicant.setCMassCarMrk(ycConfigureParameters.getCCntrNme());
                     name = policyHolderInfo.getName();
                     //投保人客户分类
                     this.setCClntMrk("1");
@@ -1988,7 +1988,7 @@ public class QuoteRequest {
                 this.setCAreaCde("103132");
 
                 this.setTCertfClsValiDate(insuredPersonInfo.getIdentifyValidEndDate());
-//                insured.setCCntrNme(insuredPersonInfo.getName());
+//        insured.setCCntrNme(insuredPersonInfo.getName());
                 this.setCRelCdes(ownerInfo.getName().equals(insuredPersonInfo.getName()) ? "601005" : "601008");
 
             }
@@ -2230,7 +2230,7 @@ public class QuoteRequest {
          * 投保人信息
          * 代码：applicant
          */
-        Condition.Applicant applicant = new Condition.Applicant(ownerInfo,policyHolderInfo,ycApiConfigurationProperties);
+        Condition.Applicant applicant = new Condition.Applicant(ownerInfo,policyHolderInfo);
         condition.setApplicant(applicant);
 
         /**

tenant/organization/src/main/java/com/jzg/organization/client/EsmInsCompanyClient.java

@@ -4,10 +4,9 @@ import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-@FeignClient(name="jzg-platform",url = "http://172.24.144.223:8001/")
+@FeignClient(name="jzg-platform",url = "http://localhost:8001/")
 public interface EsmInsCompanyClient {
 
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementDeptServiceImpl.java

@@ -62,11 +62,10 @@ public class PtlAgreementDeptServiceImpl extends ServiceImpl<PtlAgreementDeptMap
         }
 
         LambdaQueryWrapper<SysDept> allWrapper = new LambdaQueryWrapper<>();
+        allWrapper.like(SysDept :: getRoute, deptId)
+                .eq(SysDept :: getIsDelete, 0);
         if (Objects.nonNull(nameDept)){
-            allWrapper.like(Objects.nonNull(nameDept), SysDept :: getRoute, nameDept.getId()).eq(SysDept :: getIsDelete, 0);
-        }else{
-            allWrapper.like(SysDept :: getRoute, deptId)
-                    .eq(SysDept :: getIsDelete, 0);
+            allWrapper.like(Objects.isNull(nameDept), SysDept :: getRoute, nameDept.getId());
         }
         List<SysDept> depts = deptMapper.selectList(allWrapper);
         List<SysDeptVo> voDept = new ArrayList<>();

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -369,34 +369,29 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
         SchemeResultVo schemeResultVo = new SchemeResultVo();
         //基础方案
         SchemeResultVo.SchemeVo schemeVo = schemeInsuranceInfo.stream().filter(x -> x.getSchemeType().equals("1")).findFirst().orElse(null);
-        if(Objects.nonNull(schemeVo)) {
-            schemeResultVo.setSchemes(schemeVo.getInfos());
-            //把基础方案的商业险的value 赋值
-            schemeResultVo.getSchemes().forEach(schemeInfoVo -> {
-                schemeInfoVo.getKinds().forEach(kind -> {
-                    kind.setAmount(kind.getOptions().get(0).getValue());
-                    kind.setUnitAmount(kind.getOptions().get(0).getValue());
-                    kind.setServiceTimes(kind.getOptions().get(0).getValue());
-                });
+        schemeResultVo.setSchemes(schemeVo.getInfos());
+        //把基础方案的商业险的value 赋值
+        schemeResultVo.getSchemes().forEach(schemeInfoVo -> {
+            schemeInfoVo.getKinds().forEach(kind -> {
+                kind.setAmount(kind.getOptions().get(0).getValue());
+                kind.setUnitAmount(kind.getOptions().get(0).getValue());
+                kind.setServiceTimes(kind.getOptions().get(0).getValue());
             });
-        }
+        });
 
         //自选方案
         SchemeResultVo.SchemeVo opSchemeVo = schemeInsuranceInfo.stream().filter(x -> x.getSchemeType().equals("2")).findFirst().orElse(null);
-        if(Objects.nonNull(opSchemeVo)) {
-            schemeResultVo.setOptionalScheme(opSchemeVo.getInfos().get(0));
-            SchemeResultVo.SchemeInfoVo optionalScheme = schemeResultVo.getOptionalScheme();
-            if (optionalScheme != null && optionalScheme.getKinds() != null) {
-                optionalScheme.getKinds().removeIf(kind -> "J1".equals(kind.getKindCode()));
-            }
-        }
+        schemeResultVo.setOptionalScheme(opSchemeVo.getInfos().get(0));
 
         //排除交强险的险种
-        schemeResultVo.getSchemes().forEach(schemeInfoVo ->
-                schemeInfoVo.getKinds().removeIf(kind -> "J1".equals(kind.getKindCode()))
+        schemeResultVo.getSchemes().removeIf(schemeInfoVo ->
+                schemeInfoVo.getKinds().stream().anyMatch(kind -> "J1".equals(kind.getKindCode()))
         );
 
-
+        SchemeResultVo.SchemeInfoVo optionalScheme = schemeResultVo.getOptionalScheme();
+        if (optionalScheme != null && optionalScheme.getKinds() != null) {
+            optionalScheme.getKinds().removeIf(kind -> "J1".equals(kind.getKindCode()));
+        }
 
         return schemeResultVo;
     }

tenant/organization/src/main/resources/application.yml

@@ -56,7 +56,7 @@ tenant:
     - ptl_area_license
     - ptl_agreement_undwrt_rules
     - ptl_agreement_undwrt_rules_attr_link
-    - esm_ins_company
+
   ignoreLoginNames:
 
 data-scope:

tenant/organization/src/main/resources/mapper/PtlSchemeMapper.xml

@@ -36,19 +36,12 @@
             <result column="scheme_type" property="schemeType"/>
             <result column="description" property="description"/>
             <collection property="drivings" ofType="com.jzg.commons.entity.scheme.vo.SchemeResultVo$Driving">
-                <result column="driving_id" property="id"/>
                 <result column="product_name" property="productName"/>
                 <result column="product_code" property="productCode"/>
                 <result column="alias" property="alias"/>
                 <result column="grouping" property="grouping"/>
                 <result column="premium" property="premium"/>
                 <result column="quantity" property="quantity"/>
-                <collection property="blames" ofType="com.jzg.commons.entity.po.JyxBlame">
-                    <result column="blame" property="blame"/>
-                    <result column="blameCode" property="blame_code"/>
-                    <result column="blameCoverage" property="blame_coverage"/>
-                    <result column="blamePremium" property="blame_premium"/>
-                </collection>
             </collection>
         </collection>
     </resultMap>
@@ -142,7 +135,6 @@
         WHERE
             ps.company_id = #{companyId}
             AND ps.product_id = #{productId}
-        ORDER BY ibi.sort asc
     </select>
 
     <select id="getSchemeDrivingInfo" resultMap="SchemeDrivingVo">
@@ -152,24 +144,17 @@
             psi.scheme_id,
             psi.scheme_type,
             psi.scheme_name,
-            jc.id AS driving_id,
             jc.product_name,
             jc.alias,
             jc.product_code,
-            jc.premium_setting,
             jc.coverage,
             jc.premium,
-            psidi.quantity,
-            jb.blame,
-            jb.blame_code,
-            jb.blame_coverage,
-            jb.blame_premium
+            psidi.quantity
         FROM
             ptl_scheme ps
                 INNER JOIN ptl_scheme_info psi ON ps.id = psi.scheme_id
                 INNER JOIN ptl_scheme_insurance_driving_intention psidi ON psidi.scheme_info_id = psi.id
                 INNER JOIN jyx_config jc ON psidi.driving_intention_id = jc.id
-                left join  jyx_blame jb on jc.id = jb.jyx_config_id
         WHERE
             ps.company_id = #{companyId}
         AND