添加泰康 queryOrderState

tenant/insurance/quotation-taikang/doc/部分页面JS代码.md

@@ -284,4 +284,54 @@ API_findRiskConfig:'/rest/init/findRiskConfig' //数电发票页面录入规则
 
   //	生产环境
 };
+```
+
+
+```js
+orderStatusFormatter(row, column)
+{
+    let orderStatus = row.orderStatus
+    let OrderDescribe = ''
+    if (orderStatus == '01') {
+        OrderDescribe = '待处理'
+    } else if (orderStatus == '02') {
+        OrderDescribe = '待核保'
+    } else if (orderStatus == '03') {
+        OrderDescribe = '待上传资料'
+    } else if (orderStatus == '04') {
+        OrderDescribe = '待修改'
+    } else if (orderStatus == '05') {
+        OrderDescribe = '拒保'
+    } else if (orderStatus == '06') {
+        OrderDescribe = '投保资料驳回'
+    } else if (orderStatus == '07') {
+        OrderDescribe = '投保资料待审核'
+    } else if (orderStatus == '08') {
+        OrderDescribe = '核保撤回'
+    } else if (orderStatus == '09') {
+        OrderDescribe = '用户撤回'
+    } else if (orderStatus == '10') {
+        OrderDescribe = '待支付'
+    }
+    return OrderDescribe
+}
+```
+
+```js
+completedOrderStatusFormatter(row, column)
+{
+    let orderStatus = row.orderStatue
+    let OrderDescribe = ''
+    if (orderStatus == 'E') {
+        OrderDescribe = '已完成'
+    } else if (orderStatus == 'F') {
+        OrderDescribe = '全单退保'
+    } else if (orderStatus == 'G') {
+        OrderDescribe = '商业退保'
+    } else if (orderStatus == 'H') {
+        OrderDescribe = '交强退保'
+    }
+    return OrderDescribe
+}
+,
 ```

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/InitQuotationResult.java

@@ -81,7 +81,7 @@ public class InitQuotationResult extends UnknownFieldEntity {
     /**
      * 订单信息
      */
-    private OrderInfoVoBZ orderInfoVoBZ;
+    private TKOrderInfoVoBZ orderInfoVoBZ;
 
     /**
      * 总保费 = 交强+商业+驾驶意外
@@ -158,11 +158,6 @@ public class InitQuotationResult extends UnknownFieldEntity {
         addChildUnknownField("orderInfoVoCI", orderInfoVoCI);
     }
 
-    @Getter
-    @Setter
-    public static class OrderInfoVoBZ {
-        // 无字段
-    }
 
     @Getter
     @Setter

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/api/TKEntranceFor000086Result.java

@@ -36,6 +36,13 @@ public class TKEntranceFor000086Result extends UnknownFieldEntity {
 
     /**
      * 订单状态
+     *
+     * 大概如下：
+     *
+     * A1：待处理
+     * D：待支付
+     * E：完成
+     * X：失效
      */
     private String orderStatus;
 
@@ -178,6 +185,31 @@ public class TKEntranceFor000086Result extends UnknownFieldEntity {
      */
     private String username;
 
+    /**
+     * 车税信息
+     */
+    //private TKCarTax carTax;
+
+    /**
+     * 需求编号
+     */
+    private String demandBZNo;
+
+    /**
+     * 订单信息对象
+     */
+    private TKOrderInfoVoBZ orderInfoVoBZ;
+
+    /**
+     * 保单提案号
+     */
+    private String jqProposalNo;
+
+    /**
+     * 无赔款优待系数
+     */
+    private BigDecimal noCompensationRate;
+
     @Override
     protected void addChildUnknownFields() {
         addChildUnknownField("car", car);
@@ -188,5 +220,7 @@ public class TKEntranceFor000086Result extends UnknownFieldEntity {
         addChildUnknownField("insurerInfoVo", insurerInfoVo);
         addChildUnknownField("invoiceInfo", invoiceInfo);
         addChildUnknownField("carOwnerVo", carOwnerVo);
+        //addChildUnknownField("carTax", carTax);
+        addChildUnknownField("orderInfoVoBZ", orderInfoVoBZ);
     }
 }

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/entity/TKCarTax.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.taikang.model.entity;
 
+import com.jzg.quotation.taikang.client.UnknownFieldEntity;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,11 +8,11 @@ import java.math.BigDecimal;
 
 @Setter
 @Getter
-public class TKCarTax {
+public class TKCarTax extends UnknownFieldEntity {
 
     /**
      * 是否代缴车船税
-     *
+     * <p>
      * 0：否
      * 1：是
      */
@@ -46,4 +47,124 @@ public class TKCarTax {
      * 逾期的税款金额
      */
     private BigDecimal taxOverdue;
+
+    /**
+     * 还款年份
+     */
+    private String repaymentYear;
+
+    /**
+     * 纳税状态名称
+     */
+    private String taxFlagName;
+
+    /**
+     * 当前应纳税信息对象
+     */
+    private CurrentTaxDue currentTaxDue;
+
+    /**
+     * 税务登记号
+     */
+    private String taxRegistryNumber;
+
+    /**
+     * 基准税费
+     */
+    private BigDecimal benchmarkTax;
+
+    @Override
+    protected void addChildUnknownFields() {
+        addChildUnknownField("currentTaxDue", currentTaxDue);
+    }
+
+    @Setter
+    @Getter
+    public static class CurrentTaxDue extends UnknownFieldEntity {
+
+        /**
+         * 税开始日期
+         */
+        private String taxStartDate;
+
+        /**
+         * 税结束日期
+         */
+        private String taxEndDate;
+
+        /**
+         * 已缴税费信息
+         */
+        private PaidTax paid;
+
+        /**
+         * 减免信息
+         */
+        private DeRate deRate;
+    }
+
+
+    @Setter
+    @Getter
+    public static class PaidTax extends UnknownFieldEntity {
+
+        /**
+         * 缴税地区代码
+         */
+        private String taxPaidAreaCode;
+
+        /**
+         * 税务部门代码
+         */
+        private String taxDepartmentCode;
+
+        /**
+         * 税务部门名称
+         */
+        private String taxDepartment;
+
+        /**
+         * 税票号码
+         */
+        private String taxDocumentNumber;
+
+    }
+
+    @Setter
+    @Getter
+    public static class DeRate extends UnknownFieldEntity {
+
+        /**
+         * 减免代码
+         */
+        private String deDuctiondueCode;
+
+        /**
+         * 减免比例
+         */
+        private BigDecimal deDuctiondueProportion;
+
+        /**
+         * 减免类型
+         */
+        private String deDuctiondueType;
+
+        /**
+         * 税务部门代码
+         */
+        private String taxDepartmentCode;
+
+        /**
+         * 减免税票号码
+         */
+        private String deDuctionDocumentNumber;
+
+        /**
+         * 税务部门名称
+         */
+        private String taxDepartment;
+
+    }
+
+
 }

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/model/entity/TKOrderInfoVoBZ.java

@@ -0,0 +1,77 @@
+package com.jzg.quotation.taikang.model.entity;
+
+import com.jzg.quotation.taikang.client.UnknownFieldEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+@Setter
+@Getter
+public class TKOrderInfoVoBZ extends UnknownFieldEntity {
+    /**
+     * 佣金金额（承保）
+     */
+    private String commissionAmountCI;
+
+    /**
+     * 驾意险优待系数
+     */
+    private String jqpeccancyAdjust;
+
+    /**
+     * 保单提案号
+     */
+    private String jqProposalNo;
+
+    /**
+     * 无赔款优待系数
+     */
+    private String noCompensationRate;
+
+
+    /**
+     * 保额
+     */
+    private String jqAmount;
+
+    /**
+     * 佣金费率（承保）
+     */
+    private String commissionRateCI;
+
+    /**
+     * 结束日期
+     */
+    private String endDateBZ;
+
+    /**
+     * 保费
+     */
+    private String jqPremium;
+
+    /**
+     * 开始日期
+     */
+    private String startDateBZ;
+
+    /**
+     * 保单号
+     */
+    private String jqPolicyNo;
+
+    /**
+     * 车船税信息对象
+     */
+    private TKCarTax carTax;
+
+    /**
+     * 折扣
+     */
+    private String disCount;
+
+    @Override
+    protected void addChildUnknownFields() {
+        addChildUnknownField("carTax", carTax);
+    }
+}

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/service/TKHttpAPIService.java

@@ -854,14 +854,14 @@ public class TKHttpAPIService {
     }
 
 
-    public TKEntranceFor000086Result entranceFor000086(String token, String tplatformId, String fromId, String orderId, String proposalNo) {
+    public TKEntranceFor000086Result entranceFor000086(String token, String tplatformId, String fromId, String orderId, String proposalNo, String fullProposalNo) {
         TKEntranceFor000086Param param = new TKEntranceFor000086Param();
         param.setChannelCode("OffWeb");
         param.setTplatformId(tplatformId);
         param.setFromId(fromId);
         param.setOrderID(orderId);
         param.setProposalNo(proposalNo);
-        param.setFullProposalNo(proposalNo);
+        param.setFullProposalNo(fullProposalNo);
         param.setInitFlag("3");
         param.setIsAgentFlag("1");
 

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/service/TKQuotationBaseServiceImpl.java

@@ -303,8 +303,9 @@ public class TKQuotationBaseServiceImpl implements QuotationBaseService {
 
         String orderId = "";
         String proposalNo = "";
+        String fullProposalNo = "";
 
-        TKEntranceFor000086Result tkEntranceFor000086Result = httpService.entranceFor000086(session.getToken(), session.getTplatformId(), session.getFromid(), orderId, proposalNo);
+        TKEntranceFor000086Result tkEntranceFor000086Result = httpService.entranceFor000086(session.getToken(), session.getTplatformId(), session.getFromid(), orderId, proposalNo, fullProposalNo);
 
         String orderStatus = tkEntranceFor000086Result.getOrderStatus();
 

tenant/insurance/quotation-taikang/src/test/java/com/jzg/quotation/taikang/service/TKHttpAPIServiceTest1.java

@@ -1239,10 +1239,13 @@ public class TKHttpAPIServiceTest1 {
 
         String tplatformId = "feda77e829d4dedbbd8b4e236bacfac5";
         String fromId = "67107";
-        String orderId = "WBPC202503071419220680000";
-        String proposalNo = "00671070808142500000004429";
-        TKEntranceFor000086Result tkEntranceFor000086Result = httpService.entranceFor000086(token, tplatformId, fromId, orderId, proposalNo);
+        String orderId = "WBPC202503261450434440000";
+        String fullProposalNo = "";
+        String proposalNo = "";
+        TKEntranceFor000086Result tkEntranceFor000086Result = httpService.entranceFor000086(token, tplatformId, fromId, orderId, proposalNo, fullProposalNo);
 
         assertNotNull(tkEntranceFor000086Result);
+
+        System.out.println("订单状态："+ tkEntranceFor000086Result.getOrderStatus());
     }
 }