代理人报价修改

src/main/java/com/ydtech/modules/admin/constants/ManagementSource.java

@@ -0,0 +1,20 @@
+package com.ydtech.modules.admin.constants;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 机构来源枚举
+ */
+@AllArgsConstructor
+@Getter
+public enum ManagementSource {
+
+    MS_01("1", "渠道"),
+    MS_02("2", "个代");
+
+    private final String code;
+
+    private final String desc;
+}

src/main/java/com/ydtech/modules/admin/constants/SwitchConfig.java

@@ -0,0 +1,22 @@
+package com.ydtech.modules.admin.constants;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+/**
+ * 启动配置
+ */
+@AllArgsConstructor
+@Getter
+public enum SwitchConfig {
+
+    SC_01("proxyCustomerAgent", "代客录单（代理人启动）"),
+    SC_02("proxyCustomerChannel", "代客录单（渠道启动）");
+
+    private final String code;
+
+    private final String desc;
+
+}

src/main/java/com/ydtech/modules/admin/controller/SysSwitchConfigController.java

@@ -0,0 +1,54 @@
+package com.ydtech.modules.admin.controller;
+
+
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.po.SysSwitchConfig;
+import com.ydtech.modules.admin.model.vo.SysSwitchConfigQueryVo;
+import com.ydtech.modules.admin.model.vo.SysSwitchConfigVo;
+import com.ydtech.modules.admin.service.SysSwitchConfigService;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/sys/switch")
+@Api(tags = "开关配置")
+@RequiredArgsConstructor
+public class SysSwitchConfigController {
+
+    private final SysSwitchConfigService sysSwitchConfigService;
+
+    @PostMapping("/page")
+    @ApiOperation(value = "获取分页列表")
+    public HttpResult<BasePageResult<SysSwitchConfig>> queryPage(@RequestBody SysSwitchConfigQueryVo sysSwitchConfigQueryVo) {
+        BasePageResult<SysSwitchConfig> pageResult = sysSwitchConfigService.queryPage(sysSwitchConfigQueryVo);
+        return HttpResult.ok(pageResult);
+    }
+
+    @GetMapping
+    @ApiOperation(value = "增加")
+    public HttpResult<Object> add(@RequestBody SysSwitchConfigVo sysSwitchConfigVo) {
+        sysSwitchConfigService.add(sysSwitchConfigVo);
+        return HttpResult.ok();
+    }
+
+    @DeleteMapping("/{id}")
+    @ApiOperation(value = "删除")
+    public HttpResult<Object> del(@PathVariable String id) {
+        boolean b = sysSwitchConfigService.removeById(id);
+        AssertionUtils.isSucceed(b, "删除失败");
+        return HttpResult.ok();
+    }
+
+    @PutMapping("/{id}")
+    @ApiOperation(value = "修改")
+    public HttpResult<Object> revise(@PathVariable String id, @RequestBody SysSwitchConfigVo sysSwitchConfigVo) {
+        sysSwitchConfigService.revise(id, sysSwitchConfigVo);
+        return HttpResult.ok();
+    }
+
+
+}

src/main/java/com/ydtech/modules/admin/dao/SysSwitchConfigMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.po.SysSwitchConfig;
+
+/**
+* @author Administrator
+* @description 针对表【sys_switch_config(系统开关配置表)】的数据库操作Mapper
+* @createDate 2024-08-07 18:04:47
+* @Entity generator.domain.SysSwitchConfig
+*/
+public interface SysSwitchConfigMapper extends BaseMapper<SysSwitchConfig> {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/admin/model/po/SysSwitchConfig.java

@@ -0,0 +1,134 @@
+package com.ydtech.modules.admin.model.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 系统开关配置表
+ * @TableName sys_switch_config
+ */
+@TableName(value ="sys_switch_config")
+@Data
+public class SysSwitchConfig implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 模块名称
+     */
+    @TableField(value = "project")
+    private String project;
+
+    /**
+     * 功能名称
+     */
+    @TableField(value = "function_name")
+    private String functionName;
+
+    /**
+     * keyword
+     */
+    @TableField(value = "keyword")
+    private String keyword;
+
+    /**
+     * 是否启动 1 启动 0 关闭
+     */
+    @TableField(value = "enabled")
+    private Integer enabled;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "create_by")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改人
+     */
+    @TableField(value = "update_by")
+    private String updateBy;
+
+    /**
+     * 修改时间
+     */
+    @TableField(value = "update_time")
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        SysSwitchConfig other = (SysSwitchConfig) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getProject() == null ? other.getProject() == null : this.getProject().equals(other.getProject()))
+            && (this.getFunctionName() == null ? other.getFunctionName() == null : this.getFunctionName().equals(other.getFunctionName()))
+            && (this.getKeyword() == null ? other.getKeyword() == null : this.getKeyword().equals(other.getKeyword()))
+            && (this.getEnabled() == null ? other.getEnabled() == null : this.getEnabled().equals(other.getEnabled()))
+            && (this.getCreateBy() == null ? other.getCreateBy() == null : this.getCreateBy().equals(other.getCreateBy()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy()))
+            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getProject() == null) ? 0 : getProject().hashCode());
+        result = prime * result + ((getFunctionName() == null) ? 0 : getFunctionName().hashCode());
+        result = prime * result + ((getKeyword() == null) ? 0 : getKeyword().hashCode());
+        result = prime * result + ((getEnabled() == null) ? 0 : getEnabled().hashCode());
+        result = prime * result + ((getCreateBy() == null) ? 0 : getCreateBy().hashCode());
+        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode());
+        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", project=").append(project);
+        sb.append(", functionName=").append(functionName);
+        sb.append(", keyword=").append(keyword);
+        sb.append(", enabled=").append(enabled);
+        sb.append(", createBy=").append(createBy);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateBy=").append(updateBy);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ydtech/modules/admin/model/vo/SysSwitchConfigQueryVo.java

