wks пре 3 година
родитељ
комит
008fef6350
57 измењених фајлова са 65 додато и 161 уклоњено
  1. 0 2
      src/main/java/com/ydtech/modules/order/components/InsOrdersComponents.java
  2. 0 2
      src/main/java/com/ydtech/modules/order/controller/AnShengOrderController.java
  3. 0 1
      src/main/java/com/ydtech/modules/order/controller/HengBangOrderController.java
  4. 0 16
      src/main/java/com/ydtech/modules/order/controller/IdentifyController.java
  5. 5 2
      src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java
  6. 0 1
      src/main/java/com/ydtech/modules/order/controller/OrderTaskImageController.java
  7. 0 1
      src/main/java/com/ydtech/modules/order/controller/OrderTaskPoolsController.java
  8. 2 4
      src/main/java/com/ydtech/modules/order/controller/RenewalController.java
  9. 0 3
      src/main/java/com/ydtech/modules/order/controller/YongAnOrderController.java
  10. 0 1
      src/main/java/com/ydtech/modules/order/controller/ZhongMeiOrderApiController.java
  11. 1 1
      src/main/java/com/ydtech/modules/order/convert/CarModelDTOConvert.java
  12. 0 1
      src/main/java/com/ydtech/modules/order/convert/ImgListMapper.java
  13. 0 1
      src/main/java/com/ydtech/modules/order/convert/SimpleStadarCarDTOConvert.java
  14. 1 2
      src/main/java/com/ydtech/modules/order/entity/InsAccidentalDriving.java
  15. 4 6
      src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java
  16. 4 6
      src/main/java/com/ydtech/modules/order/entity/InsOrders.java
  17. 0 4
      src/main/java/com/ydtech/modules/order/entity/api/zm/BaseRequestHead.java
  18. 0 2
      src/main/java/com/ydtech/modules/order/entity/api/zm/BaseResponseHead.java
  19. 0 1
      src/main/java/com/ydtech/modules/order/entity/api/zm/constants/enums/PaymentStatusEnum.java
  20. 0 1
      src/main/java/com/ydtech/modules/order/entity/api/zm/request/ApprovedRequest.java
  21. 0 4
      src/main/java/com/ydtech/modules/order/entity/api/zm/request/UploadImageRequest.java
  22. 0 2
      src/main/java/com/ydtech/modules/order/entity/api/zm/response/QuotedPriceResponse.java
  23. 0 1
      src/main/java/com/ydtech/modules/order/entity/api/zm/response/ValidSMScodeResponse.java
  24. 0 2
      src/main/java/com/ydtech/modules/order/entity/dto/EsmInsCompanyDto.java
  25. 3 5
      src/main/java/com/ydtech/modules/order/entity/po/InsRenewal.java
  26. 3 4
      src/main/java/com/ydtech/modules/order/entity/po/InsTaskImages.java
  27. 2 4
      src/main/java/com/ydtech/modules/order/entity/po/InsUploadFiles.java
  28. 0 1
      src/main/java/com/ydtech/modules/order/entity/request/RenewalRequest.java
  29. 0 2
      src/main/java/com/ydtech/modules/order/entity/vo/BaseQuoteInfoVo.java
  30. 0 1
      src/main/java/com/ydtech/modules/order/entity/vo/InsRenewalVo.java
  31. 0 2
      src/main/java/com/ydtech/modules/order/entity/vo/InsTaskImageVo.java
  32. 0 6
      src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java
  33. 0 1
      src/main/java/com/ydtech/modules/order/entity/vo/OrderVo.java
  34. 0 3
      src/main/java/com/ydtech/modules/order/entity/vo/QueryRenewalVo.java
  35. 0 1
      src/main/java/com/ydtech/modules/order/entity/vo/as/AsQuoteResponse.java
  36. 13 3
      src/main/java/com/ydtech/modules/order/service/IdentifyService.java
  37. 0 1
      src/main/java/com/ydtech/modules/order/service/InsAreaCompanyService.java
  38. 1 1
      src/main/java/com/ydtech/modules/order/service/InsOrdersService.java
  39. 1 2
      src/main/java/com/ydtech/modules/order/service/InsRenewalService.java
  40. 0 1
      src/main/java/com/ydtech/modules/order/service/InsUploadFilesService.java
  41. 0 5
      src/main/java/com/ydtech/modules/order/service/OrderTaskImageService.java
  42. 0 3
      src/main/java/com/ydtech/modules/order/service/RenBaoOrderService.java
  43. 0 2
      src/main/java/com/ydtech/modules/order/service/YongAnOrderService.java
  44. 0 3
      src/main/java/com/ydtech/modules/order/service/ZhongMeiOrderApiService.java
  45. 0 1
      src/main/java/com/ydtech/modules/order/service/ZhongMeiOrderService.java
  46. 0 1
      src/main/java/com/ydtech/modules/order/service/impl/CarModelServiceImpl.java
  47. 2 2
      src/main/java/com/ydtech/modules/order/service/impl/HengBangServiceImpl.java
  48. 0 1
      src/main/java/com/ydtech/modules/order/service/impl/IdentifyServiceImpl.java
  49. 10 5
      src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java
  50. 6 7
      src/main/java/com/ydtech/modules/order/service/impl/InsRenewalServiceImpl.java
  51. 3 7
      src/main/java/com/ydtech/modules/order/service/impl/InsUploadFilesServiceImpl.java
  52. 0 11
      src/main/java/com/ydtech/modules/order/service/impl/OrderTaskImageServiceImpl.java
  53. 0 3
      src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java
  54. 1 1
      src/main/java/com/ydtech/modules/order/service/impl/RenBaoOrderServiceImpl.java
  55. 1 1
      src/main/java/com/ydtech/modules/order/service/impl/YongChengOrderServiceImpl.java
  56. 0 1
      src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderApiServiceImpl.java
  57. 2 2
      src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderServiceImpl.java

