修改报价

commons/src/main/java/com/jzg/commons/entity/dto/InsOrdersParam.java

@@ -35,7 +35,9 @@ public class InsOrdersParam extends PageRequest {
     @Schema(description = "业务员归属")
     private String salesmanCompany;
 
-    @Schema(description = "录单时间")
-    private List<String> recordingTime;
+    @Schema(description = "录单时间开始")
+    private String startDate;
 
+    @Schema(description = "录单时间结束")
+    private String endDate;
 }

commons/src/main/java/com/jzg/commons/entity/orders/vo/OrderListVo.java

@@ -54,4 +54,13 @@ public class OrderListVo {
 
     //商业险起保时间
     private LocalDateTime biStartDate;
+
+    //车架号
+    private String vinNo;
+
+    // 报价时间
+    private LocalDateTime createTime;
+
+    //总保费
+    private String sumPremium;
 }

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/build/GuoRenApiQuoteResultsVoBuild.java

@@ -28,6 +28,7 @@ public class GuoRenApiQuoteResultsVoBuild {
         // 商业险险种信息
         List<KindInfoVo> kindInfoVo = buildKindInfoVo(quoteVo.getKindInfoVo(), premiumResponse.getData().getItemVOList());
         quoteResultsVo.setKindInfoVo(kindInfoVo);
+        quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
 
         // 交强保费 车船税 商业保费
         buildPremium(quoteResultsVo, premiumResponse);
@@ -103,15 +104,7 @@ public class GuoRenApiQuoteResultsVoBuild {
         QuoteResultsVo quoteResultsVo = new QuoteResultsVo();
         // 报价失败提示
         quoteResultsVo.setErrorMessage(response.getResultMsg());
-        quoteResultsVo.setQuoteStatus(InsOrderStatusEnum.QUOTE_FAIL.getDesc());
-        return quoteResultsVo;
-    }
-
-    public static QuoteResultsVo buildQuoteSuccessResultsVo(PremiumResponse response) {
-        QuoteResultsVo quoteResultsVo = new QuoteResultsVo();
-        // 报价失败提示
-        quoteResultsVo.setErrorMessage(response.getResultMsg());
-        quoteResultsVo.setQuoteStatus(InsOrderStatusEnum.QUOTE_FAIL.getDesc());
+        quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.QUOTE_FAIL);
         return quoteResultsVo;
     }
 

tenant/insurance/quotation-summary/src/main/resources/application.yaml

@@ -90,7 +90,7 @@ qrcode:
 yc:
   api:
     payCallBack: https://sxzgkj.baoxianzhanggui.com/web-api/api/yongCheng/callBack
-    url: http://39.98.214.159/yongcheng/
+    url: https://test.baoxianzhanggui.com/yongcheng/
 
 #阳光财险api
 yangguang:
@@ -118,18 +118,32 @@ dajia:
     encryptKey: "By92YPLvG89XyFqv"
 
 #国任财险api
+#guoren:
+#  api:
+#    baseUrl: https://rbt.guorenpcic.com/api/grchannel-interface/httpCurrency/httpJsonCommonEntrance
+#    uploadUrl: https://rbt.guorenpcic.com/api/grecar/photo/upload
+#    redirectUrl: https://sxzgkj.baoxianzhanggui.com/web-api/api/guoRen/callBack
+#    policyUrl: https://rbt.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyForGrecar?certiNo=
+#    policyFlagUrl: https://rbt.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyFlagForGrecar?certiNo=
+#    serveCode: GR0002
+#    channelCode: TQDL
+#    interfaceUserCode: TQDL
+#    interfacePwd: $2a$04$r4neihDJh420OyWEji5w5OMbiyHqYEZHJGLZP0FHFEjXmr7nVW7te
+#    iftest: N
+
+#国任财险测试api
 guoren:
   api:
-    baseUrl: https://rbt.guorenpcic.com/api/grchannel-interface/httpCurrency/httpJsonCommonEntrance
-    uploadUrl: https://rbt.guorenpcic.com/api/grecar/photo/upload
-    redirectUrl: https://sxzgkj.baoxianzhanggui.com/web-api/api/guoRen/callBack
-    policyUrl: https://rbt.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyForGrecar?certiNo=
-    policyFlagUrl: https://rbt.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyFlagForGrecar?certiNo=
+    baseUrl: https://devyun.guorenpcic.com/api/grchannel-interface/httpCurrency/httpJsonCommonEntrance
+    uploadUrl: https://devyun.guorenpcic.com/api/grecar/photo/upload
+    redirectUrl: http://39.98.239.48/web-api/api/guoRen/callBack
+    policyUrl: https://devyun.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyForGrecar?certiNo=
+    policyFlagUrl: https://devyun.guorenpcic.com/api/grsavecarcore/savecarcore/getElePolicyFlagForGrecar?certiNo=
     serveCode: GR0002
