Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/entity/Response/SignatureResponse.java

@@ -26,8 +26,8 @@ public class SignatureResponse implements Serializable {
     /**
      * 二维码字符串
      */
-    @JsonProperty("qrCode")
-    private String qrCode;
+    @JsonProperty("qrRlCode")
+    private String qrRlCode;
     /**
      * 二维码链接
      */

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/api/service/Impl/GuoRenApiRequestImpl.java

@@ -216,7 +216,8 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
             if (jqStatus.equals("1") || jqStatus.equals("3")) {
                 underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
                 SignatureResponse signature = getSignature(guoRenApiOrder, url);
-                underwritingResultsVo.setPaymentLink(StringUtils.isNotEmpty(signature.getQrCode()) ? signature.getQrCode() : signature.getQrUrl());
+                logger.info("getSignature: {}", signature);
+                underwritingResultsVo.setPaymentLink(StringUtils.isNotEmpty(signature.getQrRlCode()) ? signature.getQrRlCode() : signature.getQrUrl());
             } else if (jqStatus.equals("2") || jqStatus.equals("0")) {
                 underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
                 underwritingResultsVo.setUnderwritingResult(message);
@@ -227,7 +228,7 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
             if (syStatus.equals("1") || syStatus.equals("3")) {
                 underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
                 SignatureResponse signature = getSignature(guoRenApiOrder, url);
-                underwritingResultsVo.setPaymentLink(StringUtils.isNotEmpty(signature.getQrCode()) ? signature.getQrCode() : signature.getQrUrl());
+                underwritingResultsVo.setPaymentLink(StringUtils.isNotEmpty(signature.getQrRlCode()) ? signature.getQrRlCode() : signature.getQrUrl());
 
             } else if (syStatus.equals("2") || syStatus.equals("0")) {
                 underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
@@ -243,11 +244,11 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
             } else if (jqStatus.equals("1") && syStatus.equals("1")) {
                 underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
                 SignatureResponse signature = getSignature(guoRenApiOrder, url);
-                underwritingResultsVo.setPaymentLink(signature.getQrCode());
+                underwritingResultsVo.setPaymentLink(StringUtils.isNotEmpty(signature.getQrRlCode()) ? signature.getQrRlCode() : signature.getQrUrl());
             } else if (jqStatus.equals("3") && syStatus.equals("3")) {
                 underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
                 SignatureResponse signature = getSignature(guoRenApiOrder, url);
-                underwritingResultsVo.setPaymentLink(signature.getQrCode());
+                underwritingResultsVo.setPaymentLink(StringUtils.isNotEmpty(signature.getQrRlCode()) ? signature.getQrRlCode() : signature.getQrUrl());
             }
         }
         return underwritingResultsVo;