20
0

2 Коммиты 2cfa14e162 ... 73174ec830

Автор SHA1 Сообщение Дата
  天空之城 73174ec830 fix(contract): 移除额外平台自动盖章调用 3 дней назад
  天空之城 a5e5614e81 fix(contract): 修正正式 e签宝合同模板 ID 3 дней назад
3 измененных файлов с 9 добавлено и 39 удалено
  1. 4 4
      .env.produ
  2. 4 4
      .env.uat
  3. 1 31
      alien_contract/infrastructure/esign/contract_builder.py

+ 4 - 4
.env.produ

@@ -49,10 +49,10 @@ ESIGN_ORG_ID=418f407d75104d52a2f563ba2daecb98
 ESIGN_CALLBACK_URL=https://prod.ailien.shop/api/contract/esign/callback
 ESIGN_DEVELOPER_CALLBACK_URL=https://prod.ailien.shop/api/contract/esign/callback
 ESIGN_REDIRECT_URL=https://www.esign.cn/
-ESIGN_TEMPLATE_STORE_AGREEMENT=669f4ecc21094c5a9601b2bb9a627f3e
-ESIGN_TEMPLATE_LAWYER_AGREEMENT=b6428c23abac4e889c937f9ed0722481
-ESIGN_TEMPLATE_ALIPAY_AUTH=04bd38e8c928400190cc655c556e4405
-ESIGN_TEMPLATE_WECHAT_PAY_COMMITMENT=662fe139959f40fe9d2a7272392f2740
+ESIGN_TEMPLATE_STORE_AGREEMENT=6368ee563ce142be983a3a9c483a6342
+ESIGN_TEMPLATE_LAWYER_AGREEMENT=cf4f32023e1347eea3dba006ac27e816
+ESIGN_TEMPLATE_ALIPAY_AUTH=67a059eb6be1413d94bed6e2bce3e30f
+ESIGN_TEMPLATE_WECHAT_PAY_COMMITMENT=de67353a53f74402a6c9ae98f6d490ec
 ESIGN_TEMPLATE_FILE_STORE_AGREEMENT=U店在这-商户入驻协议
 ESIGN_TEMPLATE_FILE_LAWYER_AGREEMENT=U店在这-律所入驻协议
 ESIGN_TEMPLATE_FILE_ALIPAY_AUTH=U店在这-支付宝授权函

+ 4 - 4
.env.uat

@@ -40,10 +40,10 @@ ESIGN_ORG_ID=418f407d75104d52a2f563ba2daecb98
 ESIGN_CALLBACK_URL=https://uat.ailien.shop/api/contract/esign/callback
 ESIGN_DEVELOPER_CALLBACK_URL=https://uat.ailien.shop/api/contract/esign/callback
 ESIGN_REDIRECT_URL=https://www.esign.cn/
-ESIGN_TEMPLATE_STORE_AGREEMENT=669f4ecc21094c5a9601b2bb9a627f3e
-ESIGN_TEMPLATE_LAWYER_AGREEMENT=b6428c23abac4e889c937f9ed0722481
-ESIGN_TEMPLATE_ALIPAY_AUTH=04bd38e8c928400190cc655c556e4405
-ESIGN_TEMPLATE_WECHAT_PAY_COMMITMENT=662fe139959f40fe9d2a7272392f2740
+ESIGN_TEMPLATE_STORE_AGREEMENT=6368ee563ce142be983a3a9c483a6342
+ESIGN_TEMPLATE_LAWYER_AGREEMENT=cf4f32023e1347eea3dba006ac27e816
+ESIGN_TEMPLATE_ALIPAY_AUTH=67a059eb6be1413d94bed6e2bce3e30f
+ESIGN_TEMPLATE_WECHAT_PAY_COMMITMENT=de67353a53f74402a6c9ae98f6d490ec
 ESIGN_TEMPLATE_FILE_STORE_AGREEMENT=U店在这-商户入驻协议
 ESIGN_TEMPLATE_FILE_LAWYER_AGREEMENT=U店在这-律所入驻协议
 ESIGN_TEMPLATE_FILE_ALIPAY_AUTH=U店在这-支付宝授权函

+ 1 - 31
alien_contract/infrastructure/esign/contract_builder.py

@@ -4,7 +4,7 @@ import re
 import urllib.parse
 from typing import Any
 
-from alien_contract.infrastructure.esign.main import SIGN_POSITIONS, apply_platform_seal, fill_in_template, create_by_file
+from alien_contract.infrastructure.esign.main import fill_in_template, create_by_file
 from alien_contract.infrastructure.esign.esign_config import Config
 
 logger = logging.getLogger(__name__)
@@ -18,34 +18,6 @@ class ContractBuildError(Exception):
         self.raw = raw
 
 
-def _is_esign_success(resp: dict[str, Any]) -> bool:
-    code = resp.get("code")
-    return code in (0, "0") or resp.get("success") is True
-
-
-def _apply_platform_seal_if_required(contract_type: str, contract_name: str, sign_flow_id: str) -> None:
-    positions = SIGN_POSITIONS.get(contract_type, {})
-    if not positions.get("alien"):
-        return
-
-    seal_resp = apply_platform_seal(sign_flow_id)
-    try:
-        seal_json = json.loads(seal_resp)
-    except json.JSONDecodeError:
-        logger.error("apply_platform_seal non-json resp contract_type=%s: %s", contract_type, seal_resp)
-        raise ContractBuildError(
-            message=f"{contract_name}平台自动盖章失败:e签宝返回非 JSON",
-            raw={"contract_type": contract_type, "sign_flow_id": sign_flow_id, "resp": seal_resp},
-        )
-
-    if not isinstance(seal_json, dict) or not _is_esign_success(seal_json):
-        logger.error("apply_platform_seal failed contract_type=%s: %s", contract_type, seal_json)
-        raise ContractBuildError(
-            message=f"{contract_name}平台自动盖章失败",
-            raw={"contract_type": contract_type, "sign_flow_id": sign_flow_id, "resp": seal_json},
-        )
-
-
 def build_contract_items(
     configs: list[tuple[str, str, int]],
     template_name: str,
@@ -137,8 +109,6 @@ def build_contract_items(
                 raw={"contract_type": contract_type, "resp": sign_json},
             )
 
-        _apply_platform_seal_if_required(contract_type, contract_name, sign_id)
-
         items.append(
             {
                 "contract_type": contract_type,