Merge branch 'test'

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

@@ -737,7 +737,7 @@ public class ODR1008Request extends DaJiaBaseRequest {
         //功率
         vehicleInfoDTO.setVehicleNPower(Double.parseDouble(resultDTO.getPower()));
         //座位数
-        vehicleInfoDTO.setVehicleNSeatNum(resultDTO.getVehicleSeat());
+        vehicleInfoDTO.setVehicleNSeatNum(quoteInfoVo.getCarInfo().getSeatCount());
         //车辆种类
         if(Integer.parseInt(resultDTO.getVehicleSeat()) < 6){
             vehicleInfoDTO.setVehicleVhlTyp(CVhlTyp.T01.getCode().toString());

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

@@ -146,6 +146,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
         @NoArgsConstructor
         @Data
         public static class InsuredObjectDto implements Serializable {
+            private static final long serialVersionUID = 8289493908102574837L;
             //Y	保险采集和管理车信息
             @JSONField(name = "policyCar")
             private PolicyCarDto policyCar;
@@ -161,6 +162,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
             @NoArgsConstructor
             @Data
             public static class PolicyCarDto implements Serializable {
+                private static final long serialVersionUID = -435073301215297662L;
                 //CY	座位数
                 @JSONField(name = "approvedPassengersCapacity")
                 private int approvedPassengersCapacity;
@@ -286,7 +288,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
                 private String plateColorCode;
 
                 public PolicyCarDto(CarInfoVo carInfoVo, HuaTaiModelsQueryResponse.CarModelDto.FullCarDataDto fullCarDataDto) {
-                    this.approvedPassengersCapacity = fullCarDataDto.getApprovedPassengersCapacity();
+                    this.approvedPassengersCapacity = Integer.parseInt(carInfoVo.getSeatCount());
                     this.displacement = fullCarDataDto.getDisplacement();
                     this.plateNo = carInfoVo.getLicenseNo();
                     this.registerDate = carInfoVo.getRegisterDate() + " " + TimeConstants.START_TIME;
@@ -585,6 +587,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
         @NoArgsConstructor
         @Data
         public static class PlatFormMessageDto implements Serializable {
+            private static final long serialVersionUID = 6094816644827817884L;
             //CY	平台查询码
             @JSONField(name = "querySequenceNo")
             private String querySequenceNo;
@@ -606,6 +609,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
         @NoArgsConstructor
         @Data
         public static class TaxDto implements Serializable {
+            private static final long serialVersionUID = 5186435194104031157L;
             //Y	参见纳税类型代码
             @JSONField(name = "TaxConditionCode")
             private String taxConditionCode;
@@ -665,6 +669,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
         @NoArgsConstructor
         @Data
         public static class ChargingPostDto implements Serializable {
+            private static final long serialVersionUID = -6324590056449630117L;
             //Y	充电桩序号
             @JSONField(name = "itemNo")
             private String itemNo;

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

@@ -43,7 +43,9 @@ public class HuaTaiModelsQueryResponse extends HuaTaiBaseResponse {
 
         @NoArgsConstructor
         @Data
-        public static class FullCarDataDto implements Serializable ,CarModelsFilter {
+        public static class FullCarDataDto implements Serializable, CarModelsFilter {
+
+            private static final long serialVersionUID = 6567055962059530319L;
 
             //Y	核定载质量（单位：吨）
             @JsonProperty("approvedLoad")

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

@@ -281,6 +281,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 isCdy = true;
             }
         }
+        orderQueryVo.setEndDate(orderQueryVo.getEndDatePlusOneDay());
 
         Page<InsOrders> orderVoPage = baseMapper.queryPageOrder(page,orderQueryVo,isTeamLeader,isCdy);
         Long total = baseMapper.queryPageOrderCount(orderQueryVo, isTeamLeader, isCdy);