|
|
@@ -291,6 +291,8 @@ public class FDDNotifyLogic {
|
|
|
String resultCode = params.get("result_code");
|
|
|
String msgDigest = params.get("msg_digest");
|
|
|
String timestamp = params.get("timestamp");
|
|
|
+// String viewpdfUrl = params.get("viewpdf_url");
|
|
|
+// String downloadUrl = params.get("download_url");
|
|
|
|
|
|
// 验签
|
|
|
String newMsgDigest = Auth4FDDUtil.getMsgDigest(transactionId, timestamp);
|
|
|
@@ -316,7 +318,7 @@ public class FDDNotifyLogic {
|
|
|
try {
|
|
|
AdminWebsit websit = adminWebsitService.getById(record.getWebsitId());
|
|
|
|
|
|
- if (!record.getStatus().equals(SignContractStatusEnum.WAIT.getKey())) {
|
|
|
+ if (!record.getStatus().equals(SignContractStatusEnum.WAIT_SIGN.getKey())) {
|
|
|
log.info("签约流程完结: " + websit.getWebsitId() + websit.getName());
|
|
|
return;
|
|
|
}
|
|
|
@@ -393,7 +395,7 @@ public class FDDNotifyLogic {
|
|
|
if (managerSign > 0) {
|
|
|
boolean sign = false;
|
|
|
for (WebsitContractSignItem file : websitFiles) {
|
|
|
- if (file.getNeedManagerSign().equals(IsYesNoEnum.YES.getKey())) {
|
|
|
+ if (file.getNeedManagerSign().equals(IsYesNoEnum.YES.getKey()) && StringUtils.isNotBlank(file.getManagerTransactionId())) {
|
|
|
JSONObject object = Auth4FDDUtil.querySignStatus(file.getFadadaContractId(), websit.getFadadaCustomerId(), file.getManagerTransactionId());
|
|
|
Integer code = object.get("code", Integer.class);
|
|
|
String msg = object.get("msg", String.class);
|