+ 0 - 2
src/main/java/com/ydtech/modules/order/components/InsOrdersComponents.java

@@ -2,11 +2,9 @@ package com.ydtech.modules.order.components;
 
 import com.alibaba.fastjson.JSON;
 import com.ydtech.constants.RedisConstant;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.service.InsOrdersService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;

+ 0 - 2
src/main/java/com/ydtech/modules/order/controller/AnShengOrderController.java

@@ -2,14 +2,12 @@ package com.ydtech.modules.order.controller;
 
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.service.AnShengOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 0 - 1
src/main/java/com/ydtech/modules/order/controller/HengBangOrderController.java

@@ -10,7 +10,6 @@ import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.service.HengBangOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 0 - 16
src/main/java/com/ydtech/modules/order/controller/IdentifyController.java

@@ -1,31 +1,15 @@
 package com.ydtech.modules.order.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.exception.SystemException;
-import com.ydtech.modules.ins.model.CardUserInfo;
-import com.ydtech.modules.ins.model.CustomerInfoVO;
-import com.ydtech.modules.ins.model.ImgInfo;
-import com.ydtech.modules.order.entity.vo.ImgInfoVo;
 import com.ydtech.modules.order.service.IdentifyService;
-import com.ydtech.utils.StringUtils;
-import com.ydtech.utils.baidu.Idcard;
-import com.ydtech.utils.baidu.MultiObjectDetect;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
 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;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
 @RestController
 @RequestMapping("/order/identify")
 @Api(tags = "识别")

+ 5 - 2
src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -5,7 +5,10 @@ import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.components.InsOrdersComponents;
-import com.ydtech.modules.order.entity.*;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.order.entity.InsAccidentalDriving;
+import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.service.InsAccidentalDrivingService;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
@@ -20,7 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.util.*;
+import java.util.List;
 
 @Api(tags = "订单")
 @RequestMapping("/insurance/order")

+ 0 - 1
src/main/java/com/ydtech/modules/order/controller/OrderTaskImageController.java

@@ -17,7 +17,6 @@ import com.ydtech.utils.idgen.IdGenerate;
 import com.ydtech.validation.annotation.CheckObjectNotNull;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 

