bug修改

commons/src/main/java/com/jzg/commons/entity/orders/vo/OrderListVo.java

@@ -63,4 +63,37 @@ public class OrderListVo {
 
     //总保费
     private String sumPremium;
+
+    // 业务员信息
+    private String salesmanInfo;
+
+    // 业务员类型
+    private String salesmanType;
+
+    // 出单机构
+    private String deptName;
+
+    // 出单协议
+    private String agreementName;
+
+    // 录单人
+    private String recorder;
+
+    // 交强险保费
+    private String ciPremium;
+
+    // 商业险保费
+    private String biPremium;
+
+    // 非车险保费
+    private String niPremium;
+
+    // 车船税
+    private String vvTax;
+
+    // 签单时间
+    private LocalDateTime signingTime;
+
+    //支付时间
+    private LocalDateTime payTime;
 }

tenant/insurance/quotation-bohai/src/main/java/com/jzg/quotation/bohai/api/entity/request/VehicleConfirmationReqeust.java

@@ -236,7 +236,7 @@ public class VehicleConfirmationReqeust extends BoHaiBaseRequest {
             this.vehicleKind = carInfo.getCarKindCode();
             this.vehicleAffNature = carInfo.getPropertyCode();
             // 车辆使用性质
-            this.vehicleUsage = carInfo.getVehicleUseCode();
+            this.vehicleUsage = carInfo.getCarNatureCode();
             // 车辆用途
             this.vehicleUsageDetail = carInfo.getVehicleUseCode();
             this.isTransfer = carInfo.isTransfer() ? "1" : "0";

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

@@ -129,7 +129,7 @@ public class QuoteEchoVo extends QuoteVo {
         this.getOrder().setQuoteNo(insOrdersVo.getQuoteNo());
         this.getOrder().setInsuranceCompanyCode(insOrdersVo.getCompanyId());
         this.getOrder().setCompanyName(insOrdersVo.getCompanyName());
-        this.getOrder().setProductsCode(insOrdersVo.getProductId());
+        this.getOrder().setProductId(insOrdersVo.getProductId());
         this.getOrder().setProductsName(insOrdersVo.getProductName());
         this.getOrder().setOrderStatus(insOrdersVo.getInsOrders().getOrderStatus());
         this.setErrorMessage(insOrdersVo.getErrorMessage());

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

@@ -102,7 +102,7 @@ public class QuoteVo implements Serializable {
         order.setOrdersNo(insOrdersVo.getId());
         order.setQuoteNo(insOrdersVo.getQuoteNo());
         order.setInsuranceCompanyCode(insOrdersVo.getCompanyId());
-        order.setProductsCode(insOrdersVo.getInsOrders().getProductId());
+        order.setProductId(insOrdersVo.getInsOrders().getProductId());
 
         //车辆信息处理
         this.setCarInfoVo(insOrdersVo.getCarInfoVo());

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

@@ -46,7 +46,7 @@ public class OrderBase implements Serializable {
      * @see com.jzg.quotation.commons.constant.enums.base.ProductsType
      * 产品代码
      */
-    private String productsCode;
+    private String productId;
 
     /**
      * @see com.jzg.quotation.commons.constant.enums.base.ApiType

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/service/Impl/GuoRenApiRequestImpl.java

@@ -130,7 +130,7 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
             // 保费计算失败返回
             GuoRenApiOrder guoRenApiOrder = new GuoRenApiOrder();
             guoRenApiOrder.setOrdersNo(orderBase.getOrdersNo());
-            guoRenApiOrder.setProductsCode(orderBase.getProductsCode());
+            guoRenApiOrder.setProductsCode(orderBase.getProductId());
             return handleFailedQuote(guoRenApiOrder,quoteVo,premiumResponse);
         } else {
             //保存投保单 该接口返回投保单号
@@ -142,7 +142,7 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
             // 保费计算成功返回
             GuoRenApiOrder guoRenApiOrder = new GuoRenApiOrder();
             guoRenApiOrder.setOrdersNo(orderBase.getOrdersNo());
-            guoRenApiOrder.setProductsCode(orderBase.getProductsCode());
+            guoRenApiOrder.setProductsCode(orderBase.getProductId());
             guoRenApiOrder.setJqApplyNo(insuranceSlipResponse.getData().getProposalNoDetailVo().getProposalNoCI());
             guoRenApiOrder.setSyApplyNo(insuranceSlipResponse.getData().getProposalNoDetailVo().getProposalNoBI());
             guoRenApiOrder.setOthBusinessNo(carPriceQuery.getInputvo());

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

@@ -160,7 +160,7 @@ public class CompanyFactory {
         underwritingVo.setInsOrdersCarInfo(carInfo);
         underwritingVo.setInsOrdersCarUserInfoList(carUserInfoList);
 
-        return getQuotationBase(underwritingVo.getOrder().getApiType(), companyCode);
+        return getQuotationBase(Integer.parseInt(insOrders.getApiType()), companyCode);
     }
 
     public QuotationBaseService getPaymentLinkService(InsOrders insOrders, String companyCode, BaseController baseController, PaymentLinkVo paymentLinkVo) {
@@ -180,7 +180,7 @@ public class CompanyFactory {
         attributionInformationVo.setUsername(agreementAttribution.getData().getUsername());
         attributionInformationVo.setPassword(agreementAttribution.getData().getPassword());
         paymentLinkVo.getOrder().setAttributionInformationVo(attributionInformationVo);
-        return getQuotationBase(paymentLinkVo.getOrder().getApiType(), companyCode);
+        return getQuotationBase(Integer.parseInt(insOrders.getApiType()), companyCode);
     }
 
     public QuotationBaseService getImageUploadService(InsuranceUploadImageVo insuranceUploadImageVo, BaseController baseController) {

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

@@ -440,7 +440,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrders.setQuoteNo(quoteVo.getOrder().getQuoteNo());
         insOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_ING.getCode());
         insOrders.setCompanyId(quoteVo.getOrder().getInsuranceCompanyCode());
-        insOrders.setProductId(quoteVo.getOrder().getProductsCode());
+        insOrders.setProductId(quoteVo.getOrder().getProductId());
 //        insOrdersMapper.insert(insOrders);
 
         InsOrdersCarInfo carInfo = new InsOrdersCarInfo();

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

@@ -456,7 +456,16 @@
             insur_u.mobile as insur_mobile,
             iorci.start_date as ci_start_date,
             iorbi.start_date as bi_start_date,
-            iorco.sum_premium as sumPremium
+            iorco.sum_premium as sumPremium,
+            iorco.jq_premium as ciPremium,
+            iorco.sy_premium as biPremium,
+            iorco.jy_premium as niPremium,
+            iorco.tax_premium as vvTax,
+            su.username as recorder,
+            suji.name as salesmanInfo,
+            suji.type_attr as salesmanType,
+            pa.agreement_name as agreementName,
+            sd.name as deptName
         FROM
             ins_orders io
                 LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id
@@ -472,6 +481,14 @@
             ins_orders_risk iorbi on iorbi.order_no = io.id and iorbi.risk_code = '0510'
                 LEFT JOIN
             ins_orders_costs iorco on iorco.order_no = io.id
+                left join
+            sys_user su on su.mobile = io.real_quote_user_id
+                left join
+            sys_user_jzg_info suji on suji.user_id = su.id
+                left join
+            sys_dept sd on sd.id = suji.dept_id
+                left join
+            ptl_agreement pa on pa.id = io.agreement_id
         where
             1=1
         <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/repository/YangGuangApiOrderRepository.java

@@ -5,5 +5,5 @@ import com.jzg.quotation.yangguang.api.entity.po.YangGuangApiOrder;
 
 
 public interface YangGuangApiOrderRepository extends BaseRepository<YangGuangApiOrder> {
-    YangGuangApiOrder getById(String id);
+    YangGuangApiOrder getByOrdersNo(String id);
 }

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

@@ -25,8 +25,9 @@ public class YangGuangApiOrderServiceImpl implements YangGuangApiOrderService {
     @Override
     public void saveOrderInfo(QuoteVo quoteVo, YangGuangAccuracyCalculateResponse yangGuangAccuracyCalculateResponse) {
         YangGuangApiOrder yangGuangApiOrder = new YangGuangApiOrder();
+        yangGuangApiOrder.setId(quoteVo.getOrder().getOrdersNo());
         yangGuangApiOrder.setOrdersNo(quoteVo.getOrder().getOrdersNo());
-        yangGuangApiOrder.setProductsCode(quoteVo.getOrder().getProductsCode());
+        yangGuangApiOrder.setProductsCode(quoteVo.getProductId());
         List<YangGuangAccuracyCalculateResponse.PtptNonVehicleProductInformationList> list = yangGuangAccuracyCalculateResponse.getPtptNonVehicleProductInformationList();
         JSONArray array = JSONArray.parseArray(JSON.toJSONString(list));
         yangGuangApiOrder.setCrossInsurance(array);

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

@@ -43,7 +43,7 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
 
     private final YangGuangApiRequestComponent yangGuangApiRequestComponent;
 
-    private final YangGuangApiOrderService yangGuangCrawlerOrderService;
+    private final YangGuangApiOrderService yangGuangApiOrderService;
 
     private final YangGuangApiProperties yangGuangApiProperties;
 
@@ -90,7 +90,7 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
             return handleFailedQuote(response, quoteVo);
         } else {
             // 商业险有重复投保提示时 设置商业险起保时间 重复递归报价 ps：商业险重复投保不会返回到errorMessage 只会返回到remarkBi 并且会显示报价成功
-            if (!response.getRemarkBi().equals("")) {
+            if (response.getRemarkBi() != null && !response.getRemarkBi().equals("")) {
                 String remarkBi = response.getRemarkBi();
                 Pattern pattern = Pattern.compile("终保日期:(\\d{12})");
                 Matcher matcher = pattern.matcher(remarkBi);
@@ -110,12 +110,12 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
     }
 
     private QuoteResultsVo handleFailedQuote(YangGuangAccuracyCalculateResponse response,QuoteVo quoteVo) {
-        yangGuangCrawlerOrderService.saveOrderInfo(quoteVo,response);
+        yangGuangApiOrderService.saveOrderInfo(quoteVo,response);
         return YangGuangApiQuoteResultsVoBuild.buildQuoteFailResultsVo(response);
     }
 
     private QuoteResultsVo handleSuccessfulQuote(YangGuangAccuracyCalculateResponse response, QuoteVo quoteVo) {
-        yangGuangCrawlerOrderService.saveOrderInfo(quoteVo,response);
+        yangGuangApiOrderService.saveOrderInfo(quoteVo,response);
         return YangGuangApiQuoteResultsVoBuild.buildQuoteResultsVo(quoteVo, response);
     }
 
@@ -143,7 +143,7 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
     @Override
     public UnderwritingResultsVo underwriting(UnderwritingVo underwritingVo) throws JsonProcessingException {
         OrderBase orderBase = underwritingVo.getOrder();
-        YangGuangApiOrder yangGuangApiOrder = yangGuangCrawlerOrderService.getById(orderBase.getOrdersNo());
+        YangGuangApiOrder yangGuangApiOrder = yangGuangApiOrderService.getById(orderBase.getOrdersNo());
         // 账号配置信息
         YangGuangConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(YangGuangConfigureParameters.class, orderBase
                 .getAttributionInformationVo()
@@ -214,7 +214,7 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
     public void uploadImage(InsuranceUploadImageVo insuranceUploadImageVo) {
         try {
             OrderBase orderBase = insuranceUploadImageVo.getOrder();
-            YangGuangApiOrder yangGuangApiOrder = yangGuangCrawlerOrderService.getById(orderBase.getOrdersNo());
+            YangGuangApiOrder yangGuangApiOrder = yangGuangApiOrderService.getById(orderBase.getOrdersNo());
             // 配置信息
             YangGuangConfigureParameters parameters = ConfigureParametersConversion.conversionEntity(YangGuangConfigureParameters.class, orderBase
                     .getAttributionInformationVo()

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/api/entity/request/RideAccidentQueryRequest.java

@@ -47,6 +47,10 @@ public class RideAccidentQueryRequest extends BaseRequest {
     @JsonProperty("isSocial")
     private String isSocial;
 
+    //产品方案 1379 机动车  1382新能源车
+    @JsonProperty("productPlan")
+    private String productPlan;
+
     public RideAccidentQueryRequest(ZmApiConfigureParameters zmApiConfigureParameters, CarInfoVo carInfoVo, CustomerInfoVo insOrdersCarUserInfo) {
         this.motorMainType = carInfoVo.getCarKindCode();//客车
         this.carUseType = carInfoVo.getVehicleUseCode();//家庭自用
@@ -55,6 +59,11 @@ public class RideAccidentQueryRequest extends BaseRequest {
         this.seats = Integer.parseInt(carInfoVo.getSeatCount());
         this.insuredIdentifyType = "01";
         this.identifyNumber = insOrdersCarUserInfo.getIdentifyNumber();
+        if (carInfoVo.getEnergyTypeCode().equals("0")) {
+            this.productPlan = "1379";
+        } else {
+            this.productPlan = "1382";
+        }
     }
     @Override
     public void setHead(BaseRequestHead head) {

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/api/entity/response/RideAccidentQueryResponse.java

@@ -53,6 +53,9 @@ public class RideAccidentQueryResponse extends BaseResponse {
 //        @ApiModelProperty("最大投保份数")
         private String maxQuantity;
 
+        @JsonProperty("matchProduct")
+        private String matchProduct;
+
         @JsonProperty("rideRiskCode")
 //        @ApiModelProperty("方案代码")
         private String rideRiskCode;