dongxin 1 год назад
Родитель
Сommit
aaa3afd3f5

+ 0 - 1
tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/api/entity/request/ODR1008Request.java

@@ -17,7 +17,6 @@ import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Objects;
 
-import static com.ydtech.modules.order.entity.api.dajia.constants.CFuelType.*;
 
 
 /**

+ 88 - 93
tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/api/entity/request/ODR1010Request.java

@@ -3,12 +3,7 @@ package com.jzg.quotation.dajia.api.entity.request;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.quotation.dajia.api.entity.DaJiaBaseRequest;
-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.ServiceCode;
-import com.ydtech.modules.order.entity.api.dajia.response.ODR1009Response;
-import com.ydtech.utils.StringUtils;
+import com.jzg.quotation.dajia.api.entity.response.ODR1009Response;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -34,22 +29,22 @@ public class ODR1010Request extends DaJiaBaseRequest {
     @JsonProperty("body")
     private BodyDTO body;
 
-    public ODR1010Request(String orderNo, String busiId, DaJiaConfigureParameters daJiaConfigureParameters,
-                          ODR1009Response.ResultDTO odr1009Response, InsOrders insOrders) {
-        super(daJiaConfigureParameters.getChannelCode(), ServiceCode.ODR1010.getCode());
-        if(body == null){
-            body = new BodyDTO();
-        }
-        body.setOrderNo( orderNo );
-        //业务信息
-        setBusinessInfo(busiId,daJiaConfigureParameters);
-        //交强特约信息
-        setJqSpecialEngageList(odr1009Response.getJqSpecialEngageList());
-        //商业特约信息
-        setSySpecialEngageList(odr1009Response.getSySpecialEngageList());
-        //校验信息
-        setCheckInfo(insOrders);
-    }
+//    public ODR1010Request(String orderNo, String busiId, DaJiaConfigureParameters daJiaConfigureParameters,
+//                          ODR1009Response.ResultDTO odr1009Response, InsOrders insOrders) {
+//        super(daJiaConfigureParameters.getChannelCode(), ServiceCode.ODR1010.getCode());
+//        if(body == null){
+//            body = new BodyDTO();
+//        }
+//        body.setOrderNo( orderNo );
+//        //业务信息
+//        setBusinessInfo(busiId,daJiaConfigureParameters);
+//        //交强特约信息
+//        setJqSpecialEngageList(odr1009Response.getJqSpecialEngageList());
+//        //商业特约信息
+//        setSySpecialEngageList(odr1009Response.getSySpecialEngageList());
+//        //校验信息
+//        setCheckInfo(insOrders);
+//    }
 
     @NoArgsConstructor
     @Data
@@ -175,37 +170,37 @@ public class ODR1010Request extends DaJiaBaseRequest {
     }
 
     //业务信息
-    public void setBusinessInfo(String busiId,DaJiaConfigureParameters daJiaConfigureParameters){
-        if(Objects.isNull(body.businessInfo)){
-            body.businessInfo = new BodyDTO.BusinessInfoDTO();
-        }
-        //业务ID
-        body.businessInfo.setBusiId(busiId);
-        //登录机构
-        body.businessInfo.setBusiOpdpt(daJiaConfigureParameters.getLoginInstitution());
-        //出单口
-        body.businessInfo.setBusiDptCde(daJiaConfigureParameters.getIssuingInstitution());
-        //代理人编码
-        body.businessInfo.setBusiBrkrCde(daJiaConfigureParameters.getAgentCode());
-        //操作员代码
-        body.businessInfo.setBusiOprCde(daJiaConfigureParameters.getOperatorCode());
-        //操作员姓名
-        body.businessInfo.setBusiOprNme(daJiaConfigureParameters.getOperatorName());
-        //业务来源
-        body.businessInfo.setBusiBsnsTyp(Integer.parseInt(daJiaConfigureParameters.getBusinessSource()));
-        //业务员代码
-        body.businessInfo.setBusiSlsCde(daJiaConfigureParameters.getSalespersonCode());
-        //推荐人代码
-        body.businessInfo.setBusiRecommendCde(daJiaConfigureParameters.getRecommendedCode());
-        //推荐子渠道
-        body.businessInfo.setBusiRecSubChannel(daJiaConfigureParameters.getRecommendedSubChannels());
-        //渠道
-        body.businessInfo.setBusiChannelSrc(daJiaConfigureParameters.getChannel());
-        //设置一级来源
-        body.businessInfo.setBusiDataSrc("G");
-        //设置二级来源
-        body.businessInfo.setBusiDataFlag("TQBD");
-    }
+//    public void setBusinessInfo(String busiId,DaJiaConfigureParameters daJiaConfigureParameters){
+//        if(Objects.isNull(body.businessInfo)){
+//            body.businessInfo = new BodyDTO.BusinessInfoDTO();
+//        }
+//        //业务ID
+//        body.businessInfo.setBusiId(busiId);
+//        //登录机构
+//        body.businessInfo.setBusiOpdpt(daJiaConfigureParameters.getLoginInstitution());
+//        //出单口
+//        body.businessInfo.setBusiDptCde(daJiaConfigureParameters.getIssuingInstitution());
+//        //代理人编码
+//        body.businessInfo.setBusiBrkrCde(daJiaConfigureParameters.getAgentCode());
+//        //操作员代码
+//        body.businessInfo.setBusiOprCde(daJiaConfigureParameters.getOperatorCode());
+//        //操作员姓名
+//        body.businessInfo.setBusiOprNme(daJiaConfigureParameters.getOperatorName());
+//        //业务来源
+//        body.businessInfo.setBusiBsnsTyp(Integer.parseInt(daJiaConfigureParameters.getBusinessSource()));
+//        //业务员代码
+//        body.businessInfo.setBusiSlsCde(daJiaConfigureParameters.getSalespersonCode());
+//        //推荐人代码
+//        body.businessInfo.setBusiRecommendCde(daJiaConfigureParameters.getRecommendedCode());
+//        //推荐子渠道
+//        body.businessInfo.setBusiRecSubChannel(daJiaConfigureParameters.getRecommendedSubChannels());
+//        //渠道
+//        body.businessInfo.setBusiChannelSrc(daJiaConfigureParameters.getChannel());
+//        //设置一级来源
+//        body.businessInfo.setBusiDataSrc("G");
+//        //设置二级来源
+//        body.businessInfo.setBusiDataFlag("TQBD");
+//    }
 
     //交强特约信息
     public void setJqSpecialEngageList(List<BodyDTO.JqSpecialEngageListDTO> jqSpecialEngageList){
@@ -224,45 +219,45 @@ public class ODR1010Request extends DaJiaBaseRequest {
     }
 
     //校验信息
-    public void setCheckInfo(InsOrders insOrders){
-        if(Objects.isNull(body.checkInfo)){
-            body.checkInfo = new BodyDTO.CheckInfoDTO();
-        }
-        //车牌号
-        if(!insOrders.getCarinfo().getBooleanValue("noLicenseFlag")){
-            body.checkInfo.setVehiclePlateNo(insOrders.getLicenseno());
-        }
-
-        //车架号
-        body.checkInfo.setVehicleFrmNo(insOrders.getFrameno());
-        JSONObject applyInfo = insOrders.getApplyinfo();
-        JSONObject insureInfo = insOrders.getInsureinfo();
-        String applyProperty = applyInfo.getString("property");
-        String insureProperty = insureInfo.getString("property");
-        //投保人名称
-        body.checkInfo.setApplicantNme(applyInfo.getString("name"));
-        if(StringUtils.isBlank(applyProperty) || !"0".equals(applyProperty)){
-            //投保人证件号码
-            body.checkInfo.setApplicantCCertfCde(applyInfo.getString("identifyNumber"));
-        }else{
-            //投保人证件号码
-            body.checkInfo.setApplicantCCertfCde(applyInfo.getString("organizationCode"));
-        }
-        //投保人手机号
-        body.checkInfo.setApplicantMobile(applyInfo.getString("mobile"));
-
-        //被保人名称
-        body.checkInfo.setInsuredNme(insureInfo.getString("name"));
-        if(StringUtils.isBlank(insureProperty) || !"0".equals(insureProperty)){
-            //被保人证件号码
-            body.checkInfo.setInsuredCertfCde(insureInfo.getString("identifyNumber"));
-        }else{
-            //被保人证件号码
-            body.checkInfo.setInsuredCertfCde(insureInfo.getString("organizationCode"));
-        }
-        //被保人手机号
-        body.checkInfo.setInsuredMobile(insureInfo.getString("mobile"));
-
-    }
+//    public void setCheckInfo(InsOrders insOrders){
+//        if(Objects.isNull(body.checkInfo)){
+//            body.checkInfo = new BodyDTO.CheckInfoDTO();
+//        }
+//        //车牌号
+//        if(!insOrders.getCarinfo().getBooleanValue("noLicenseFlag")){
+//            body.checkInfo.setVehiclePlateNo(insOrders.getLicenseno());
+//        }
+//
+//        //车架号
+//        body.checkInfo.setVehicleFrmNo(insOrders.getFrameno());
+//        JSONObject applyInfo = insOrders.getApplyinfo();
+//        JSONObject insureInfo = insOrders.getInsureinfo();
+//        String applyProperty = applyInfo.getString("property");
+//        String insureProperty = insureInfo.getString("property");
+//        //投保人名称
+//        body.checkInfo.setApplicantNme(applyInfo.getString("name"));
+//        if(StringUtils.isBlank(applyProperty) || !"0".equals(applyProperty)){
+//            //投保人证件号码
+//            body.checkInfo.setApplicantCCertfCde(applyInfo.getString("identifyNumber"));
+//        }else{
+//            //投保人证件号码
+//            body.checkInfo.setApplicantCCertfCde(applyInfo.getString("organizationCode"));
+//        }
+//        //投保人手机号
+//        body.checkInfo.setApplicantMobile(applyInfo.getString("mobile"));
+//
+//        //被保人名称
+//        body.checkInfo.setInsuredNme(insureInfo.getString("name"));
+//        if(StringUtils.isBlank(insureProperty) || !"0".equals(insureProperty)){
+//            //被保人证件号码
+//            body.checkInfo.setInsuredCertfCde(insureInfo.getString("identifyNumber"));
+//        }else{
+//            //被保人证件号码
+//            body.checkInfo.setInsuredCertfCde(insureInfo.getString("organizationCode"));
+//        }
+//        //被保人手机号
+//        body.checkInfo.setInsuredMobile(insureInfo.getString("mobile"));
+//
+//    }
 
 }

+ 0 - 5
tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/api/entity/request/ODR1013Request.java

@@ -6,11 +6,6 @@ import com.jzg.quotation.commons.entity.vo.image.InsuranceImageVo;
 import com.jzg.quotation.dajia.api.constant.ServiceCode;
 import com.jzg.quotation.dajia.api.entity.DaJiaApiConfigureParameters;
 import com.jzg.quotation.dajia.api.entity.DaJiaBaseRequest;
-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.po.InsTaskImagesBase64;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

+ 0 - 1
tenant/insurance/quotation-dajia/src/main/java/com/jzg/quotation/dajia/api/entity/response/ODR1013Response.java

@@ -1,7 +1,6 @@
 package com.jzg.quotation.dajia.api.entity.response;
 
 import com.jzg.quotation.dajia.api.entity.DaJiaBaseResponse;
-import com.ydtech.modules.order.entity.api.dajia.DaJiaBaseResponse;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;