Merge remote-tracking branch 'origin/master'

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

@@ -28,6 +28,11 @@ public class SignatureResponse implements Serializable {
      */
     @JsonProperty("qrCode")
     private String qrCode;
+    /**
+     * 二维码链接
+     */
+    @JsonProperty("qrUrl")
+    private String qrUrl;
     /**
      * 返回状态吗
      */

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

@@ -216,7 +216,7 @@ public class GuoRenApiRequestImpl implements GuoRenApiRequest {
             if (jqStatus.equals("1") || jqStatus.equals("3")) {
                 underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.PAY_PENDING);
                 SignatureResponse signature = getSignature(guoRenApiOrder, url);
-                underwritingResultsVo.setPaymentLink(signature.getQrCode());
+                underwritingResultsVo.setPaymentLink(StringUtils.isNotEmpty(signature.getQrCode()) ? signature.getQrCode() : signature.getQrUrl());
             } else if (jqStatus.equals("2") || jqStatus.equals("0")) {
                 underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);
                 underwritingResultsVo.setUnderwritingResult(message);
@@ -227,7 +227,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(signature.getQrCode());
+                underwritingResultsVo.setPaymentLink(StringUtils.isNotEmpty(signature.getQrCode()) ? signature.getQrCode() : signature.getQrUrl());
 
             } else if (syStatus.equals("2") || syStatus.equals("0")) {
                 underwritingResultsVo.setUnderwritingStatus(InsOrderStatusEnum.AUDIT_FAIL);