@@ -0,0 +1,39 @@
+package com.ydtech.modules.admin.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.Min;
+
+
+/**
+ * 配置开关查询接口
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysSwitchConfigQueryVo {
+
+    @ApiModelProperty("模块名称")
+    private String project;
+
+    @ApiModelProperty("功能名称")
+    private String functionName;
+
+    @ApiModelProperty("keyword")
+    private String keyword;
+
+    @ApiModelProperty("是否启动 1 启动 0 关闭")
+    private Integer enabled;
+
+
+    @ApiModelProperty(value = "每页页数")
+    private int pageSize;
+
+    @ApiModelProperty(value = "页数")
+    @Min(value = 1, message = "页数最小为1")
+    private int pageNum;
+
+}

src/main/java/com/ydtech/modules/admin/model/vo/SysSwitchConfigVo.java

@@ -0,0 +1,33 @@
+package com.ydtech.modules.admin.model.vo;
+
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("启动实体")
+public class SysSwitchConfigVo implements Serializable {
+
+    private static final long serialVersionUID = 3596838212640291050L;
+
+    @ApiModelProperty("模块名称")
+    private String project;
+
+    @ApiModelProperty("功能名称")
+    private String functionName;
+
+    @ApiModelProperty("keyword")
+    private String keyword;
+
+    @ApiModelProperty("是否启动 1 启动 0 关闭")
+    private Integer enabled;
+
+}

src/main/java/com/ydtech/modules/admin/service/SysSwitchConfigService.java

@@ -0,0 +1,62 @@
+package com.ydtech.modules.admin.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.admin.model.po.SysSwitchConfig;
+import com.ydtech.modules.admin.model.vo.SysSwitchConfigQueryVo;
+import com.ydtech.modules.admin.model.vo.SysSwitchConfigVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Administrator
+ * @description 针对表【sys_switch_config(系统开关配置表)】的数据库操作Service
+ * @createDate 2024-08-07 18:04:47
+ */
+public interface SysSwitchConfigService extends IService<SysSwitchConfig> {
+
+    /**
+     * 判断开关是否开启的
+     *
+     * @param id id
+     * @return 系统开关配置
+     */
+    default SysSwitchConfig getByIdExists(String id) {
+        SysSwitchConfig sysSwitchConfig = getById(id);
+        AssertionUtils.isEmpty(sysSwitchConfig, "未查询到你所配置的开关");
+        return sysSwitchConfig;
+    }
+
+    /**
+     * 获取 代理人、渠道 代客录单费用是否开启
+     *
+     * @param deptId 机构id
+     * @return 功能是够开启
+     */
+    BigDecimal getEnterProportion(String deptId, Integer entryStatus);
+
+    /**
+     * 添加开关信息
+     *
+     * @param sysSwitchConfigVo
+     */
+    void add(SysSwitchConfigVo sysSwitchConfigVo);
+
+
+    /**
+     * 修改
+     *
+     * @param id                开关表 id
+     * @param sysSwitchConfigVo 开关信息
+     */
+    void revise(String id, SysSwitchConfigVo sysSwitchConfigVo);
+
+    /**
+     * 分页查询开关配置
+     *
+     * @param sysSwitchConfigQueryVo 开关配置
+     * @return
+     */
+    BasePageResult<SysSwitchConfig> queryPage(SysSwitchConfigQueryVo sysSwitchConfigQueryVo);
+}

src/main/java/com/ydtech/modules/admin/service/impl/SysSwitchConfigServiceImpl.java

