Merge remote-tracking branch 'origin/develop' into develop

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/WebsitContractSignLogic.java

@@ -155,7 +155,7 @@ public class WebsitContractSignLogic {
             // 签约负责人签约跳
             this.managerSignMethod(websit, item, bean, returnUrl);
         }
-
+        record = websitContractSignRecordService.getById(id);
         if (!bean.isJump()) {
             if (websit.getFadadaWebsitRealStatus().equals(IsYesNoEnum.NO.getKey())) {
                 bean.setJump(true);
@@ -163,11 +163,11 @@ public class WebsitContractSignLogic {
             } else if (websit.getFadadaCustomerRealStatus().equals(IsYesNoEnum.NO.getKey())) {
                 bean.setJump(true);
                 bean.setUrl(websit.getFadadaCustomerAuthUrl());
-            } else if (companySign > 0) {
+            } else if (companySign > 0 && record.getStatus().equals(SignContractStatusEnum.WAIT_SIGN.getKey())) {
                 // 签约企业签约跳
                 bean.setJump(true);
                 bean.setUrl(item.getCompanySignUrl());
-            } else if (managerSign > 0) {
+            } else if (managerSign > 0 && record.getStatus().equals(SignContractStatusEnum.WAIT_SIGN.getKey())) {
                 // 签约负责人签约跳
                 bean.setJump(true);
                 bean.setUrl(item.getManagerSignUrl());