From b40887c9c3bf7cb7aa5624608ee5bfd18b021777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=99=93=E8=BE=B0?= <maxiaochen@shopex.cn>
Date: Thu, 23 Jul 2026 19:38:26 +0800
Subject: [PATCH] =?UTF-8?q?[TBID:SCRUM-7440]=20fix=EF=BC=9A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=82=AE=E7=BC=96=E5=BC=82=E5=B8=B8=E6=8B=BC=E6=8E=A5?=
 =?UTF-8?q?hash=E5=AF=BC=E8=87=B4=E7=9A=84=E5=AE=A2=E6=88=B7=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shop/matrix/meituan4bulkpurchasing/response/order.php  | 7 ++++++-
 app/erpapi/lib/shop/matrix/taobao/response/qianniu.php     | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/erpapi/lib/shop/matrix/meituan4bulkpurchasing/response/order.php b/app/erpapi/lib/shop/matrix/meituan4bulkpurchasing/response/order.php
index 2953701e..d1c027d0 100644
--- a/app/erpapi/lib/shop/matrix/meituan4bulkpurchasing/response/order.php
+++ b/app/erpapi/lib/shop/matrix/meituan4bulkpurchasing/response/order.php
@@ -38,10 +38,15 @@ class erpapi_shop_matrix_meituan4bulkpurchasing_response_order extends erpapi_sh
         $hashCode = kernel::single('ome_security_hash')->get_code();
         if ($this->_ordersdf['extend_field']['oaid']) {
             foreach ($this->_ordersdf['consignee'] as $key => $value) {
+                // 邮编和邮箱不是 OMS 隐私索引字段，不能拼接 oaid@hash。
+                if (in_array($key, ['email', 'zip', 'ship_zip'])) {
+                    continue;
+                }
+
                 if(strpos($value, '*') !== false) {
                     $this->_ordersdf['consignee'][$key] .= '>>' . $this->_ordersdf['extend_field']['oaid'] . $hashCode;
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/erpapi/lib/shop/matrix/taobao/response/qianniu.php b/app/erpapi/lib/shop/matrix/taobao/response/qianniu.php
index 2fa5e390..c259774b 100644
--- a/app/erpapi/lib/shop/matrix/taobao/response/qianniu.php
+++ b/app/erpapi/lib/shop/matrix/taobao/response/qianniu.php
@@ -50,6 +50,11 @@ class erpapi_shop_matrix_taobao_response_qianniu extends erpapi_shop_response_qi
                 // 加密字段处理
                 $hashCode = kernel::single('ome_security_hash')->get_code();
                 foreach ($this->_qnordersdf['modifiedAddress'] as $key => $value) {
+                    // postCode 是邮编，不属于 OMS 隐私索引字段。
+                    if ($key == 'postCode') {
+                        continue;
+                    }
+
                     if(strpos($value, '*') !== false) {
                         $this->_qnordersdf['modifiedAddress'][$key] .= '>>' . $this->_qnordersdf['oaid'] . $hashCode;
                     }