Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/build/GuoRenCrawlerQuoteResultsVoBuild.java

@@ -57,7 +57,7 @@ public final class GuoRenCrawlerQuoteResultsVoBuild {
         quoteResultsVo.getCosts().setBiPremium(biPremium); // 注意这里CI和BI保费相同
         quoteResultsVo.getCosts().setNiPremium(bcPremium);
         quoteResultsVo.getCosts().setVvTax(vvTax);
-        String sumPremium = String.valueOf(Integer.parseInt(biPremium) + Double.parseDouble(ciPremium) + Integer.parseInt(bcPremium) + Double.parseDouble(vvTax));
+        String sumPremium = String.valueOf(Double.parseDouble(biPremium) + Double.parseDouble(ciPremium) + Double.parseDouble(bcPremium) + Double.parseDouble(vvTax));
         quoteResultsVo.getCosts().setSumPremium(sumPremium);
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
 

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/build/ZiJinCrawlerUnderwritingResultsVoBuild.java

@@ -17,10 +17,12 @@ import org.jetbrains.annotations.NotNull;
 public class ZiJinCrawlerUnderwritingResultsVoBuild {
 
     @NotNull
-    public static UnderwritingResultsVo buildUnderwritingResultsVo(ZiJinCrawlerUnderwritingResponse ziJinCrawlerUnderwritingResponse) {
+    public static UnderwritingResultsVo buildUnderwritingResultsVo(ZiJinCrawlerUnderwritingResponse ziJinCrawlerUnderwritingResponse, String ordersNo) {
         UnderwritingResultsVo underwritingResultsVo = new UnderwritingResultsVo();
+        underwritingResultsVo.setOrdersNo(ordersNo);
         // 核保成功
         if (ResponseCode.R_0000.getCode().equals(ziJinCrawlerUnderwritingResponse.getRtnCode())) {
+            underwritingResultsVo.setCompanyOrderNo(ziJinCrawlerUnderwritingResponse.getData().getOrderNo());
             underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
             underwritingResultsVo.setJqApplyNo(ziJinCrawlerUnderwritingResponse.getData().getResultObj().getProposalNoCI());
             underwritingResultsVo.setSyApplyNo(ziJinCrawlerUnderwritingResponse.getData().getResultObj().getProposalNo());

tenant/insurance/quotation-zijin/src/main/java/com/jzg/quotation/zijin/crawler/service/impl/ZiJinCrawlerRequestImpl.java

@@ -206,8 +206,7 @@ public class ZiJinCrawlerRequestImpl implements ZiJinCrawlerRequest {
             e.printStackTrace();
             throw new RuntimeException(e);
         }
-
-        return ZiJinCrawlerUnderwritingResultsVoBuild.buildUnderwritingResultsVo(ziJinCrawlerUnderwritingResponse);
+        return ZiJinCrawlerUnderwritingResultsVoBuild.buildUnderwritingResultsVo(ziJinCrawlerUnderwritingResponse, underwritingVo.getOrder().getOrdersNo());
     }
 
 

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -2105,10 +2105,10 @@
                 AND ipi.company_id = #{query.companyId}
             </if>
             <if test="query.contactPersonPhone != null and query.contactPersonPhone != ''">
-                AND ipii.contact_person_phone LIKE CONCAT('%', #{query.contactPersonPhone}, '%')
+                AND io.docking_person_phone LIKE CONCAT('%', #{query.contactPersonPhone}, '%')
             </if>
             <if test="query.contactPerson != null and query.contactPerson != ''">
-                AND ipii.contact_person LIKE CONCAT('%', #{query.contactPerson}, '%')
+                AND io.docking_person LIKE CONCAT('%', #{query.contactPerson}, '%')
             </if>
             -- 跟单订单创建时间范围
             <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">