+ 0 - 1
src/main/java/com/ydtech/modules/order/controller/OrderTaskPoolsController.java

@@ -12,7 +12,6 @@ import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.OrderTaskPoolsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 2 - 4
src/main/java/com/ydtech/modules/order/controller/RenewalController.java

@@ -37,10 +37,8 @@ public class RenewalController extends BaseController {
 
     @PostMapping("/queryRenewal")
     @ApiOperation("查询续保")
-    public HttpResult queryRenewal(@RequestBody QueryRenewalVo queryRenewalVo, HttpServletRequest request) {
-        String userId = getUserId(request);
-        SysUser sysUser = sysUserService.getById(userId);
-        YaQuoteInfoVo quoteInfoVo = insRenewalService.queryRenewal(sysUser, queryRenewalVo);
+    public HttpResult queryRenewal(@RequestBody QueryRenewalVo queryRenewalVo) {
+        YaQuoteInfoVo quoteInfoVo = insRenewalService.queryRenewal(queryRenewalVo);
         if(null == quoteInfoVo || null == quoteInfoVo.getCarInfo()){
             return HttpResult.error("未查询到续保信息");
         }

+ 0 - 3
src/main/java/com/ydtech/modules/order/controller/YongAnOrderController.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.order.controller;
 
 import com.ydtech.aop.request.RequestSingleParam;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
@@ -12,9 +11,7 @@ import com.ydtech.modules.order.entity.vo.ya.YaPolicyPrintVo;
 import com.ydtech.modules.order.service.YongAnOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.RestClientException;
 
 import java.util.Map;
 

+ 0 - 1
src/main/java/com/ydtech/modules/order/controller/ZhongMeiOrderApiController.java

@@ -14,7 +14,6 @@ import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
 import com.ydtech.modules.order.service.ZhongMeiOrderApiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 1 - 1
src/main/java/com/ydtech/modules/order/convert/CarModelDTOConvert.java

@@ -1,8 +1,8 @@
 package com.ydtech.modules.order.convert;
 
 
-import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
+import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.factory.Mappers;

+ 0 - 1
src/main/java/com/ydtech/modules/order/convert/ImgListMapper.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.convert;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 

+ 0 - 1
src/main/java/com/ydtech/modules/order/convert/SimpleStadarCarDTOConvert.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.convert;
 
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
-import com.ydtech.modules.ins.model.zm.ZmCarModel;
 import com.ydtech.modules.order.entity.api.zm.response.ModelsQueryResponse;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;

+ 1 - 2
src/main/java/com/ydtech/modules/order/entity/InsAccidentalDriving.java

@@ -4,12 +4,11 @@ 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.math.BigDecimal;
 
-import lombok.Data;
-
 /**
  * 驾意险
  *

+ 4 - 6
src/main/java/com/ydtech/modules/order/entity/InsAreaCompany.java

@@ -2,20 +2,18 @@ package com.ydtech.modules.order.entity;
 
 import com.alibaba.fastjson.JSONArray;
 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;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 /**
  * 报价渠道
  *

+ 4 - 6
src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -5,18 +5,16 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.util.List;
-
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * 保险订单表
  *

+ 0 - 4
src/main/java/com/ydtech/modules/order/entity/api/zm/BaseRequestHead.java

@@ -1,11 +1,7 @@
 package com.ydtech.modules.order.entity.api.zm;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
 
 /**
  * @author wenks

+ 0 - 2
src/main/java/com/ydtech/modules/order/entity/api/zm/BaseResponseHead.java

@@ -4,8 +4,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
-
 /**
  * @author wenks
  * @version 0.0.2

+ 0 - 1
src/main/java/com/ydtech/modules/order/entity/api/zm/constants/enums/PaymentStatusEnum.java

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

+ 0 - 1
src/main/java/com/ydtech/modules/order/entity/api/zm/request/ApprovedRequest.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.zm.request;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.ins.model.yc.ruote.Base;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

+ 0 - 4
src/main/java/com/ydtech/modules/order/entity/api/zm/request/UploadImageRequest.java

@@ -2,10 +2,8 @@ package com.ydtech.modules.order.entity.api.zm.request;
 
 import cn.hutool.core.util.ArrayUtil;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.esm.model.InsTaskImage;
 import com.ydtech.modules.order.entity.api.zm.BaseRequest;
 import com.ydtech.modules.order.entity.api.zm.BaseRequestHead;
-import com.ydtech.modules.order.entity.api.zm.constants.InsuranceTypeCorrespondence;
 import com.ydtech.modules.order.entity.api.zm.constants.TransCode;
 import com.ydtech.modules.order.entity.api.zm.constants.enums.ImageTypeEnum;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
@@ -16,9 +14,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.UUID;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * @author wenks

+ 0 - 2
src/main/java/com/ydtech/modules/order/entity/api/zm/response/QuotedPriceResponse.java

@@ -1,9 +1,7 @@
 package com.ydtech.modules.order.entity.api.zm.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.order.entity.api.zm.BaseRequestHead;
 import com.ydtech.modules.order.entity.api.zm.BaseResponse;
-import com.ydtech.modules.order.entity.api.zm.constants.TransCode;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

+ 0 - 1
src/main/java/com/ydtech/modules/order/entity/api/zm/response/ValidSMScodeResponse.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.entity.api.zm.response;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.order.entity.api.zm.BaseRequest;
 import com.ydtech.modules.order.entity.api.zm.BaseResponse;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 0 - 2
src/main/java/com/ydtech/modules/order/entity/dto/EsmInsCompanyDto.java

@@ -1,8 +1,6 @@
 package com.ydtech.modules.order.entity.dto;
 
 import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import lombok.Data;
 
 import java.io.Serializable;

+ 3 - 5
src/main/java/com/ydtech/modules/order/entity/po/InsRenewal.java

@@ -6,15 +6,13 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.order.entity.vo.InsRenewalVo;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+
+import java.io.Serializable;
 
 /**
  * 保险续保

+ 3 - 4
src/main/java/com/ydtech/modules/order/entity/po/InsTaskImages.java

@@ -4,15 +4,14 @@ import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import com.ydtech.modules.order.entity.vo.InsTaskImagesVo;
 import com.ydtech.utils.idgen.IdGenerate;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * 影像
  *

+ 2 - 4
src/main/java/com/ydtech/modules/order/entity/po/InsUploadFiles.java

@@ -3,14 +3,12 @@ package com.ydtech.modules.order.entity.po;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
-
 /**
  * 文件上传
  *

+ 0 - 1
src/main/java/com/ydtech/modules/order/entity/request/RenewalRequest.java

@@ -9,7 +9,6 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Map;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**

+ 0 - 2
src/main/java/com/ydtech/modules/order/entity/vo/BaseQuoteInfoVo.java

@@ -5,8 +5,6 @@ import com.ydtech.modules.order.entity.InsOrders;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotBlank;
-
 /**
  * @author @description 报价信息
  */

+ 0 - 1
src/main/java/com/ydtech/modules/order/entity/vo/InsRenewalVo.java

@@ -1,6 +1,5 @@
 package com.ydtech.modules.order.entity.vo;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 0 - 2
src/main/java/com/ydtech/modules/order/entity/vo/InsTaskImageVo.java

@@ -1,13 +1,11 @@
 package com.ydtech.modules.order.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 

+ 0 - 6
src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -1,20 +1,14 @@
 package com.ydtech.modules.order.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Builder;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Size;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
 
 @Data
 @ApiModel("订单查询Vo")

+ 0 - 1
src/main/java/com/ydtech/modules/order/entity/vo/OrderVo.java

@@ -2,7 +2,6 @@ package com.ydtech.modules.order.entity.vo;
 
 import com.alibaba.fastjson.JSONArray;
 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;

+ 0 - 3
src/main/java/com/ydtech/modules/order/entity/vo/QueryRenewalVo.java

@@ -1,9 +1,6 @@
 package com.ydtech.modules.order.entity.vo;
 
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.ydtech.modules.nai.httpvo.RenewalQueryVO;
-import com.ydtech.modules.order.entity.po.InsRenewal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

+ 0 - 1
src/main/java/com/ydtech/modules/order/entity/vo/as/AsQuoteResponse.java

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

+ 13 - 3
src/main/java/com/ydtech/modules/order/service/IdentifyService.java

@@ -3,13 +3,23 @@ package com.ydtech.modules.order.service;
 import com.ydtech.core.page.HttpResult;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.IOException;
-
 public interface IdentifyService {
 
-
+    /**
+     * 身份证正反面识别
+     * @param image1 正面
+     * @param image2 反面
+     * @return
+     */
     HttpResult idCard(MultipartFile image1, MultipartFile image2);
 
+
+    /**
+     * 行驶证正反面识别
+     * @param image1 正面
+     * @param image2 反面
+     * @return
+     */
     HttpResult drivingPermit(MultipartFile image1, MultipartFile image2);
 
 }

+ 0 - 1
src/main/java/com/ydtech/modules/order/service/InsAreaCompanyService.java

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

+ 1 - 1
src/main/java/com/ydtech/modules/order/service/InsOrdersService.java

@@ -5,8 +5,8 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
+import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import com.ydtech.modules.order.entity.vo.OrderVo;
 import com.ydtech.modules.order.entity.vo.VerifyOrdersVo;
 

+ 1 - 2
src/main/java/com/ydtech/modules/order/service/InsRenewalService.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.order.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.core.page.BasePageVO;
 import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.order.entity.po.InsRenewal;
 import com.ydtech.modules.order.entity.vo.InsRenewalVo;
@@ -16,7 +15,7 @@ import com.ydtech.modules.order.entity.vo.QueryRenewalVo;
  */
 public interface InsRenewalService extends IService<InsRenewal> {
 
-    YaQuoteInfoVo queryRenewal(SysUser sysUser, QueryRenewalVo queryRenewalVo);
+    YaQuoteInfoVo queryRenewal(QueryRenewalVo queryRenewalVo);
 
     HttpResult queryCompany();
 

+ 0 - 1
src/main/java/com/ydtech/modules/order/service/InsUploadFilesService.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.order.entity.po.InsUploadFiles;
 import org.springframework.web.multipart.MultipartFile;
 

+ 0 - 5
src/main/java/com/ydtech/modules/order/service/OrderTaskImageService.java

@@ -1,10 +1,5 @@
 package com.ydtech.modules.order.service;
 
-import com.ydtech.core.page.HttpResult;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-
 public interface OrderTaskImageService {
 
 

+ 0 - 3
src/main/java/com/ydtech/modules/order/service/RenBaoOrderService.java

@@ -1,8 +1,5 @@
 package com.ydtech.modules.order.service;
 
-import com.ydtech.core.page.HttpResult;
-import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-
 public interface RenBaoOrderService extends BaseOrderService<Object> {
 
 

+ 0 - 2
src/main/java/com/ydtech/modules/order/service/YongAnOrderService.java

@@ -2,12 +2,10 @@ package com.ydtech.modules.order.service;
 
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
-import com.ydtech.modules.ins.model.ya.CarModel_Req;
 import com.ydtech.modules.order.entity.vo.ya.YaPayUrlVo;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 public interface YongAnOrderService extends BaseOrderService<Object> {
 

+ 0 - 3
src/main/java/com/ydtech/modules/order/service/ZhongMeiOrderApiService.java

@@ -5,11 +5,8 @@ import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.order.entity.api.zm.request.ApprovedRequest;
 import com.ydtech.modules.order.entity.api.zm.request.CoverageRequest;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.entity.vo.PolicyPrintVo;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 public interface ZhongMeiOrderApiService extends BaseOrderService<AccidentalDrivingVo> {

+ 0 - 1
src/main/java/com/ydtech/modules/order/service/ZhongMeiOrderService.java

@@ -3,7 +3,6 @@ package com.ydtech.modules.order.service;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;
-import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.zm.ZmAscriptionResponse;
 import com.ydtech.modules.order.entity.vo.zm.ZmAscriptionVo;
 

+ 0 - 1
src/main/java/com/ydtech/modules/order/service/impl/CarModelServiceImpl.java

@@ -7,7 +7,6 @@ import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.YongAnOrderService;
 import com.ydtech.modules.order.service.ZhongMeiOrderService;
 import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
 
 import java.util.List;
 

+ 2 - 2
src/main/java/com/ydtech/modules/order/service/impl/HengBangServiceImpl.java

@@ -14,12 +14,12 @@ import com.ydtech.modules.ins.model.hb.HengbangPolicyPrintResponse;
 import com.ydtech.modules.ins.model.hb.HengbangQuoteResponse;
 import com.ydtech.modules.ins.model.request.BaseResponse;
 import com.ydtech.modules.ins.model.vo.*;
-import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.vo.req.InsZmUploadImageVo;
+import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.order.components.InsOrdersComponents;
+import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.service.HengBangOrderService;
 import com.ydtech.modules.order.service.InsAreaCompanyService;

+ 0 - 1
src/main/java/com/ydtech/modules/order/service/impl/IdentifyServiceImpl.java

@@ -6,7 +6,6 @@ import com.ydtech.modules.ins.model.CardUserInfo;
 import com.ydtech.modules.ins.model.CustomerInfoVO;
 import com.ydtech.modules.order.service.IdentifyService;
 import com.ydtech.utils.ImageCompressionUtils;
-import com.ydtech.utils.StringUtils;
 import com.ydtech.utils.baidu.Idcard;
 import com.ydtech.utils.baidu.MultiObjectDetect;
 import org.springframework.stereotype.Service;

+ 10 - 5
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -16,16 +16,18 @@ import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.admin.service.SysUserService;
-import com.ydtech.modules.ins.model.ya.CarModelDTO;
-import com.ydtech.modules.ins.model.ya.ExtendInfoDto;
-import com.ydtech.modules.ins.model.ya.ResponseDataC2;
 import com.ydtech.modules.ins.model.vo.CarInfoVo;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
+import com.ydtech.modules.ins.model.ya.CarModelDTO;
+import com.ydtech.modules.ins.model.ya.ExtendInfoDto;
+import com.ydtech.modules.ins.model.ya.ResponseDataC2;
 import com.ydtech.modules.order.convert.CarModelDTOConvert;
 import com.ydtech.modules.order.convert.MapToYaExtendInfoDto;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
-import com.ydtech.modules.order.entity.*;
+import com.ydtech.modules.order.entity.BasePageResult;
+import com.ydtech.modules.order.entity.InsAreaCompany;
+import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import com.ydtech.modules.order.entity.vo.OrderVo;
@@ -40,7 +42,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 

+ 6 - 7
src/main/java/com/ydtech/modules/order/service/impl/InsRenewalServiceImpl.java

@@ -22,7 +22,6 @@ import com.ydtech.modules.order.entity.vo.InsRenewalVo;
 import com.ydtech.modules.order.entity.vo.QueryRenewalVo;
 import com.ydtech.modules.order.service.InsRenewalService;
 import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -49,14 +48,14 @@ public class InsRenewalServiceImpl extends ServiceImpl<InsRenewalMapper, InsRene
     }
 
     @Override
-    public YaQuoteInfoVo queryRenewal(SysUser sysUser, QueryRenewalVo queryRenewalVo) {
+    public YaQuoteInfoVo queryRenewal(QueryRenewalVo queryRenewalVo) {
         LambdaQueryWrapper<InsRenewal> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(InsRenewal::getCompanyId, queryRenewalVo.getCompanyId());
-        InsRenewal insRenewal = getOne(wrapper);
-        EsmInsAttribution esmInsAttribution = esmInsAttributionService.gainAuthorizeAffiliation(sysUser, queryRenewalVo.getCompanyId());
-        if (ObjectUtils.isEmpty(esmInsAttribution)) {
-            throw new SystemException("账号未授权");
-        }
+        InsRenewal insRenewal = baseMapper.selectOne(wrapper);
+        LambdaQueryWrapper<EsmInsAttribution> insRenewalWrapper = new LambdaQueryWrapper<>();
+        insRenewalWrapper.eq(EsmInsAttribution::getInsCompanyId, queryRenewalVo.getCompanyId());
+        List<EsmInsAttribution> list = esmInsAttributionService.list(insRenewalWrapper);
+        EsmInsAttribution esmInsAttribution = list.get(0);
         RenewalRequest renewalRequest = new RenewalRequest(queryRenewalVo);
         renewalRequest.setUsername(esmInsAttribution.getUsername());
         renewalRequest.setPassword(esmInsAttribution.getPassword());

+ 3 - 7
src/main/java/com/ydtech/modules/order/service/impl/InsUploadFilesServiceImpl.java

@@ -1,29 +1,25 @@
 package com.ydtech.modules.order.service.impl;
 
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.io.file.FileNameUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.constants.enums.FileType;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.dao.InsUploadFilesMapper;
 import com.ydtech.modules.order.entity.po.InsUploadFiles;
 import com.ydtech.modules.order.service.InsUploadFilesService;
 import com.ydtech.utils.ImageCompressionUtils;
-import com.ydtech.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.UUID;
 
 /**
  * @author wenks

+ 0 - 11
src/main/java/com/ydtech/modules/order/service/impl/OrderTaskImageServiceImpl.java

@@ -1,18 +1,7 @@
 package com.ydtech.modules.order.service.impl;
 
-import com.ydtech.core.page.HttpResult;
-import com.ydtech.exception.SystemException;
 import com.ydtech.modules.order.service.OrderTaskImageService;
-import com.ydtech.utils.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.UUID;
 
 /**
  * @author wenks

+ 0 - 3
src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java

@@ -1,9 +1,7 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
@@ -24,7 +22,6 @@ import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 @Service
 public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTaskPoolsService {

+ 1 - 1
src/main/java/com/ydtech/modules/order/service/impl/RenBaoOrderServiceImpl.java

@@ -13,9 +13,9 @@ import com.ydtech.modules.ins.model.request.RenbaoQuoteRespVo;
 import com.ydtech.modules.ins.model.request.RenbaoQuoteResponse;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
+import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;

+ 1 - 1
src/main/java/com/ydtech/modules/order/service/impl/YongChengOrderServiceImpl.java

@@ -10,9 +10,9 @@ import com.ydtech.exception.SystemException;
 import com.ydtech.modules.ins.model.vo.*;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.yc.*;
+import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
-import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.vo.BaseQuoteVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;

+ 0 - 1
src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderApiServiceImpl.java

@@ -23,7 +23,6 @@ import com.ydtech.modules.order.entity.api.zm.constants.enums.AuditStatusEnum;
 import com.ydtech.modules.order.entity.api.zm.constants.enums.DocumentTypeEnum;
 import com.ydtech.modules.order.entity.api.zm.constants.enums.PaymentStatusEnum;
 import com.ydtech.modules.order.entity.api.zm.request.*;
-
 import com.ydtech.modules.order.entity.api.zm.response.*;
 import com.ydtech.modules.order.entity.po.InsTaskImagesBase64;
 import com.ydtech.modules.order.entity.vo.AccidentalDrivingVo;

+ 2 - 2
src/main/java/com/ydtech/modules/order/service/impl/ZhongMeiOrderServiceImpl.java

@@ -19,11 +19,11 @@ import com.ydtech.modules.ins.convert.ZhongmeiCarModelConvert;
 import com.ydtech.modules.ins.model.request.Response;
 import com.ydtech.modules.ins.model.request.ZhongmeiQuoteResponse;
 import com.ydtech.modules.ins.model.vo.*;
+import com.ydtech.modules.ins.model.vo.req.InsZmUploadImageVo;
+import com.ydtech.modules.ins.model.vo.res.ZmVerifyPaymentVo;
 import com.ydtech.modules.ins.model.ya.CarModelDTO;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.zm.ZmCarModel;
-import com.ydtech.modules.ins.model.vo.req.InsZmUploadImageVo;
-import com.ydtech.modules.ins.model.vo.res.ZmVerifyPaymentVo;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;