-    channelCode: TQDL
-    interfaceUserCode: TQDL
-    interfacePwd: $2a$04$r4neihDJh420OyWEji5w5OMbiyHqYEZHJGLZP0FHFEjXmr7nVW7te
-    iftest: N
+    channelCode: jindouyun
+    interfaceUserCode: guoren_tp_jdy
+    interfacePwd: Q31gIrhZgQc=
+    iftest: Y
 
 # 华泰
 huatai:

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -442,10 +442,12 @@
             io.id as order_no,
             io.company_id,
             io.company_name,
-            io.product_id as product_code,
-            io.product_name,
+            io.product_id as productCode,
+            io.product_name as productName,
             io.order_status,
+            io.create_time,
             ioci.license_no,
+            ioci.vin_no,
             owner_u.name as owner_name,
             owner_u.mobile as owner_mobile,
             policy_u.name as policy_name,
@@ -453,7 +455,8 @@
             insur_u.name as insur_name,
             insur_u.mobile as insur_mobile,
             iorci.start_date as ci_start_date,
-            iorbi.start_date as bi_start_date
+            iorbi.start_date as bi_start_date,
+            iorco.sum_premium as sumPremium
         FROM
             ins_orders io
                 LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id
@@ -467,6 +470,8 @@
             ins_orders_risk iorci on iorci.order_no = io.id and iorci.risk_code = '0507'
                 left join
             ins_orders_risk iorbi on iorbi.order_no = io.id and iorbi.risk_code = '0510'
+                LEFT JOIN
+            ins_orders_costs iorco on iorco.order_no = io.id
         where
             1=1
         <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
@@ -481,6 +486,9 @@
         <if test="insOrdersParam.salesman!= null">
             AND io.real_quote_user_id = #{insOrdersParam.salesman}
         </if>
+        <if test="insOrdersParam.startDate != null and insOrdersParam.startDate != ''and insOrdersParam.endDate != null and insOrdersParam.endDate != ''">
+            AND io.create_time BETWEEN #{insOrdersParam.startDate} and #{insOrdersParam.endDate}
+        </if>
         order by io.create_time desc
     </select>
 

tenant/insurance/quotation-yongcheng/src/main/java/com/jzg/quotation/yongcheng/api/components/YcRequestApiComponents.java

@@ -5,11 +5,14 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.jzg.commons.exception.SystemException;
+import com.jzg.quotation.commons.constant.enums.base.InsuranceEnum;
+import com.jzg.quotation.commons.utils.InsuranceLog;
 import com.jzg.quotation.yongcheng.api.constants.RequestUrl;
 import com.jzg.quotation.yongcheng.api.entity.YcBuildData;
 import com.jzg.quotation.yongcheng.api.entity.request.*;
 import com.jzg.quotation.yongcheng.api.entity.response.*;
 import com.jzg.quotation.yongcheng.api.properties.YcConfigurationProperties;
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
@@ -96,14 +99,16 @@ public class YcRequestApiComponents {
                 gainXmlMapper().writeValueAsString(q) +
                 "</soapenv:Body>" +
                 "</soapenv:Envelope>";
-
+        InsuranceLog.infoLog(InsuranceEnum.AICS.getPinyin(), "\n\t---------> URl: {} \n---------> 保险公司:{} {}\n---------> 请求参数:{}", url,
+                InsuranceEnum.AICS.getName(), requestUrl.getDesc(), xmlString);
         // 发送请求
         String responseStringMsg = webClient.post()
                 .bodyValue(xmlString)
                 .retrieve()
                 .bodyToMono(String.class)
                 .block(); // block() 会阻塞获取响应，若是异步环境可使用 Mono 处理
-
+        String response = StringEscapeUtils.unescapeXml(responseStringMsg);
+        InsuranceLog.infoLog(InsuranceEnum.AICS.getPinyin(), "\n\n---------> 响应参数:{}", response);
         // 解析响应
         String cleanStr = YcBuildData.cleanResponseStr(responseStringMsg);
         if (!cleanStr.contains("<")) {