Merge branch 'test' into test-xq2

src/main/java/com/ydtech/modules/ins/model/vo/QuoteRespVo.java

@@ -135,6 +135,12 @@ public class QuoteRespVo {
     @ApiModelProperty("阳光 交商含增值服务合并经营成本率")
     private String mergeCostRate;
 
+    @ApiModelProperty("红黄蓝车系（仅电车返回有值）(阳光用)")
+    private String seriesTypeActualName;
+
+    @ApiModelProperty("向阳花标识（阳光用）")
+    private String xyhGrade;
+
     @ApiModelProperty("核心返回车型")
     private CoreModelsVo coreModels;
 

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

@@ -595,6 +595,18 @@ public class InsAreaCompany implements Serializable {
     @TableField(value = "docking_person")
     private String dockingPerson;
 
+    /**
+     * 红黄蓝车系（仅电车返回有值） （阳光使用）
+     */
+    @TableField(value = "series_type_actual_name")
+    private String seriesTypeActualName;
+
+    /**
+     * 向阳花标识 （阳光使用）
+     */
+    @TableField(value = "xyh_grade")
+    private String xyhGrade;
+
     //入口总金额
     @TableField(exist = false)
     private BigDecimal entranceAllFee;

src/main/java/com/ydtech/modules/order/entity/api/yangguang/response/YangGuangAccuracyCalculateResponse.java

@@ -227,6 +227,18 @@ public class YangGuangAccuracyCalculateResponse extends YangGuangBaseResponse{
     @JSONField(name = "BiImmediateFlag")
     private String BiImmediateFlag;
 
+    /**
+     *  红黄蓝车系（仅电车返回有值）
+     */
+    @JSONField(name = "SeriesTypeActualName")
+    private String SeriesTypeActualName;
+
+    /**
+     *  向阳花标识返回
+     */
+    @JSONField(name = "XYHGrade")
+    private String XYHGrade;
+
     /**
      *  车辆信息
      */

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

@@ -913,6 +913,10 @@ public class YangGuangOrderApiServiceImpl implements YangGuangOrderApiService {
             quoteRespVo.setSyLossRation(Double.parseDouble(discount.getFinalmarkingnoBi() != null ? discount.getFinalmarkingnoBi() : "0.00"));
             quoteRespVo.setMergeCostRate(yangGuangAccuracyCalculateResponse.getVascostmarginbc() != null ?yangGuangAccuracyCalculateResponse.getVascostmarginbc() : "0.00");
         }
+        // 红黄蓝车系
+        quoteRespVo.setSeriesTypeActualName(yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() != null ? yangGuangAccuracyCalculateResponse.getSeriesTypeActualName() : "");
+        // 向阳花标识
+        quoteRespVo.setXyhGrade(yangGuangAccuracyCalculateResponse.getXYHGrade() != null ? "1" : "0");
 
         List<QuoteKindRespVo> kindList1 = new ArrayList<>();
         List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
@@ -993,6 +997,8 @@ public class YangGuangOrderApiServiceImpl implements YangGuangOrderApiService {
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.QUOTE_ING.getCode());
         insAreaCompany.setInsOrderNo(yangGuangAccuracyCalculateResponse.getInfotransNo());
         insAreaCompany.setMergeCostRate(quoteRespVo.getMergeCostRate());
+        insAreaCompany.setSeriesTypeActualName(quoteRespVo.getSeriesTypeActualName());
+        insAreaCompany.setXyhGrade(quoteRespVo.getXyhGrade());
         InsOrders insOrders = insOrdersService.getById(orderId);
         //车船税
         if (!insOrders.getProductid().equals("034001") && !insOrders.getProductid().equals("034002")) {