Merge branch 'master' into test

src/main/java/com/ydtech/modules/ins/model/guoren/InsuranceSlipReq.java

@@ -29,11 +29,10 @@ public class InsuranceSlipReq {
 
     @JsonProperty(value = "biPrptenages")
     @JSONField(name = "biPrptenages")
-    private List<?> biPrptenages;
-
+    private List<PremiumResp.DataDTO.BiPrptenagesDTO> biPrptenages;
     @JsonProperty(value = "ciPrptenages")
     @JSONField(name = "ciPrptenages")
-    private List<CiPrptenagesDTO> ciPrptenages;
+    private List<PremiumResp.DataDTO.CiPrptenagesDTO> ciPrptenages;
 
     @JsonProperty(value = "order")
     @JSONField(name = "order")
@@ -42,7 +41,7 @@ public class InsuranceSlipReq {
      * 构造请求参数
      */
     @JsonIgnore
-    public static InsuranceSlipReq buildParam(BaseQuoteInfoVo yaQuoteInfoVo, String carPriceNum, String orderCode) {
+    public static InsuranceSlipReq buildParam(BaseQuoteInfoVo yaQuoteInfoVo, String carPriceNum, String orderCode, PremiumResp.DataDTO premiumResult) {
         //投保人
         CustomerInfoVo policyHolderInfo = yaQuoteInfoVo.getPolicyHolderInfo();
         //被保人
@@ -87,8 +86,8 @@ public class InsuranceSlipReq {
 
         req.setOrder(orderCode);
         req.setPrpTinsured(prpTinsured);
-        req.setBiPrptenages(null);
-        req.setCiPrptenages(null);
+        req.setBiPrptenages(premiumResult.getBiPrptenages());
+        req.setCiPrptenages(premiumResult.getCiPrptenages());
         return req;
 
     }
@@ -164,26 +163,4 @@ public class InsuranceSlipReq {
         private String insuredIDValidDate;
     }
 
-    @NoArgsConstructor
-    @Data
-    public static class CiPrptenagesDTO {
-        @JsonProperty(value = "serialNo")
-        @JSONField(name = "serialNo")
-        private Integer serialNo;
-        @JsonProperty(value = "clauseCode")
-        @JSONField(name = "clauseCode")
-        private String clauseCode;
-        @JsonProperty(value = "clauses")
-        @JSONField(name = "clauses")
-        private String clauses;
-        @JsonProperty(value = "clausesContext")
-        @JSONField(name = "clausesContext")
-        private String clausesContext;
-        @JsonProperty(value = "flag")
-        @JSONField(name = "flag")
-        private String flag;
-        @JsonProperty(value = "select")
-        @JSONField(name = "select")
-        private Boolean select;
-    }
 }

src/main/java/com/ydtech/modules/order/components/gouren/GuorenRequestApiComponent.java

@@ -99,9 +99,9 @@ public class GuorenRequestApiComponent {
     /**
      * 投保单保存
      */
-    public InsuranceSlipResp insuranceSlip(BaseQuoteInfoVo yaQuoteInfoVo, String carPriceNum, String orderCode) {
+    public InsuranceSlipResp insuranceSlip(BaseQuoteInfoVo yaQuoteInfoVo, String carPriceNum, String orderCode, PremiumResp.DataDTO premiumResult) {
         //构造请求参数
-        InsuranceSlipReq req = InsuranceSlipReq.buildParam(yaQuoteInfoVo, carPriceNum, orderCode);
+        InsuranceSlipReq req = InsuranceSlipReq.buildParam(yaQuoteInfoVo, carPriceNum, orderCode, premiumResult);
         return request(req, PlatformInterfaceCode.API_IIRBT00006, InsuranceSlipResp.class);
     }
 

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

@@ -229,10 +229,9 @@ public class GuorenOrderApiServiceImpl implements GuorenOrderApiService {
                 ptlAgreementAttributionService.getById(quoteVo.getAgreementId());
 
         InsAreaCompany iac = responseOrder(order, quoteRespVo, quoteVo, ptlAgreementAttribution);
-
         //  6、 投保单保存
         InsuranceSlipResp insuranceSlip = guorenRequestApiComponent.insuranceSlip(yaQuoteInfoVo,
-                carPriceResult.getInputvo(), orderCode);
+                carPriceResult.getInputvo(), orderCode, premiumResult);
         if (insuranceSlip.getResultCode() == 1) {
             return HttpResult.error(insuranceSlip.getResultMsg());
         }