Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -98,7 +98,7 @@ public class InsOrdersController extends BaseController {
     @PostMapping("/queryPageOrder")
     @ApiOperation(value = "[1]分页查询订单接口")
     public HttpResult<BasePageResult<InsOrders>> queryPageOrder(@RequestBody @Valid OrderQueryVo orderQueryVo) {
-        BasePageResult<InsOrders> quoteResult = this.insOrdersService.queryPageOrder(orderQueryVo);
+        BasePageResult<InsOrders> quoteResult = this.insOrdersService.newQueryPageOrder(orderQueryVo);
         return HttpResult.ok("success", quoteResult);
     }
 

src/main/java/com/ydtech/modules/order/entity/api/dajia/constants/CPayTaxType.java

@@ -19,4 +19,12 @@ public enum CPayTaxType {
 
     private final String desc;
 
+    public static CPayTaxType getByCode(String code) {
+        for (CPayTaxType value : CPayTaxType.values()) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return null;
+    }
 }

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/DaJiaOrderServiceImpl.java

@@ -20,6 +20,7 @@ import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.TaxArrears;
 import com.ydtech.modules.order.entity.api.dajia.DaJiaConfigureParameters;
 import com.ydtech.modules.order.entity.api.dajia.constants.CCvrgNo;
+import com.ydtech.modules.order.entity.api.dajia.constants.CPayTaxType;
 import com.ydtech.modules.order.entity.api.dajia.constants.CProdNo;
 import com.ydtech.modules.order.entity.api.dajia.constants.Message;
 import com.ydtech.modules.order.entity.api.dajia.request.*;
@@ -343,7 +344,6 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
                 return quotation(orderNo, kindInfoVos, riskInfoVos, quoteInfoVo, odr1016Response,
                         insAccidentalDrivingDajia, insAccidentalDrivingSubDajias, daJiaConfigureParameters, isEnergy);
             }
-
         }
         return odr1009Response;
     }
@@ -515,7 +515,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             syPremium = Double.parseDouble(odr1009Response.getResult().getBasePart().getSyPremium().toString());
         }
         if (!Objects.isNull(odr1009Response.getResult().getVehicleTaxation())) {
-            sumPayTax = Double.parseDouble(odr1009Response.getResult().getVehicleTaxation().getTaxTotalAmount());
+            sumPayTax = Double.parseDouble(odr1009Response.getResult().getVehicleTaxation().getTaxAggTax());
         }
         quoteRespVo.setJqPremium(jqPremium);
         quoteRespVo.setSyPremium(syPremium);

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

@@ -294,6 +294,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);

src/main/java/com/ydtech/modules/protocol/service/impl/PtlAgreementServiceImpl.java

@@ -138,7 +138,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                 // 合作公司
                 .in(!StringUtils.isEmpty(ptlAgreementPageVo.getPartnerCompaniesId()) && !lowerId.isEmpty(), PtlAgreement::getPartnerCompaniesId, lowerId)
                 // 录入时间
-                .between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate()), PtlAgreement::getCreateTime, ptlAgreementPageVo.getStartDate(), ptlAgreementPageVo.getEndDate());
+                .between(!ObjectUtils.isEmpty(ptlAgreementPageVo.getStartDate()) && !ObjectUtils.isEmpty(ptlAgreementPageVo.getEndDate()), PtlAgreement::getCreateTime, ptlAgreementPageVo.getStartDate(), ptlAgreementPageVo.getEndDate());
         Page<PtlAgreement> ptlAgreementPage = new Page<>(pageNum, pageSize);
         Page<PtlAgreement> agreementPage = page(ptlAgreementPage, wrapper);
         PageResult<PtlAgreement> ptlAgreementPageResult = new PageResult<>(pageNum, pageSize, (int) agreementPage.getTotal(), agreementPage.getRecords());

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -252,11 +252,14 @@
             io.orderno
             from
             ins_orders io
-            left JOIN
-            ins_area_company iac on iac.orderno = io.orderno
+                <!--如果存在 公司查询则进行连表 -->
+            <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
+                left JOIN
+                ins_area_company iac on iac.orderno = io.orderno
+            </if>
             <where>
                 <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
-                    and io.orderno = #{orderNo}
+                    and io.orderno = #{orderQueryVo.orderNo}
                 </if>
                 <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != '' and isTeamLeader">
                     and io.deptid like "${orderQueryVo.deptId}%"
@@ -277,7 +280,7 @@
                     and io.createtime between #{orderQueryVo.startDate} AND #{orderQueryVo.endDate}
                 </if>
                 <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
-                    and io.company_id = #{orderQueryVo.companyId}
+                    and iac.company_id = #{orderQueryVo.companyId}
                 </if>
                 <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
                     and io.operatorid = #{orderQueryVo.userId}
@@ -286,20 +289,23 @@
                     and io.userid = #{orderQueryVo.userId}
                 </if>
             </where>
-            group by orderno
-        )s
+            group by io.orderno
+        ) as s
     </select>
 
-    <select id="queryPageOrder" resultType="com.ydtech.modules.order.entity.InsOrders">
+    <select id="queryPageOrder" resultMap="BaseResultMap">
         select
             io.*
         from
             ins_orders io
-        left JOIN
-                ins_area_company iac on iac.orderno = io.orderno
+        <!--如果存在 公司查询则进行连表 -->
+        <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
+            left JOIN
+            ins_area_company iac on iac.orderno = io.orderno
+        </if>
         <where>
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
-                and io.orderno = #{orderNo}
+                and io.orderno = #{orderQueryVo.orderNo}
             </if>
             <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != '' and isTeamLeader">
                 and io.deptid like "${orderQueryVo.deptId}%"
@@ -320,7 +326,7 @@
                 and io.createtime between #{orderQueryVo.startDate} AND #{orderQueryVo.endDate}
             </if>
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
-                and io.company_id = #{orderQueryVo.companyId}
+                and iac.company_id = #{orderQueryVo.companyId}
             </if>
             <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
                 and io.operatorid = #{orderQueryVo.userId}