@@ -0,0 +1,114 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.util.StringUtil;
+import com.ydtech.modules.admin.constants.ManagementSource;
+import com.ydtech.modules.admin.constants.SwitchConfig;
+import com.ydtech.modules.admin.dao.SysSwitchConfigMapper;
+import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.po.SysSwitchConfig;
+import com.ydtech.modules.admin.model.vo.SysSwitchConfigQueryVo;
+import com.ydtech.modules.admin.model.vo.SysSwitchConfigVo;
+import com.ydtech.modules.admin.service.SysDeptService;
+import com.ydtech.modules.admin.service.SysSwitchConfigService;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.modules.fee.constants.CostAllocation;
+import com.ydtech.modules.fee.dto.po.InsFeeOrderConfig;
+import com.ydtech.modules.fee.service.InsFeeOrderConfigService;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author Administrator
+ * @description 针对表【sys_switch_config(系统开关配置表)】的数据库操作Service实现
+ * @createDate 2024-08-07 18:04:47
+ */
+@Service
+@RequiredArgsConstructor
+public class SysSwitchConfigServiceImpl extends ServiceImpl<SysSwitchConfigMapper, SysSwitchConfig> implements SysSwitchConfigService {
+
+    private final SysDeptService sysDeptService;
+
+    private final InsFeeOrderConfigService insFeeOrderConfigService;
+
+    @Override
+    public BigDecimal getEnterProportion(String deptId, Integer entryStatus) {
+        if (entryStatus != 2) {
+            return BigDecimal.ZERO;
+        }
+
+        SysDept dept = sysDeptService.getById(deptId);
+        SysSwitchConfig config;
+        CostAllocation costAllocation;
+        SwitchConfig switchConfig;
+        // 渠道
+        if (ManagementSource.MS_01.getCode().equals(dept.getManagementSource())) {
+            costAllocation = CostAllocation.CA_05;
+            switchConfig = SwitchConfig.SC_02;
+            // 代理人
+        } else {
+            costAllocation = CostAllocation.CA_04;
+            switchConfig = SwitchConfig.SC_01;
+        }
+
+        config = lambdaQuery().eq(SysSwitchConfig::getKeyword, switchConfig.getCode()).one();
+        if (config.getEnabled() == 1) {
+            InsFeeOrderConfig insFeeOrderConfig = insFeeOrderConfigService.lambdaQuery()
+                    .eq(InsFeeOrderConfig::getKeyword, costAllocation.getCode())
+                    .one();
+            return insFeeOrderConfig.getVal();
+        }
+
+        return BigDecimal.ZERO;
+
+    }
+
+    @Override
+    public void add(SysSwitchConfigVo sysSwitchConfigVo) {
+        SysSwitchConfig sysSwitchConfig = new SysSwitchConfig();
+        BeanUtils.copyProperties(sysSwitchConfigVo, sysSwitchConfig);
+        String userId = BaseController.getUserId();
+        sysSwitchConfig.setCreateBy(userId);
+        sysSwitchConfig.setCreateTime(new Date());
+        boolean save = save(sysSwitchConfig);
+        AssertionUtils.isSucceed(save, "增加失败");
+    }
+
+    @Override
+    public void revise(String id, SysSwitchConfigVo sysSwitchConfigVo) {
+        SysSwitchConfig sysSwitchConfig = getByIdExists(id);
+        BeanUtils.copyProperties(sysSwitchConfigVo, sysSwitchConfig);
+        String userId = BaseController.getUserId();
+        sysSwitchConfig.setUpdateBy(userId);
+        sysSwitchConfig.setUpdateTime(new Date());
+        boolean b = updateById(sysSwitchConfig);
+        AssertionUtils.isSucceed(b, "修改失败");
+    }
+
+    @Override
+    public BasePageResult<SysSwitchConfig> queryPage(SysSwitchConfigQueryVo sysSwitchConfigQueryVo) {
+        Page<SysSwitchConfig> page = new Page<>(sysSwitchConfigQueryVo.getPageNum(), sysSwitchConfigQueryVo.getPageSize());
+
+        Page<SysSwitchConfig> sysSwitchConfigPage = lambdaQuery()
+                .eq(!ObjectUtils.isEmpty(sysSwitchConfigQueryVo.getEnabled()), SysSwitchConfig::getEnabled, sysSwitchConfigQueryVo.getEnabled())
+                .like(StringUtil.isNotEmpty(sysSwitchConfigQueryVo.getKeyword()), SysSwitchConfig::getKeyword, sysSwitchConfigQueryVo.getKeyword())
+                .like(StringUtil.isNotEmpty(sysSwitchConfigQueryVo.getProject()), SysSwitchConfig::getProject, sysSwitchConfigQueryVo.getProject())
+                .like(StringUtil.isNotEmpty(sysSwitchConfigQueryVo.getFunctionName()), SysSwitchConfig::getFunctionName, sysSwitchConfigQueryVo.getFunctionName())
+                .page(page);
+
+        return new BasePageResult<>(sysSwitchConfigQueryVo.getPageNum(), sysSwitchConfigQueryVo.getPageSize(), sysSwitchConfigPage.getTotal(), sysSwitchConfigPage.getPages(), sysSwitchConfigPage.getRecords());
+    }
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/base/controller/BaseController.java

@@ -20,7 +20,7 @@ import org.apache.poi.ss.formula.functions.T;
 public class BaseController {
 
     /**
-     *  获取用户
+     * 获取用户
      *
      * @author: lig
      * @date: 2023年06月28日 0028
@@ -33,48 +33,47 @@ public class BaseController {
 
 
     /**
-     *  获取用户ID
+     * 获取用户ID
      *
      * @author: lig
      * @date: 2023-06-28
      */
-    public String getUserId() {
+    public static String getUserId() {
         return StpUtil.getLoginId().toString();
     }
 
     /**
-     *  获取用户名   系统用户名与ID相同
+     * 获取用户名   系统用户名与ID相同
      *
      * @author: lig
      * @date: 2023-06-28
      */
-    public String getUserName() {
+    public static String getUserName() {
         return StpUtil.getLoginId().toString();
     }
 
     /**
-     *  获取部门ID
+     * 获取部门ID
      *
      * @author: lig
      * @date: 2023年06月28日 0028
      */
-    public String getDeptId() {
+    public static String getDeptId() {
         SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
         SysUser sysUser = (SysUser) saSession.get(SaSession.USER);
         return sysUser.getDeptId();
     }
 
 
-
     /**
-     *  构造分页 请求 数据
+     * 构造分页 请求 数据
      *
      * @author: lig
      * @date: 2023年06月28日 0028
      */
-    public Page<T> buildPageRequest(PageDto pageDto){
-        int pageNum = pageDto.getPageNum() < 1?1: pageDto.getPageNum();
-        int pageSize = pageDto.getPageSize() <1?1: pageDto.getPageSize();
+    public Page<T> buildPageRequest(PageDto pageDto) {
+        int pageNum = pageDto.getPageNum() < 1 ? 1 : pageDto.getPageNum();
+        int pageSize = pageDto.getPageSize() < 1 ? 1 : pageDto.getPageSize();
         Page<org.apache.poi.ss.formula.functions.T> p = new Page<>();
         p.setSize(pageSize);
         p.setCurrent(pageNum);
@@ -83,27 +82,22 @@ public class BaseController {
 
 
     /**
-     *  构造分页 响应 数据
+     * 构造分页 响应 数据
      *
      * @author: lig
      * @date: 2023-06-28
      */
     public PageResult buildPageResponse(IPage page) {
         PageResult p = new PageResult();
-        p.setPageNum((int)page.getCurrent());
-        p.setPageSize((int)page.getSize());
-        p.setTotalPages((int)page.getPages());
-        p.setTotalSize((int)page.getTotal());
+        p.setPageNum((int) page.getCurrent());
+        p.setPageSize((int) page.getSize());
+        p.setTotalPages((int) page.getPages());
+        p.setTotalSize((int) page.getTotal());
 
-        p.setContent(page.getRecords()) ;
+        p.setContent(page.getRecords());
         return p;
 
     }
 
 
-
-
-
-
-
 }

src/main/java/com/ydtech/modules/fee/constants/CostAllocation.java

@@ -13,8 +13,9 @@ public enum CostAllocation {
     CA_02("deptProportion", "机构比例", "0.1"),
     CA_03("proxyProportion", "代课录单比例", "0.1"),
 
-    // 够减扣除比例
-    CA_04("enterProportion", "代课录单扣减比例", "1");
+    // 扣减扣除比例
+    CA_04("agentProportion", "代课录单代理人扣减比例", "1"),
+    CA_05("channelProportion", "代课录单渠道扣减比例", "1");
 
     private final String code;
 

src/main/java/com/ydtech/modules/fee/service/InsFeeOrderConfigService.java

@@ -13,10 +13,5 @@ import java.math.BigDecimal;
  */
 public interface InsFeeOrderConfigService extends IService<InsFeeOrderConfig> {
 
-    /**
-     * 获取出单比例
-     * @return 出单比例
-     */
-    BigDecimal getEnterProportion(Integer entryStatus);
 
 }

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -2900,7 +2900,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
 
         // 外部
         exportFee.setExternalProportion(enterProportion);
-        exportFee.setExternalPremiums(premium.multiply(enterProportion.divide(new BigDecimal(100), 2, RoundingMode.DOWN)).setScale(2,  RoundingMode.DOWN));
+        exportFee.setExternalPremiums(premium.multiply(enterProportion.divide(new BigDecimal(100))).setScale(2,  RoundingMode.DOWN));
 
         if (exportTotalProportion.compareTo(BigDecimal.ZERO) < 0 && premium.compareTo(BigDecimal.ZERO) == 0) {
             //出口比例为负数了

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceNewImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.constants.enums.dict.insurance.EnergyType;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
+import com.ydtech.modules.admin.service.SysSwitchConfigService;
 import com.ydtech.modules.admin.service.SysUserAccountService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.esm.model.EsmRetail;
@@ -97,6 +98,8 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     @Autowired
     private InsFeeOrderConfigService insFeeOrderConfigService;
 
+    @Autowired
+    private SysSwitchConfigService sysSwitchConfigService;
 
     @Override
     public QueryOrderFeeVo queryFeeOrderInfo(String companyId) {
@@ -205,9 +208,14 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
             if (retailLevel != 0) {
                 jqAverageRetail = twoPeople(twoPeople(costsProportion.multiply(retailSettingProportion)).divide(new BigDecimal(retailLevel), 2, RoundingMode.DOWN));
             }
-            // 代课比例
-            BigDecimal proxyProportion = twoPeople(costsProportion.multiply(proxyProportionConfig));
-            reCalcuLateProportion.setProxyProportion(proxyProportion);
+
+            if (enterProportion.compareTo(BigDecimal.ZERO) == 0) {
+                reCalcuLateProportion.setProxyProportion(BigDecimal.ZERO);
+            } else {
+                // 代客比例
+                BigDecimal proxyProportion = costsProportion.multiply(proxyProportionConfig);
+                reCalcuLateProportion.setProxyProportion(twoPeople(proxyProportion));
+            }
 
             if (retailLevel >= 3) {
                 reCalcuLateProportion.setRetail_level_3_proportion(jqAverageRetail);
@@ -401,7 +409,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 .add(retailProportion.getNoRetailLevel3Proportion());
 
         // 外部订单比例
-        BigDecimal enterProportion = insFeeOrderConfigService.getEnterProportion(insAreaCompany.getEntryStatus());
+        BigDecimal enterProportion = sysSwitchConfigService.getEnterProportion(insOrders.getDeptid(), insAreaCompany.getEntryStatus());
 
         //重新计算比例  入口是否超出支付的比例
         ReCalcuLateProportion jqReCalcuLateProportion = recalculateProportion(
@@ -1072,11 +1080,10 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
     public void calcCostsExternal(PtlAgreementProductCostsNew ptlAgreementProductCostsNew, InsAreaCompany insAreaCompany) {
         //获取协议信息
         // 外部订单比例
-        BigDecimal enterProportion = insFeeOrderConfigService.getEnterProportion(insAreaCompany.getEntryStatus());
-
         PtlAgreement ptlAgreement = ptlAgreementService.getById(insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
         SysUser sysUser = sysUserService.findByUserId(insOrders.getUserid());
+        BigDecimal enterProportion = sysSwitchConfigService.getEnterProportion(insOrders.getDeptid(), insAreaCompany.getEntryStatus());
 
         BigDecimal taxRadio = new BigDecimal("1.00");
         //如果是外部订单则 不含税
@@ -1210,7 +1217,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 retailProportion,
                 "jq",
                 enterProportion
-                );
+        );
 
         ReCalcuLateProportion syReCalcuLateProportion = recalculateProportion(
                 new BigDecimal(ptlAgreementProductCostsNew.getSyCostsProportion()),
@@ -1222,7 +1229,7 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
                 retailProportion,
                 "sy",
                 enterProportion
-                );
+        );
 
         ReCalcuLateProportion noReCalcuLateProportion = recalculateProportion(
                 new BigDecimal(ptlAgreementProductCostsNew.getNoCostsProportion()),

src/main/java/com/ydtech/modules/fee/service/impl/InsFeeOrderConfigServiceImpl.java

@@ -1,19 +1,11 @@
 package com.ydtech.modules.fee.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ydtech.modules.fee.constants.CostAllocation;
 import com.ydtech.modules.fee.dao.InsFeeOrderConfigMapper;
 import com.ydtech.modules.fee.dto.po.InsFeeOrderConfig;
 import com.ydtech.modules.fee.service.InsFeeOrderConfigService;
-import com.ydtech.modules.order.dao.InsAccidentalDrivingDaJiaMapper;
-import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
-import com.ydtech.modules.order.service.InsAccidentalDrivingDaJiaService;
-import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
 /**
  * @author Administrator
  * @description 针对表【InsFeeOrderConfig()】的数据库操作Service实现
@@ -23,21 +15,6 @@ import java.math.RoundingMode;
 public class InsFeeOrderConfigServiceImpl extends ServiceImpl<InsFeeOrderConfigMapper, InsFeeOrderConfig>
         implements InsFeeOrderConfigService {
 
-    @Override
-    public BigDecimal getEnterProportion(Integer entryStatus) {
-        if (entryStatus != 2) {
-            return new BigDecimal(0);
-        }
-
-        CostAllocation costAllocation = CostAllocation.CA_04;
-        InsFeeOrderConfig insFeeOrderConfig = lambdaQuery().eq(InsFeeOrderConfig::getKeyword, costAllocation).one();
-
-        if (ObjectUtils.isNotEmpty(insFeeOrderConfig)) {
-            return insFeeOrderConfig.getVal();
-        }
-
-        return new BigDecimal(costAllocation.getDefaultScale());
-    }
 }
 
 

src/main/java/com/ydtech/modules/order/aop/aspect/AuditVerificationAspect.java

@@ -3,10 +3,8 @@ package com.ydtech.modules.order.aop.aspect;
 
 import com.alibaba.fastjson.JSONObject;
 import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeService;
-import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsAreaCompanyAccidentalDriving;
 import com.ydtech.modules.order.entity.InsOrders;
@@ -15,8 +13,6 @@ import com.ydtech.modules.order.entity.vo.SpecialAuditVo;
 import com.ydtech.modules.order.service.InsAreaCompanyAccidentalDrivingService;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.protocol.service.PtlAgreementDeptService;
-import com.ydtech.modules.protocol.service.impl.TaxSourceServiceImpl;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;

src/main/java/com/ydtech/modules/order/controller/InsCrawlerOrderController.java

@@ -14,8 +14,6 @@ import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.QuoteAccidentalDrivingVo;
 import com.ydtech.modules.order.service.InsCrawlerOrderService;
 import com.ydtech.modules.order.service.InsOrdersService;
-import com.ydtech.modules.protocols.entity.vo.AgreementProductCosts;
-import com.ydtech.modules.protocols.service.PtlAgreementProductCostsNewService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -24,8 +22,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @Api(tags = "爬虫对接")
 @RequestMapping("/insurance/crawler")
 @RestController

src/main/java/com/ydtech/modules/order/dao/BatchOrderMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.order.entity.BatchOrder;
 import com.ydtech.modules.order.entity.vo.BatchOrderQueryVo;
-import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
 import org.apache.ibatis.annotations.Param;
 
 /**

src/main/java/com/ydtech/modules/order/dao/InsAccidentalDrivingDaJiaMapper.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.order.entity.InsAccidentalDriving;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
 
 /**

src/main/java/com/ydtech/modules/order/dao/InsAccidentalDrivingSubDaJiaMapper.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingSubDajia;
 
 /**

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyAccidentalDrivingMapper.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.order.entity.InsAreaCompanyAccidentalDriving;
-import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingSubDajia;
 
 /**
  * @author Administrator

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyExternalFeeMapper.java

@@ -1,19 +1,7 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.modules.admin.model.dto.AllpremiumDto;
-import com.ydtech.modules.admin.model.dto.PremiumReportDto;
-import com.ydtech.modules.admin.model.vo.SubOrder;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsAreaCompanyExternalFee;
-import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
-import com.ydtech.modules.order.entity.vo.OrderQueryVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * @author Administrator

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyMapper.java

@@ -16,7 +16,6 @@ import com.ydtech.modules.admin.model.report.opetationData.QuotationCountDataDto
 import com.ydtech.modules.admin.model.report.opetationData.QuotationCountQueryDto;
 import com.ydtech.modules.admin.model.vo.SubOrder;
 import com.ydtech.modules.admin.model.vo.TaskStatisticsVo;
-import com.ydtech.modules.base.model.vo.PageVo;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;

src/main/java/com/ydtech/modules/order/dao/InsAreaCompanyPositionMapper.java

@@ -1,18 +1,7 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.modules.admin.model.dto.PremiumReportDto;
-import com.ydtech.modules.admin.model.vo.SubOrder;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsAreaCompanyPosition;
-import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
-import com.ydtech.modules.order.entity.vo.OrderQueryVo;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * @author Administrator

src/main/java/com/ydtech/modules/order/dao/InsDrivingIntentionInsuranceSonMapper.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.order.entity.InsDrivingIntentionInsurance;
 import com.ydtech.modules.order.entity.InsDrivingIntentionInsuranceSon;
 
 /**

src/main/java/com/ydtech/modules/order/dao/InsOrderQrCodeMapper.java

@@ -2,12 +2,6 @@ package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.order.entity.InsOrderQrCode;
-import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.vo.OrderQueryVo;
-import com.ydtech.modules.order.entity.vo.OrderVo;
-import com.ydtech.modules.order.entity.vo.VerifyOrdersVo;
-
-import java.util.List;
 
 /**
  * @author Administrator

src/main/java/com/ydtech/modules/order/dao/InsOrdersMapper.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.ins.model.InsOrdersExcel;
 import com.ydtech.modules.ins.model.InsOrdersExcelVo;

src/main/java/com/ydtech/modules/order/dao/InsTaskImagesMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.order.entity.dto.InsTaskImagesDto;
 import com.ydtech.modules.order.entity.dto.InsUploadImagesDto;
 import com.ydtech.modules.order.entity.po.InsTaskImages;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

src/main/java/com/ydtech/modules/order/dao/PtlAgreementNonCarProductRuleMapper.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ydtech.modules.order.entity.InsDrivingIntentionInsurance;
 import com.ydtech.modules.order.entity.PtlAgreementNonCarProductRule;
 
 /**

src/main/java/com/ydtech/modules/order/entity/BatchOrder.java

@@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.ydtech.modules.order.entity.vo.BatchOrderVo;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.joda.time.DateTime;
 
 import java.time.LocalDateTime;
 

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyAccidentalDriving.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -9,7 +8,6 @@ import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * 子订单驾意险信息

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyExternalFee.java

@@ -1,18 +1,8 @@
 package com.ydtech.modules.order.entity;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.modules.ins.model.vo.QuoteRespVo;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
-import com.ydtech.utils.StringUtils;
-import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,8 +10,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 报价渠道

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyExternalPolicy.java

@@ -9,7 +9,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * 报价渠道

src/main/java/com/ydtech/modules/order/entity/InsAreaCompanyPosition.java

@@ -1,27 +1,12 @@
 package com.ydtech.modules.order.entity;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.modules.ins.model.vo.QuoteRespVo;
-import com.ydtech.modules.protocol.entity.po.PtlAgreementAttribution;
-import com.ydtech.utils.StringUtils;
-import com.ydtech.utils.idgen.IdGenerate;
 import io.swagger.annotations.ApiModel;
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 报价渠道

src/main/java/com/ydtech/modules/order/entity/InsDrivingIntentionInsurance.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
-import javax.persistence.Table;
 import java.io.Serializable;
 
 /**

src/main/java/com/ydtech/modules/order/entity/InsFeeOrder.java

@@ -15,7 +15,6 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * 订单费用跟单表

src/main/java/com/ydtech/modules/order/entity/InsOrderQrCode.java

@@ -1,37 +1,21 @@
 package com.ydtech.modules.order.entity;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
-import com.ydtech.constants.enums.InsuranceRisk;
-import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
-import com.ydtech.constants.enums.dict.agreement.ProductsType;
-import com.ydtech.exception.SystemException;
-import com.ydtech.modules.admin.model.SysDept;
-import com.ydtech.modules.admin.model.SysUser;
-import com.ydtech.modules.ins.model.vo.KindInfoVo;
-import com.ydtech.modules.ins.model.vo.RiskInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.*;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Base64;
 import java.util.Date;
-import java.util.List;
 
 /**
  * 保险订单二维码表

src/main/java/com/ydtech/modules/order/entity/InsOrdersTrack.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ydtech.modules.order.service.InsOrdersTrackService;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/ydtech/modules/order/entity/api/bohai/request/ElectronicPolicyRequest.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.bohai.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.order.entity.api.bohai.constants.RequestType;
 import com.ydtech.modules.order.entity.config.BoHaiConfigureParameters;
 import com.ydtech.utils.StringUtils;
 import lombok.Data;

src/main/java/com/ydtech/modules/order/entity/api/bohai/request/GenerateOrderNoRequest.java

@@ -1,16 +1,11 @@
 package com.ydtech.modules.order.entity.api.bohai.request;
 
 
-import com.ydtech.modules.order.entity.api.bohai.constants.RequestType;
 import com.ydtech.modules.order.entity.config.BoHaiConfigureParameters;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.UUID;
-
 /**
  * @description: 渤海财险 生成订单接口
  * @author: wenks

src/main/java/com/ydtech/modules/order/entity/api/bohai/request/ImageUploadRequest.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.order.entity.api.bohai.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.api.bohai.constants.DocumentClass;
-import com.ydtech.modules.order.entity.api.bohai.constants.RequestType;
 import com.ydtech.modules.order.entity.config.BoHaiConfigureParameters;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import lombok.Data;

src/main/java/com/ydtech/modules/order/entity/api/bohai/request/PaymentRequest.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.api.bohai.request;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.order.entity.api.bohai.constants.RequestType;
 import com.ydtech.modules.order.entity.config.BoHaiConfigureParameters;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/ydtech/modules/order/entity/api/bohai/request/StatusDocumentsRequest.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.bohai.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.order.entity.api.bohai.constants.RequestType;
 import com.ydtech.modules.order.entity.config.BoHaiConfigureParameters;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/ydtech/modules/order/entity/api/bohai/request/UnderwritingRequest.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.bohai.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.order.entity.api.bohai.constants.RequestType;
 import com.ydtech.modules.order.entity.config.BoHaiConfigureParameters;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/ydtech/modules/order/entity/api/bohai/request/VehicleConfirmationReqeust.java

@@ -17,7 +17,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.stream.Collectors;
 

src/main/java/com/ydtech/modules/order/entity/api/bohai/response/QuotationResponse.java

@@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)

src/main/java/com/ydtech/modules/order/entity/api/dajia/AESEncrypt.java

@@ -1,20 +1,15 @@
 package com.ydtech.modules.order.entity.api.dajia;
 
 
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
 import cn.hutool.core.codec.Base64Decoder;
 import cn.hutool.core.codec.Base64Encoder;
-import com.ydtech.modules.order.entity.api.dajia.constants.CIndemLmtLvl;
-import io.lettuce.core.dynamic.annotation.Value;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import java.util.Arrays;
-import java.util.Base64;
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
 
 
 /**

src/main/java/com/ydtech/modules/order/entity/api/dajia/DaJiaBaseRequest.java

@@ -1,9 +1,9 @@
 package com.ydtech.modules.order.entity.api.dajia;
 
+import cn.hutool.core.date.DateUtil;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.utils.idgen.IdGenerate;
 import lombok.Data;
-import cn.hutool.core.date.DateUtil;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;

src/main/java/com/ydtech/modules/order/entity/api/dajia/DaJiaConfigureParameters.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.dajia;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.entity.config.ConfigureParameters;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/ydtech/modules/order/entity/api/dajia/constants/CIndemLmtLvl.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.dajia.constants;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 /**

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/NVHLODR1001Request.java

@@ -7,11 +7,8 @@ import com.ydtech.modules.admin.model.vo.PersonAreaVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseRequest;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
-import com.ydtech.modules.order.entity.api.dajia.constants.CVhlTyp;
 import com.ydtech.modules.order.entity.api.dajia.constants.ServiceCode;
 import com.ydtech.modules.order.entity.api.dajia.response.ODR1009Response;
-import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
-import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
 import com.ydtech.utils.idgen.IdGenerate;

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/NVHLODR2007Request.java

@@ -4,13 +4,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseRequest;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
 import com.ydtech.modules.order.entity.api.dajia.constants.ServiceCode;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 import java.util.Objects;
 
 

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1007Request.java

@@ -4,13 +4,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseRequest;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
 import com.ydtech.modules.order.entity.api.dajia.constants.ServiceCode;
-import com.ydtech.modules.order.entity.api.dajia.constants.TradeCode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 
 /**

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1009Request.java

@@ -1,34 +1,24 @@
 package com.ydtech.modules.order.entity.api.dajia.request;
 
-import cn.hutool.core.date.DateTime;
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.InsuranceRisk;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
-import com.ydtech.modules.ins.model.vo.QuoteInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseRequest;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
 import com.ydtech.modules.order.entity.api.dajia.constants.*;
-import com.ydtech.modules.order.entity.api.dajia.response.ODR1009Response;
 import com.ydtech.modules.order.entity.api.dajia.response.ODR1016Response;
-import com.ydtech.modules.order.entity.vo.AccidentalDrivingQueryVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingSubDajia;
-import com.ydtech.utils.DateTimeUtil;
-import com.ydtech.utils.DateTimeUtils;
-import com.ydtech.utils.idgen.IdGenerate;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.*;
-import java.util.stream.Stream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
 
-import static com.ydtech.modules.order.entity.api.dajia.constants.CInspectRec.INSREC1;
 import static com.ydtech.modules.order.entity.api.dajia.constants.CPayTaxType.T5002;
 
 

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1010Request.java

@@ -1,15 +1,11 @@
 package com.ydtech.modules.order.entity.api.dajia.request;
 
-import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseRequest;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
-import com.ydtech.modules.order.entity.api.dajia.constants.CChannelSrc;
 import com.ydtech.modules.order.entity.api.dajia.constants.ServiceCode;
-import com.ydtech.modules.order.entity.api.dajia.response.NVHLODR1001Response;
 import com.ydtech.modules.order.entity.api.dajia.response.ODR1009Response;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1013Request.java

@@ -5,7 +5,6 @@ import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseRequest;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
 import com.ydtech.modules.order.entity.api.dajia.constants.ServiceCode;
-import com.ydtech.modules.order.entity.dto.InsUploadImagesDto;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR1014Request.java

@@ -9,7 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 
 /**

src/main/java/com/ydtech/modules/order/entity/api/dajia/request/ODR2009Request.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.dajia.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.ins.model.vo.QuoteInfoVo;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseRequest;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
 import com.ydtech.modules.order.entity.api.dajia.constants.ServiceCode;
@@ -11,7 +10,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 

src/main/java/com/ydtech/modules/order/entity/api/dajia/response/ODR1007Response.java

@@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 
 /**

src/main/java/com/ydtech/modules/order/entity/api/guoren/request/SpecialAgreementRequest.java

@@ -6,7 +6,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.List;
 
 
 /**

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiInsurancePolicyPrintRequest.java

@@ -8,8 +8,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiSubmitStatusQueryRequest.java

@@ -1,14 +1,10 @@
 package com.ydtech.modules.order.entity.api.huatai.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.ins.model.vo.RiskInfoVo;
-import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-import com.ydtech.modules.order.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.api.huatai.HuaTaiBaseRequest;
 import com.ydtech.modules.order.entity.api.huatai.HuaTaiBaseRequestHead;
 import com.ydtech.modules.order.entity.api.huatai.constants.HuaTaiTransCode;
-import com.ydtech.modules.order.entity.api.zhongmei.constants.TimeConstants;
 import com.ydtech.modules.order.entity.config.HuaTaiConfigureParameters;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -17,9 +13,6 @@ import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiUploadImageRequest.java

@@ -11,9 +11,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @Data

src/main/java/com/ydtech/modules/order/entity/api/huatai/response/HuaTaiModelsQueryResponse.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.api.huatai.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.api.huatai.HuaTaiBaseResponse;
-import com.ydtech.modules.order.entity.api.zhongmei.BaseResponse;
 import com.ydtech.modules.order.entity.filter.CarModelsFilter;
 import com.ydtech.modules.order.entity.vo.CoreModelsVo;
 import lombok.Data;

src/main/java/com/ydtech/modules/order/entity/api/huatai/response/HuaTaiQuotedPriceResponse.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.api.huatai.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.api.huatai.HuaTaiBaseResponse;
-import com.ydtech.modules.order.entity.api.huatai.request.HuaTaiQuotedPriceRequest;
 import com.ydtech.utils.StringUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -11,8 +10,6 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * @Author: CXP

src/main/java/com/ydtech/modules/order/entity/api/yongcheng/request/AccidentUnderwritingRequest.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.order.entity.api.yongcheng.request;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.ydtech.modules.ins.model.yc.YcConfigureParameters;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 

src/main/java/com/ydtech/modules/order/entity/api/yongcheng/response/AccidentUnderwritingResponse.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.api.yongcheng.response;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import com.ydtech.modules.order.entity.api.yongcheng.request.AccidentUnderwritingRequest;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/ydtech/modules/order/entity/api/zhongmei/request/CoverageRequest.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.api.zhongmei.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ydtech.modules.order.entity.api.zhongmei.BaseRequest;
-import com.ydtech.modules.order.entity.api.zhongmei.response.OrderStatusResponse;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

src/main/java/com/ydtech/modules/order/entity/api/zijin/constants/enums/UnderWriteFlagEnum.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.api.zijin.constants.enums;
 
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 

src/main/java/com/ydtech/modules/order/entity/api/zijin/constants/enums/UseNatureCode.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.zijin.constants.enums;
 
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.Getter;
 
 @Getter

src/main/java/com/ydtech/modules/order/entity/api/zijin/request/NewPayRequest.java

@@ -8,7 +8,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @version

src/main/java/com/ydtech/modules/order/entity/crawler/response/CrawlerVerifyPaymentResponse.java

@@ -1,18 +1,13 @@
 package com.ydtech.modules.order.entity.crawler.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.order.entity.api.zijin.constants.enums.RiskCodeEnum;
-import com.ydtech.modules.order.entity.api.zijin.response.QueryOrderDetailResponse;
-import com.ydtech.modules.order.entity.dto.DrivingInsuranceDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @EqualsAndHashCode(callSuper = true)
 @Data

src/main/java/com/ydtech/modules/order/entity/crawler/vo/CrawlerPolicyPrintVo.java

@@ -1,16 +1,13 @@
 package com.ydtech.modules.order.entity.crawler.vo;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.order.entity.crawler.response.CrawlerPolicyPrintResponse;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.springframework.util.ObjectUtils;
 
 import java.io.Serializable;
-import java.util.Collections;
 import java.util.List;
 
 @Data

src/main/java/com/ydtech/modules/order/entity/vo/AccidentalDrivingQueryVo.java

@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;

src/main/java/com/ydtech/modules/order/entity/vo/AuditExportVo.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ydtech.modules.nai.httpvo.excel.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/ydtech/modules/order/entity/vo/BatchOrderAuditVo.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.vo;
 
 
-import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ydtech/modules/order/entity/vo/BatchOrderVo.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.vo;
 
 
 import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ydtech/modules/order/entity/vo/CostSettlementExcelVo.java

@@ -1,13 +1,9 @@
 package com.ydtech.modules.order.entity.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.ydtech.modules.nai.httpvo.excel.Excel;
 import io.swagger.annotations.ApiModelProperty;
-import io.swagger.annotations.ApiOperation;
 import lombok.Data;
 
-import java.time.LocalDate;
-
 @Data
 public class CostSettlementExcelVo {
 

src/main/java/com/ydtech/modules/order/entity/vo/CostSettlementQueryVo.java

@@ -1,6 +1,5 @@
 package com.ydtech.modules.order.entity.vo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/ydtech/modules/order/entity/vo/FeeOrderNewRecordVo.java

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.List;
 
 @ApiModel(description = "费用明细调整费用")
 @Data

src/main/java/com/ydtech/modules/order/entity/vo/FeeOrderNewVo.java

@@ -1,12 +1,9 @@
 package com.ydtech.modules.order.entity.vo;
 
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.poi.hpsf.Decimal;
 
 import java.io.Serializable;
 import java.math.BigDecimal;

src/main/java/com/ydtech/modules/order/entity/vo/OrderExpirationQueryVo.java

@@ -1,16 +1,10 @@
 package com.ydtech.modules.order.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
 
-import java.io.Serializable;
-import java.util.Date;
-
 @Data
 @TableName(autoResultMap = true)
 public class OrderExpirationQueryVo extends PageRequest {

src/main/java/com/ydtech/modules/order/entity/vo/OrderExpirationVo.java

@@ -1,20 +1,12 @@
 package com.ydtech.modules.order.entity.vo;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ydtech.modules.protocols.entity.vo.AgreementProductCostsSave;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.List;
 
 @Data
 @TableName(autoResultMap = true)

src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.ObjectUtils;
 
-import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import java.time.LocalDate;

src/main/java/com/ydtech/modules/order/entity/vo/dajia/AccidentalInsuranceQueryVo.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.vo.dajia;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.Serializable;

src/main/java/com/ydtech/modules/order/entity/vo/dajia/InsAccidentalDrivingDajia.java

@@ -1,13 +1,10 @@
 package com.ydtech.modules.order.entity.vo.dajia;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @Data

src/main/java/com/ydtech/modules/order/entity/vo/dajia/InsAccidentalDrivingSubDajia.java

@@ -1,6 +1,5 @@
 package com.ydtech.modules.order.entity.vo.dajia;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/ydtech/modules/order/entity/vo/guoren/GuoRenQuoteVo.java

@@ -2,8 +2,6 @@ package com.ydtech.modules.order.entity.vo.guoren;
 
 
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
-import com.ydtech.modules.order.entity.vo.guoren.GuoRenSpecialAgreementVo;
-import com.ydtech.modules.order.entity.vo.guoren.GuorenAccidentalDrivingVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

src/main/java/com/ydtech/modules/order/entity/vo/zm/ZmQuoteSpiderVo.java

@@ -7,9 +7,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 
 @Data

src/main/java/com/ydtech/modules/order/service/BatchOrderService.java

@@ -1,12 +1,10 @@
 package com.ydtech.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.ins.model.vo.QuoteRespVo;
 import com.ydtech.modules.order.entity.BatchOrder;
-import com.ydtech.modules.order.entity.vo.*;
-
-import java.util.List;
+import com.ydtech.modules.order.entity.vo.BatchOrderAuditVo;
+import com.ydtech.modules.order.entity.vo.BatchOrderQueryVo;
+import com.ydtech.modules.order.entity.vo.BatchOrderVo;
 
 /**
  * 批单服务

src/main/java/com/ydtech/modules/order/service/CarModelService.java

@@ -1,6 +1,5 @@
 package com.ydtech.modules.order.service;
 
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 
 import java.util.List;

src/main/java/com/ydtech/modules/order/service/InsAccidentalDrivingDaJiaService.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.order.entity.InsAccidentalDriving;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
 
 /**

src/main/java/com/ydtech/modules/order/service/InsAccidentalDrivingSubDaJiaService.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingDajia;
 import com.ydtech.modules.order.entity.vo.dajia.InsAccidentalDrivingSubDajia;
 
 import java.util.List;

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyExternalFeeService.java

@@ -1,17 +1,7 @@
 package com.ydtech.modules.order.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.InsAreaCompanyAccidentalDriving;
 import com.ydtech.modules.order.entity.InsAreaCompanyExternalFee;
-import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
-import com.ydtech.modules.order.entity.vo.*;
-import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
-
-import java.util.List;
 
 /**
  * @author Administrator

src/main/java/com/ydtech/modules/order/service/InsAreaCompanyPositionService.java

@@ -1,18 +1,7 @@
 package com.ydtech.modules.order.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.order.entity.InsAreaCompany;
-import com.ydtech.modules.order.entity.InsAreaCompanyAccidentalDriving;
 import com.ydtech.modules.order.entity.InsAreaCompanyPosition;
-import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
-import com.ydtech.modules.order.entity.vo.OrderQueryVo;
-import com.ydtech.modules.order.entity.vo.OrderVo;
-import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
-
-import java.util.List;
 
 /**
  * @author Administrator

src/main/java/com/ydtech/modules/order/service/InsCopyFeeOrderService.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.order.entity.InsCopyFeeOrder;
-import com.ydtech.modules.order.entity.InsFeeOrder;
 
 /**
  * @author CXP

src/main/java/com/ydtech/modules/order/service/InsFeeOrderSubService.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.order.entity.InsFeeOrder;
 import com.ydtech.modules.order.entity.InsFeeOrderSub;
 
 /**

src/main/java/com/ydtech/modules/order/service/InsOrderQrCodeService.java

@@ -1,10 +1,8 @@
 package com.ydtech.modules.order.service;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.entity.InsOrderQrCode;
-import org.springframework.util.ObjectUtils;
 
 import java.util.List;
 

src/main/java/com/ydtech/modules/order/service/impl/BoHaiOrderApiServiceImpl.java

@@ -8,7 +8,6 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.vo.PersonAreaVo;
 import com.ydtech.modules.admin.service.SysAreaService;
-import com.ydtech.modules.ins.model.cbit.BusinessPolicy;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.order.components.ConfigureParametersComponents;
 import com.ydtech.modules.order.components.FileComponents;

src/main/java/com/ydtech/modules/order/service/impl/CarModelServiceImpl.java

@@ -1,16 +1,13 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.order.service.CarModelService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.YongAnOrderService;
 import com.ydtech.modules.order.service.ZhongMeiOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
 
 import java.util.Collections;
 import java.util.List;