1. 【新增】售后单售后原因类型支持搜索

2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题

app/erpapi/lib/shop/matrix/tmall/request/maochao/aftersale.php

@@ -20,6 +20,29 @@
  */
 class erpapi_shop_matrix_tmall_request_maochao_aftersale extends erpapi_shop_request_aftersale {
 
+    public function returnGoodsSign($sdf){
+        $title = '售后签收货品['.$sdf['return_bn'].']';
+        
+        // 获取 extend_field 并解析 supplierId
+        $specialObj = app::get('ome')->model('return_product_tmall');
+        $ras = $specialObj->db_dump(array('return_id'=>$sdf['return_id']), 'extend_field');
+        $extend_field = $ras ? json_decode($ras['extend_field'], 1) : array();
+        
+        // 获取 reship 表的入库时间
+        $reship = app::get('ome')->model('reship')->db_dump(['return_id'=>$sdf['return_id']], 't_end');
+        
+        // 组装接口参数
+        $params = array(
+            // 逆向物流单号
+            'lg_order_code' => !empty($sdf['return_bn']) ? $sdf['return_bn'] : '',
+            // 供应商id
+            'supplier_id' => !empty($extend_field['supplierId']) ? $extend_field['supplierId'] : '',
+            // 入库时间
+            'order_confirm_time' => !empty($reship['t_end']) ? date('Y-m-d H:i:s', $reship['t_end']) : '',
+        );
+        
+        $this->__caller->call(SHOP_SUPPLIER_RETURN_GOOD_INSTORAGE_RESULT, $params, array(), $title, 10, $sdf['return_bn']);
+    }
     /**
      * 卖家确认收货
      * @param $data

app/erpapi/lib/shop/matrix/tmall/request/maochao/delivery.php

@@ -35,7 +35,11 @@ class erpapi_shop_matrix_tmall_request_maochao_delivery extends erpapi_shop_requ
 
         $order_id = $sdf['orderinfo']['order_id'];
         $isGuobu  = kernel::single('ome_bill_label')->getBillLabelInfo($order_id, 'order', 'SOMS_GB');
-
+        
+        // 喵速达
+        $isMiaosuda = kernel::single('ome_bill_label')->getBillLabelInfo($order_id, 'order', 'SOMS_ASCP');
+        
+        // sdf
         $order = $sdf['orderinfo'];
         $orderExtend = $sdf['order_extend'];
         $extend_field = @json_decode($orderExtend['extend_field'], 1);
@@ -46,8 +50,17 @@ class erpapi_shop_matrix_tmall_request_maochao_delivery extends erpapi_shop_requ
             'company_name' => $sdf['logi_name'],
             'tms_items' => []
         ];
+        
+        $storeCodes = [];
         $productOidNum =[];//捆绑商品只取其中一个为维度
         foreach ($sdf['order_objects'] as $v) {
+            $obj_oid = $v['oid'];
+            
+            // 过滤编辑订单添加的商品
+            if(empty($v['oid']) || $v['oid'] == '0'){
+                continue;
+            }
+            
             $order_items[] = [
                 'sub_order_code' => $v['oid'],
                 'sc_item_id' => $v['shop_goods_id'],
@@ -67,7 +80,24 @@ class erpapi_shop_matrix_tmall_request_maochao_delivery extends erpapi_shop_requ
                     $_tmp['sn'] = implode(',', $sdf['serial_number'][$item['product_id']]['sn']);
                 }
             }
-
+            
+            // store_code
+            $store_code = $v['store_code'];
+            
+            // 如果 store_code 为空，且是喵速达订单，则从 extend_info 中获取
+            if(empty($store_code) && $isMiaosuda && isset($isMiaosuda['extend_info']) && $isMiaosuda['extend_info'] && $obj_oid){
+                $extendInfo = json_decode($isMiaosuda['extend_info'], true);
+                if(is_array($extendInfo) && isset($extendInfo['storeCodeMap']) && is_array($extendInfo['storeCodeMap'])){
+                    if(isset($extendInfo['storeCodeMap'][$obj_oid])){
+                        $store_code = $extendInfo['storeCodeMap'][$obj_oid];
+                    }
+                }
+            }
+            
+            if($store_code){
+                $storeCodes[] = $store_code;
+            }
+            
             $one_tms_orders['tms_items'][] = $_tmp;
         }
         $tms_orders = [];
@@ -88,6 +118,12 @@ class erpapi_shop_matrix_tmall_request_maochao_delivery extends erpapi_shop_requ
                     ];
                 }
                 foreach ($productOidNum[$value['product_id']] as $oid => $pon) {
+                    
+                    // 过滤编辑订单添加的商品
+                    if(empty($oid) || $oid == '0'){
+                        continue;
+                    }
+                    
                     $tms_orders[$value['logi_no']]['tms_items'][] = [
                         'sub_order_code' => $oid,
                         'sc_item_id' => $pon['shop_goods_id'],
@@ -130,14 +166,23 @@ class erpapi_shop_matrix_tmall_request_maochao_delivery extends erpapi_shop_requ
                 'sender_mobile' => $branch['mobile'],
             ];
         }
-
+        
+        // store_code
+        if($isMiaosuda && $storeCodes){
+            // 喵速达：取平台推送的store_code
+            $store_code = $storeCodes[0];
+        }else{
+            $store_code = $sdf['branch']['branch_bn'];
+        }
+        
+        // params
         $params = [
             'tmall_type' => 'direct_marketing',
             "supplier_id"=> $extend_field['supplierId'],
             "biz_order_code"=> $order['order_bn'],
             "business_model"=> $extend_field['businessModel'],
             "out_biz_id" => $sdf['delivery_bn'],
-            "store_code" => $sdf['branch']['branch_bn'],
+            "store_code" => $store_code,
             "order_items" => json_encode($order_items),
             "tms_orders" => json_encode(array_values($tms_orders)),
             "sender_info" => json_encode($sender_info),

app/erpapi/lib/shop/matrix/tmall/request/order.php

@@ -162,4 +162,109 @@ class erpapi_shop_matrix_tmall_request_order extends erpapi_shop_request_order
         $params['receiver_zip']      = $order['consignee']['zip']?$order['consignee']['zip']:'';
         return $params;
     }
+    
+    /**
+     * [淘宝700虚拟号]隐私号G组更新：报备外呼主叫号码组
+     *
+     * @param array $params
+     * @return array
+     */
+    public function bindSecretMobiles($params)
+    {
+        $title = '隐私号G组更新';
+        
+        $original_bn = $params['order_bn'];
+        
+        // check
+        if(empty($original_bn) || empty($params['oaid']) || empty($params['mobile_list'])){
+            return $this->error('请检查order_bn、oaid、mobile_list是否为空');
+        }
+        
+//        // 请求的数据
+//        $requestData = [
+//            'mobile_list' => $params['mobile_list'], // 手机号列表(json)
+//            'operate_type' => 'ADD_GXB_GROUP', // 操作类型（DELETE_GXB_GROUP/ADD_GXB_GROUP）
+//            'oaid' => $params['oaid'], // 收件人ID (Open Addressee ID)，长度在128个字符之内
+//        ];
+//
+//        $requestParams= [
+//            'secret_order_g_group_update_external_request' => $requestData
+//        ];
+//
+//        // params
+//        $params = array(
+//            'api' => 'taobao.top.secret.group.update',
+//            'data' => json_encode($requestParams, JSON_UNESCAPED_UNICODE), // Json格式化
+//        );
+//
+//        // callback
+//        $callback = array();
+//
+//        // 使用矩阵透传接口请求淘宝
+//        $result = $this->__caller->call(TAOBAO_COMMON_TOP_SEND, $params, $callback, $title, 10, $original_bn);
+        
+        // mobile_list
+        if(is_array($params['mobile_list'])){
+            $json_mobile = json_encode($params['mobile_list'], JSON_UNESCAPED_UNICODE);
+        }else{
+            $json_mobile = $params['mobile_list'];
+        }
+        
+        // params
+        $params = array(
+            'operate_type' => 'ADD_GXB_GROUP', // ADD_GXB_GROUP: 添加，DELETE_GXB_GROUP: 删除
+            'tid' => $params['order_bn'], //订单号
+            'mobile_list' => $json_mobile, // JSON格式
+            'virtual_id' => $params['oaid'], // 收件人ID (Open Addressee ID)，长度在128个字符之内
+        );
+        
+        // callback
+        $callback = array();
+        
+        // 使用矩阵透传接口请求淘宝
+        $result = $this->__caller->call(STORE_VIRTUAL_NUMBER_GROUP_UPDATE, $params, $callback, $title, 10, $original_bn);
+        
+        return $result;
+    }
+    
+    /**
+     * [淘宝700虚拟号]隐私号G组查询：查询报备外呼主叫号码组
+     *
+     * @param array $params
+     * @return array
+     */
+    public function querySecretMobiles($params)
+    {
+        $title = '隐私号G组查询';
+        
+        $original_bn = $params['order_bn'];
+        
+        // check
+        if(empty($params['oaid'])){
+            return $this->error('没有提供oaid进行查询');
+        }
+        
+        // 请求的数据
+        $requestData = [
+            'oaid' => $params['oaid'], // 收件人ID (Open Addressee ID)，长度在128个字符之内
+        ];
+        
+        $requestParams= [
+            'secret_order_g_group_query_external_request' => $requestData
+        ];
+        
+        // params
+        $params = array(
+            'api' => 'taobao.top.secret.group.query',
+            'data' => json_encode($requestParams, JSON_UNESCAPED_UNICODE), // Json格式化
+        );
+        
+        // callback
+        $callback = array();
+        
+        // 使用矩阵透传接口请求淘宝
+        $result = $this->__caller->call(TAOBAO_COMMON_TOP_SEND, $params, $callback, $title, 10, $original_bn);
+        
+        return $result;
+    }
 }

app/erpapi/lib/shop/matrix/tmall/request/reshipping.php

@@ -0,0 +1,10 @@
+<?php
+/**
+ * Tmall 补寄申请请求接口实现
+ * 方法已移至基类 erpapi_shop_request_reshipping
+ */
+class erpapi_shop_matrix_tmall_request_reshipping extends erpapi_shop_request_reshipping
+{
+    // 所有方法已在基类中实现，如需 Tmall 特定逻辑可在此重写
+}
+

app/erpapi/lib/shop/matrix/tmall/response/aftersalev2.php

@@ -71,20 +71,6 @@ class erpapi_shop_matrix_tmall_response_aftersalev2 extends erpapi_shop_response
             $tagList = serialize($tagList);
         }
 
-        //识别如果是已完成的售后，转成退款单更新的逻辑
-        if($params['refund_type'] == 'return' && $params['status'] == 'success'){
-            $refundOriginalObj = app::get('ome')->model('return_product');
-            $refundOriginalInfo = $refundOriginalObj->getList('return_id', array('return_bn'=>$sdf['refund_bn'],'status' =>'4') , 0 , 1);
-            if($refundOriginalInfo){
-                $refundApplyObj = app::get('ome')->model('refund_apply');
-                $refundApplyInfo = $refundApplyObj->getList('refund_apply_bn', array('return_id'=>$refundOriginalInfo[0]['return_id'],'status' =>array('0','1','2','5','6')) , 0 , 1);
-                if($refundApplyInfo){
-                    $sdf['refund_bn'] = $refundApplyInfo[0]['refund_apply_bn'];
-                    $sdf['tmall_has_finished_return_product'] = true;
-                }
-            }
-        }
-
         $tmallSdf = array(
             'oid'               => $params['oid'] ? $params['oid'] : $item['oid'],
             'tmall_refund_type' => $params['refund_type'],
@@ -183,6 +169,69 @@ class erpapi_shop_matrix_tmall_response_aftersalev2 extends erpapi_shop_response
         if ($params['trade_from'] && $params['trade_from'] == 'miaozhu') {
             $sdf['order_source'] = $params['trade_from'];
         }
+        
+        // 百补退款处理
+        // 判断：ypds_refund_type = 1 视为百补退款
+        // 退款字段只从 extend_field 中获取
+        $extendField = null;
+        if (!empty($params['extend_field'])) {
+            $extendField = is_string($params['extend_field']) ? json_decode($params['extend_field'], true) : $params['extend_field'];
+        }
+        
+        // 从 extend_field 中获取 ypds_refund_type
+        $ypdsRefundType = '';
+        if (is_array($extendField) && isset($extendField['ypds_refund_type'])) {
+            $ypdsRefundType = $extendField['ypds_refund_type'];
+        }
+        
+        if ($ypdsRefundType == '1' || $ypdsRefundType == 1) {
+            // 理由：取 ypds_refund_reason（从 extend_field）
+            $ypdsRefundReason = '';
+            if (is_array($extendField) && isset($extendField['ypds_refund_reason'])) {
+                $ypdsRefundReason = $extendField['ypds_refund_reason'];
+            }
+            if (!empty($ypdsRefundReason)) {
+                $sdf['reason'] = $ypdsRefundReason;
+            }
+            
+            // 金额：取 ypds_refund_supply_fee（供货价口径，从 extend_field）
+            $ypdsRefundSupplyFee = 0;
+            if (is_array($extendField) && isset($extendField['ypds_refund_supply_fee'])) {
+                $ypdsRefundSupplyFee = floatval($extendField['ypds_refund_supply_fee']);
+            }
+            if ($ypdsRefundSupplyFee > 0) {
+                $sdf['refund_fee'] = sprintf('%.2f', $ypdsRefundSupplyFee);
+            }
+        }
+        
+        // 产地优选（超链）退款处理
+        // 判断：superlink_refund_id 有值视为产地优选退款
+        // 退款字段只从 extend_field 中获取
+        $superlinkRefundId = '';
+        if (is_array($extendField) && isset($extendField['superlink_refund_id'])) {
+            $superlinkRefundId = $extendField['superlink_refund_id'];
+        }
+        
+        if (!empty($superlinkRefundId)) {
+            // 理由：取 superlink_refund_reason（从 extend_field）
+            $superlinkRefundReason = '';
+            if (is_array($extendField) && isset($extendField['superlink_refund_reason'])) {
+                $superlinkRefundReason = $extendField['superlink_refund_reason'];
+            }
+            if (!empty($superlinkRefundReason)) {
+                $sdf['reason'] = $superlinkRefundReason;
+            }
+            
+            // 金额：取 superlink_refund_supply_fee（供货价口径，从 extend_field）
+            $superlinkRefundSupplyFee = 0;
+            if (is_array($extendField) && isset($extendField['superlink_refund_supply_fee'])) {
+                $superlinkRefundSupplyFee = floatval($extendField['superlink_refund_supply_fee']);
+            }
+            if ($superlinkRefundSupplyFee > 0) {
+                $sdf['refund_fee'] = sprintf('%.2f', $superlinkRefundSupplyFee);
+            }
+        }
+        
         return array_merge($sdf, $tmallSdf);
     }
 
@@ -191,9 +240,6 @@ class erpapi_shop_matrix_tmall_response_aftersalev2 extends erpapi_shop_response
             if (in_array($sdf['order']['ship_status'],array('0'))) {
                 #退款单
                 return 'refund';
-            }elseif(in_array($sdf['order']['ship_status'],array('3','4')) && $sdf['tmall_has_finished_return_product']){
-                #退款单
-                return 'refund';
             }else{
                 #退货申请单
                 return 'returnProduct';
@@ -280,6 +326,9 @@ class erpapi_shop_matrix_tmall_response_aftersalev2 extends erpapi_shop_response
             $sdf['refund_type'] = 'apply';
         }
         $sdf = parent::_refundAddSdf($sdf);
+        if($sdf['cs_status'] == '6' && $sdf['response_bill_type'] != 'refund_apply') {
+            $sdf['tag_type'] = '8';
+        }
         /*
         if($sdf['refund_apply']) {
             $oRefundTmall = app::get('ome')->model('refund_apply_tmall');

app/erpapi/lib/shop/matrix/tmall/response/order.php

@@ -42,6 +42,7 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
 
     protected function _analysis()
     {
+        $this->_ordersdf['is_delivery'] = 'Y';#默认可以发货
         parent::_analysis();
         $this->_ordersdf['is_service_order'] = ($this->_ordersdf['is_service_order'] || $this->_ordersdf['service_order_objects']['service_order']);
         if($this->_ordersdf['ship_status'] == '2' && $this->_ordersdf['is_service_order']) {
@@ -59,6 +60,50 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
             $this->_ordersdf['sh_ship_exists'] = true;
         }
 
+        // 国补自补处理逻辑
+        if (isset($this->_ordersdf['extend_field']['gov_subsidy'])) {
+            $gov_subsidy = $this->_ordersdf['extend_field']['gov_subsidy'];
+            
+            // 获取出资类型
+            $gov_subsidy_type_extra = isset($gov_subsidy['gov_subsidy_type_extra']) 
+                ? intval($gov_subsidy['gov_subsidy_type_extra']) 
+                : 0;
+            
+            // 商家出资金额（单位：元）
+            $merchant_subsidy_amount = 0;
+            
+            // 根据出资类型获取商家出资金额
+            if ($gov_subsidy_type_extra == 4) {
+                // 纯商家出资：使用 gov_subsidy_amount_exact
+                if (isset($gov_subsidy['gov_subsidy_amount_exact']) && $gov_subsidy['gov_subsidy_amount_exact'] > 0) {
+                    $merchant_subsidy_amount = floatval($gov_subsidy['gov_subsidy_amount_exact']) / 100;
+                }
+            } elseif (in_array($gov_subsidy_type_extra, [6, 7, 8])) {
+                // 平台和商家混合出资(6)、政府和商家混合出资(7)、政府商家平台三方混合出资(8)
+                // 从 gov_subsidy_funds_detail 中提取商家出资金额（b部分）
+                if (isset($gov_subsidy['gov_subsidy_funds_detail']) && $gov_subsidy['gov_subsidy_funds_detail']) {
+                    $funds_detail = explode('_', $gov_subsidy['gov_subsidy_funds_detail']);
+                    // 格式：a_b_c，其中 a:政府出资金额，b:商家出资金额，c:平台出资金额（单位：分）
+                    if (isset($funds_detail[1]) && $funds_detail[1] > 0) {
+                        $merchant_subsidy_amount = floatval($funds_detail[1]) / 100;
+                    }
+                }
+            }
+            
+            // 如果商家出资金额大于0，计算结算金额
+            if ($merchant_subsidy_amount > 0 && in_array($gov_subsidy_type_extra, [4, 6, 7, 8])) {
+                // 国补订单只有一个 order_object，直接处理第一个
+                if (isset($this->_ordersdf['order_objects'][0]['divide_order_fee'])) {
+                    $divide_order_fee = floatval($this->_ordersdf['order_objects'][0]['divide_order_fee']);
+                    
+                    // 计算 settlement_amount = divide_order_fee - 商家出资金额
+                    $settlement_amount = $divide_order_fee - $merchant_subsidy_amount;
+                    
+                    // 更新 order_object 的 settlement_amount
+                    $this->_ordersdf['order_objects'][0]['settlement_amount'] = sprintf('%.2f', $settlement_amount);
+                }
+            }
+        }
 
         // 全部是屏蔽发货才定位平台自发
         $shShip = app::get('ome')->getConf('ome.platform.order.consign');
@@ -100,7 +145,6 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
         if($this->_ordersdf['cn_info'] && $this->_ordersdf['cn_info']['es_date']) {
             $this->_ordersdf['consignee']['r_time'] = $this->_ordersdf['cn_info']['es_date'] . ' ' . $this->_ordersdf['cn_info']['es_range'];
         }
-
         //商品总额扣掉服务费:淘宝的服务费算在总额上
         $total_fee = 0;
         foreach ((array)$this->_ordersdf['service_order_objects']['service_order'] as $s) {
@@ -118,6 +162,163 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
             $this->_ordersdf["payer_register_no"] = $rs_invoice_order_taobao["payer_register_no"];
             $this->_ordersdf["invoice_kind"] = $rs_invoice_order_taobao["invoice_kind"];
         }
+        
+        // 喵速达
+        $label_code = '';
+        if (isset($this->_ordersdf['extend_field']['businessModel']) && $this->_ordersdf['extend_field']['businessModel']) {
+            $businessModel = intval($this->_ordersdf['extend_field']['businessModel']);
+            if ($businessModel >= 1 && $businessModel <= 4) {
+                $label_code = 'SOMS_ASCP';
+                
+                // 喵速达订单结算金额重新计算
+                // 获取商家应收(订单总额)
+                $totalAmount = floatval($this->_ordersdf['total_amount']);
+                
+                // 查询扣点比例（固定配置键 commission）
+                $platformSetMdl = app::get('ome')->model('platform_set');
+                $platformSet = $platformSetMdl->db_dump([
+                    'shop_type' => 'taobao',
+                    'scene' => 'tmsd_commission',
+                    'kname' => 'commission'
+                ], 'kvalue');
+                
+                if ($platformSet && isset($platformSet['kvalue']) && $platformSet['kvalue']) {
+                    $commissionRate = floatval($platformSet['kvalue']); // 如 0.02 表示 2%
+                    
+                    // 计算新的结算金额: 结算金额 = 商家应收 - (商家应收 * 扣点比例)
+                    $newSettlementAmount = $totalAmount - ($totalAmount * $commissionRate);
+                    
+                    // 使用 calculate_part_porth 方法重新均摊结算金额
+                    if ($newSettlementAmount > 0 && isset($this->_ordersdf['order_objects'])) {
+                        $options = [
+                            'part_total' => $newSettlementAmount,
+                            'part_field' => 'settlement_amount',
+                            'porth_field' => 'divide_order_fee',
+                        ];
+                        $this->_ordersdf['order_objects'] = kernel::single('ome_order')->calculate_part_porth($this->_ordersdf['order_objects'], $options);
+                    }
+                }
+            }
+        }
+        
+        // 是否请求平台获取实付金额
+        //@todo：喵速达订单，不需要请求平台获取实付金额;
+        $is_request_payment = true;
+        if(in_array($label_code, ['SOMS_ASCP'])){
+            $is_request_payment = false;
+        }
+        
+        // 检查订单状态：只有在订单不存在或status为active时才处理实付金额
+        if ($is_request_payment) {
+            $orderModel = app::get('ome')->model('orders');
+            $filter = array(
+                'order_bn' => $this->_ordersdf['order_bn'], 
+                'shop_id' => $this->__channelObj->channel['shop_id']
+            );
+            $existingOrder = $orderModel->db_dump($filter, 'status');
+            
+            // 如果订单存在且status不是active，则不处理实付金额
+            if (!empty($existingOrder) && isset($existingOrder['status']) && $existingOrder['status'] != 'active') {
+                $is_request_payment = false;
+            }
+        }
+        
+        // 实付金额处理
+        $getPaymentEnabled = app::get('ome')->getConf('ome.order.get.payment');
+        if($this->_ordersdf['pay_status'] == '1' && $getPaymentEnabled === 'true' && $is_request_payment){
+            $router = kernel::single('erpapi_router_request');
+            $router->set('shop', $this->__channelObj->channel['shop_id']);
+            $actuallyPay = $router->order_getActuallyPay($this->_ordersdf['order_bn']);
+            
+            if ($actuallyPay && $actuallyPay['rsp'] == 'succ' && isset($actuallyPay['data']['actually_pay'])) {
+                $totalActuallyPay = floatval($actuallyPay['data']['actually_pay']); 
+                $totalActuallyPay = $totalActuallyPay - (float)$this->_ordersdf['shipping']['cost_shipping'];
+                if ($totalActuallyPay > 0 && isset($this->_ordersdf['order_objects']) && is_array($this->_ordersdf['order_objects'])) {
+                    // 使用均摊方法处理
+                    $options = [
+                        'part_total' => $totalActuallyPay,
+                        'part_field' => 'actually_amount',
+                        'porth_field' => 'divide_order_fee',
+                        'minuend_field' => 'divide_order_fee',
+                    ];
+                    $this->_ordersdf['coupon_actuallypay_field'] = 'actually_amount';
+                    $this->_ordersdf['order_objects'] = kernel::single('ome_order')->calculate_part_porth($this->_ordersdf['order_objects'], $options);
+                }
+                
+                // 天猫优品订单结算金额重新计算
+                // 判断依据：gov_main_subject 以 'FIN_TMYPT' 开头
+                $isTmypOrder = false;
+                if (isset($this->_ordersdf['extend_field']['gov_subsidy']['gov_main_subject'])) {
+                    $govMainSubject = $this->_ordersdf['extend_field']['gov_subsidy']['gov_main_subject'];
+                    if ($govMainSubject && strpos($govMainSubject, 'FIN_TMYPT') === 0) {
+                        $isTmypOrder = true;
+                    }
+                }
+                
+                if ($isTmypOrder) {
+                    
+                    // 获取消费者实付(API返回的原始金额,未减去运费)
+                    $consumerActuallyPay = floatval($actuallyPay['data']['actually_pay']);
+                    
+                    // 获取 coupon_fee (单位为分,需要除以100)
+                    $couponFee = 0;
+                    if (isset($this->_ordersdf['coupon_fee'])) {
+                        //$couponFee = floatval($this->_ordersdf['coupon_fee']) / 100;
+                    }
+                    
+                    // 获取商家应收(订单总额)
+                    $totalAmount = floatval($this->_ordersdf['total_amount']);
+                    
+                    // 从 gov_zhaoshangpi 获取供应商编码
+                    $supplierCode = null;
+                    if (isset($this->_ordersdf['order_objects']) && is_array($this->_ordersdf['order_objects'])) {
+                        foreach ($this->_ordersdf['order_objects'] as $k => $_object) {
+                            if (isset($_object['order_items']) && is_array($_object['order_items'])) {
+                                foreach ($_object['order_items'] as $_item) {
+                                    if (isset($_item['extend_item_list']['gov_zhaoshangpi']) && $_item['extend_item_list']['gov_zhaoshangpi']) {
+                                        $this->_ordersdf['guobu_info']['gov_zhaoshangpi'][$_object['oid']][] = $_item['extend_item_list'];
+                                        $parts = explode('_', $_item['extend_item_list']['gov_zhaoshangpi']);
+                                        if (!empty($parts[0])) {
+                                            $supplierCode = $parts[0];
+                                            break 2; // 找到第一个就退出
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    
+                    // 查询扣点比例
+                    if ($supplierCode) {
+                        $platformSetMdl = app::get('ome')->model('platform_set');
+                        $platformSet = $platformSetMdl->db_dump([
+                            'shop_type' => 'taobao',
+                            'scene' => 'tmyp_commission',
+                            'kname' => $supplierCode
+                        ], 'kvalue');
+                        
+                        if ($platformSet && isset($platformSet['kvalue']) && $platformSet['kvalue']) {
+                            $commissionRate = floatval($platformSet['kvalue']); // 如 0.02 表示 2%
+                            
+                            // 计算新的结算金额: 结算金额 = 消费者实付 + coupon_fee - (商家应收 * 扣点)
+                            $newSettlementAmount = $consumerActuallyPay + $couponFee - ($totalAmount * $commissionRate);
+                            
+                            // 使用 calculate_part_porth 方法重新均摊结算金额
+                            if ($newSettlementAmount > 0 && isset($this->_ordersdf['order_objects'])) {
+                                $options = [
+                                    'part_total' => $newSettlementAmount,
+                                    'part_field' => 'settlement_amount',
+                                    'porth_field' => 'divide_order_fee',
+                                ];
+                                $this->_ordersdf['order_objects'] = kernel::single('ome_order')->calculate_part_porth($this->_ordersdf['order_objects'], $options);
+                            }
+                        }
+                    }
+                }
+            } else {
+                $this->_ordersdf['is_delivery'] = 'N';
+            }
+        }
         $oidObject = [];
         $coupon = [];
         foreach ($this->_ordersdf['order_objects'] as $k => $object){
@@ -152,7 +353,7 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
                         'coupon_type'   => '0',
                         'amount'        => $item['expand_card_expand_price_used_suborder'] / $object['quantity'],
                         'total_amount'  => $item['expand_card_expand_price_used_suborder'],
-                        'create_time'   => kernel::single('ome_func')->date2time($this->_ordersdf['createtime']),
+                        'create_time'   => sprintf('%.0f', time()),
                         'pay_time'      => kernel::single('ome_func')->date2time($this->_ordersdf['payment_detail']['pay_time']),
                         'shop_type'     => 'taobao',
                         'source'        => 'push',
@@ -168,26 +369,6 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
                 }
             }
         }
-        // 实付金额处理
-        if (isset($this->_ordersdf['coupon_fee']) && floatval($this->_ordersdf['coupon_fee']) > 0 && isset($this->_ordersdf['order_objects']) && is_array($this->_ordersdf['order_objects'])) {
-            $coupon_fee = floatval($this->_ordersdf['coupon_fee']/100);
-            // 分摊方法
-            $options = [
-                'part_total' => $coupon_fee,
-                'part_field' => 'coupon_fee',
-                'porth_field' => 'divide_order_fee',
-                'minuend_field' => 'divide_order_fee',
-            ];
-            $this->_ordersdf['order_objects'] = kernel::single('ome_order')->calculate_part_porth($this->_ordersdf['order_objects'], $options);
-            $this->_ordersdf['coupon_actuallypay_field'] = 'calcActuallyPay';
-            foreach($this->_ordersdf['order_objects'] as $k => $object) {
-                if(isset($object['coupon_fee']) && $object['coupon_fee']){
-                    $this->_ordersdf['order_objects'][$k]['calcActuallyPay'] = sprintf('%.2f', $object['divide_order_fee'] - $object['coupon_fee']);
-                }else{
-                    $this->_ordersdf['order_objects'][$k]['calcActuallyPay'] = sprintf('%.2f', $object['divide_order_fee']);
-                }
-            }
-        }
         if ($this->_ordersdf['pmt_detail']) {
             foreach ((array) $this->_ordersdf['pmt_detail'] as $key => $value) {
                 if (!is_array($value) || trim($value['pmt_amount']) == '' || trim($value['pmt_amount']) == 0) {
@@ -217,7 +398,7 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
                             'coupon_type'   => '0',
                             'amount'        => $total_amount / $object['quantity'],
                             'total_amount'  => $total_amount,
-                            'create_time'   => kernel::single('ome_func')->date2time($this->_ordersdf['createtime']),
+                            'create_time'   => sprintf('%.0f', time()),
                             'pay_time'      => kernel::single('ome_func')->date2time($this->_ordersdf['payment_detail']['pay_time']),
                             'shop_type'     => 'taobao',
                             'source'        => 'push',
@@ -238,7 +419,7 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
                         'coupon_type'   => '0',
                         'amount'        => $value['kd_discount_fee'] / $object['quantity'],
                         'total_amount'  => $value['kd_discount_fee'],
-                        'create_time'   => kernel::single('ome_func')->date2time($this->_ordersdf['createtime']),
+                        'create_time'   => sprintf('%.0f', time()),
                         'pay_time'      => kernel::single('ome_func')->date2time($this->_ordersdf['payment_detail']['pay_time']),
                         'shop_type'     => 'taobao',
                         'source'        => 'push',
@@ -471,7 +652,21 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
                 if ($gov_subsidy['gov_store'] == 1 || $gov_subsidy['gov_main_subject']) {
 
                     $this->_ordersdf['guobu_info']['use_gov_subsidy_new'] = true;
+                    
+                    // 保存gov_main_subject到guobu_info中
+                    if ($gov_subsidy['gov_main_subject']) {
+                        $this->_ordersdf['guobu_info']['gov_main_subject'] = $gov_subsidy['gov_main_subject'];
+                    }
+                    
+                    // 检查是否为天猫优品订单
+                    if ($gov_subsidy['gov_main_subject'] && strpos($gov_subsidy['gov_main_subject'], 'FIN_TMYPT') === 0) {
+                        $this->_ordersdf['guobu_info']['guobu_type'][] = 2048; // 天猫优品订单
+                    }
+                    
+                    // 一品卖多地类型始终添加
                     $this->_ordersdf['guobu_info']['guobu_type'][] = 4; // 一品卖多地
+
+                    
                 }
 
                 if ($this->_ordersdf['guobu_info']) {
@@ -495,6 +690,28 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
                         }
                     }
 
+                    // 处理出资类型：根据 gov_subsidy_type_extra 判断具体补贴场景
+                    if (isset($gov_subsidy['gov_subsidy_type_extra'])) {
+                        $gov_subsidy_type_extra = intval($gov_subsidy['gov_subsidy_type_extra']);
+                        switch ($gov_subsidy_type_extra) {
+                            case 4:
+                                $this->_ordersdf['guobu_info']['guobu_type'][] = 0x2000; // 纯商家出资
+                                break;
+                            case 5:
+                                $this->_ordersdf['guobu_info']['guobu_type'][] = 0x4000; // 平台出资
+                                break;
+                            case 6:
+                                $this->_ordersdf['guobu_info']['guobu_type'][] = 0x8000; // 平台和商家混合出资
+                                break;
+                            case 7:
+                                $this->_ordersdf['guobu_info']['guobu_type'][] = 0x10000; // 政府和商家混合出资
+                                break;
+                            case 8:
+                                $this->_ordersdf['guobu_info']['guobu_type'][] = 0x20000; // 政府、商家和平台三方混合出资
+                                break;
+                        }
+                    }
+
                     $this->_ordersdf['guobu_info']['gov_subsidy'] = $gov_subsidy;
                     // 招商皮信息 N_云闪付优惠码_折扣比例_类目编码
                     // 1）修改后第一段内容为N，将不再展示招商皮ID；
@@ -512,6 +729,14 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
                     }
 
                 }
+                
+                // 天猫优品国补打标记
+                if ($gov_subsidy['gov_main_subject'] && strpos($gov_subsidy['gov_main_subject'], 'FIN_TMYPT') === 0) {
+                    $this->_ordersdf['guobu_info']['tmyp_info'] = [
+                        'is_tmyp_order' => true,
+                        'supplier' => $gov_subsidy['gov_main_subject'], // 供应商编码
+                    ];
+                }
             }
             // 国补 - 淘宝分销
             if ($features = $this->_ordersdf['extend_field']['features']) {
@@ -601,7 +826,304 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
                 }
             }
         }
-
+        // 百补超级半托
+        $ypdsInfo = array();
+        $ypdsOrderSupplyPriceTotal = 0;
+        // 用于记录每个 object 的金额汇总
+        $objectAmounts = array();
+        foreach ($this->_ordersdf['order_objects'] as $k => $_object) {
+            $objectAmounts[$k] = array(
+                'amount' => 0,
+                'sale_price' => 0,
+                'divide_order_fee' => 0,
+                'pmt_price' => 0,
+                'part_mjz_discount' => 0,
+            );
+            
+            foreach ( $_object['order_items'] as $itemKey => $_item ){
+                if (isset($_item['extend_item_list']['ypds_order_type']) && $ypdsOrderType = $_item['extend_item_list']['ypds_order_type']) {
+                    // 提取百补字段
+                    $extendItemList = $_item['extend_item_list'];
+                    if (empty($ypdsInfo)) {
+                        $ypdsInfo = array(
+                            'ypds_platform_order_id' => isset($extendItemList['ypds_platform_order_id']) ? $extendItemList['ypds_platform_order_id'] : '',
+                            'ypds_platform_pay_order_id' => isset($extendItemList['ypds_platform_pay_order_id']) ? $extendItemList['ypds_platform_pay_order_id'] : '',
+                            'ypds_order_type' => $ypdsOrderType,
+                            'ypds_order_supply_price' => isset($extendItemList['ypds_order_supply_price']) ? floatval($extendItemList['ypds_order_supply_price']) : 0,
+                        );
+                    }
+                    
+                    // 获取供货总价
+                    $ypdsOrderSupplyPrice = isset($extendItemList['ypds_order_supply_price']) ? floatval($extendItemList['ypds_order_supply_price']) : 0;
+                    if ($ypdsOrderSupplyPrice > 0) {
+                        $ypdsOrderSupplyPriceTotal = bcadd($ypdsOrderSupplyPriceTotal, $ypdsOrderSupplyPrice, 2);
+                        
+                        // 获取数量
+                        $quantity = isset($_object['quantity']) ? floatval($_object['quantity']) : 1;
+                        if ($quantity <= 0) $quantity = 1;
+                        
+                        // 根据文档23-25行规则更新行明细金额
+                        // 行单价：price = ypds_order_supply_price / quantity
+                        $itemPrice = bcdiv($ypdsOrderSupplyPrice, $quantity, 2);
+                        
+                        // 行金额：amount = sale_price = divide_order_fee = ypds_order_supply_price
+                        // 优惠置零：pmt_price = 0，part_mjz_discount = 0
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['price'] = $itemPrice;
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['amount'] = $ypdsOrderSupplyPrice;
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['sale_price'] = $ypdsOrderSupplyPrice;
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['divide_order_fee'] = $ypdsOrderSupplyPrice;
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['pmt_price'] = 0;
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['part_mjz_discount'] = 0;
+                        
+                        // 累计 object 层金额
+                        $objectAmounts[$k]['amount'] = bcadd($objectAmounts[$k]['amount'], $ypdsOrderSupplyPrice, 2);
+                        $objectAmounts[$k]['sale_price'] = bcadd($objectAmounts[$k]['sale_price'], $ypdsOrderSupplyPrice, 2);
+                        $objectAmounts[$k]['divide_order_fee'] = bcadd($objectAmounts[$k]['divide_order_fee'], $ypdsOrderSupplyPrice, 2);
+                    }
+                }
+            }
+            
+            // 更新 object 层金额（汇总所有 items）
+            if ($objectAmounts[$k]['amount'] > 0) {
+                $objectQuantity = isset($_object['quantity']) ? floatval($_object['quantity']) : 1;
+                if ($objectQuantity <= 0) $objectQuantity = 1;
+                $objectPrice = bcdiv($objectAmounts[$k]['amount'], $objectQuantity, 2);
+                
+                $this->_ordersdf['order_objects'][$k]['price'] = $objectPrice;
+                $this->_ordersdf['order_objects'][$k]['amount'] = $objectAmounts[$k]['amount'];
+                $this->_ordersdf['order_objects'][$k]['sale_price'] = $objectAmounts[$k]['sale_price'];
+                $this->_ordersdf['order_objects'][$k]['divide_order_fee'] = $objectAmounts[$k]['divide_order_fee'];
+                $this->_ordersdf['order_objects'][$k]['pmt_price'] = 0;
+                $this->_ordersdf['order_objects'][$k]['part_mjz_discount'] = 0;
+            }
+        }
+        
+        // 如果有百补信息，更新订单级金额和设置相关字段
+        if (!empty($ypdsInfo) && $ypdsOrderSupplyPriceTotal > 0) {
+            // 设置订单级百补信息
+            $this->_ordersdf['ypds_info'] = $ypdsInfo;
+            
+            // 汇总更新订单级金额
+            // cost_item = 汇总所有行的 amount
+            $this->_ordersdf['cost_item'] = $ypdsOrderSupplyPriceTotal;
+            // total_amount = cost_item（根据文档，订单应收为供货总价汇总）
+            $this->_ordersdf['total_amount'] = $ypdsOrderSupplyPriceTotal;
+            // payed = total_amount（百补订单按供货价支付）
+            $this->_ordersdf['payed'] = $ypdsOrderSupplyPriceTotal;
+            
+            // 设置关联订单号
+            if (!empty($ypdsInfo['ypds_platform_order_id'])) {
+                $this->_ordersdf['relate_order_bn'] = $ypdsInfo['ypds_platform_order_id'];
+            }
+            
+            // 组织支付单数据到 payments 数组
+            if (!empty($ypdsInfo['ypds_platform_pay_order_id'])) {
+                // 初始化 payments 数组（如果不存在）
+                if (!isset($this->_ordersdf['payments']) || !is_array($this->_ordersdf['payments'])) {
+                    $this->_ordersdf['payments'] = array();
+                }
+                
+                // 获取支付时间
+                $payTime = isset($this->_ordersdf['payment_detail']['pay_time']) 
+                    ? kernel::single('ome_func')->date2time($this->_ordersdf['payment_detail']['pay_time'])
+                    : (isset($this->_ordersdf['paytime']) ? $this->_ordersdf['paytime'] : time());
+                
+                // 获取支付方式
+                $payBn = isset($this->_ordersdf['pay_bn']) ? $this->_ordersdf['pay_bn'] : 'alipay';
+                
+                // 组织支付单数据
+                $paymentData = array(
+                    'trade_no' => $ypdsInfo['ypds_platform_pay_order_id'],  // 支付单号
+                    'money' => $ypdsOrderSupplyPriceTotal,                    // 支付金额（供货总价）
+                    'pay_time' => $payTime,                                   // 支付时间
+                    'pay_bn' => $payBn,                                       // 支付方式
+                    'paycost' => 0,                                           // 支付手续费
+                    'account' => '',                                          // 支付账号
+                    'bank' => '',                                             // 银行
+                    'pay_account' => '',                                      // 支付账户
+                    'paymethod' => '',                                         // 支付方法
+                    'memo' => '百补超级半托订单支付',                          // 备注
+                    'op_name' => isset($this->_ordersdf['payment_detail']['op_name']) 
+                        ? $this->_ordersdf['payment_detail']['op_name'] 
+                        : $this->__channelObj->channel['node_type'],
+                );
+                
+                // 添加到 payments 数组
+                $this->_ordersdf['payments'][] = $paymentData;
+            }
+        }
+        
+        // 产地优选（超链）订单处理
+        $superlinkInfo = array();
+        $superlinkOrderSupplyPriceTotal = 0;
+        $superlinkPlatformPayment = 0;
+        // 用于记录每个 object 的金额汇总
+        $superlinkObjectAmounts = array();
+        
+        // 先从订单级 extend_field 提取订单级字段
+        $extendField = isset($this->_ordersdf['extend_field']) ? $this->_ordersdf['extend_field'] : array();
+        $superlinkPlatformOrderId = '';
+        $superlinkAlipayNo = '';
+        if (is_array($extendField)) {
+            $superlinkPlatformOrderId = isset($extendField['superlink_platform_order_id']) ? $extendField['superlink_platform_order_id'] : '';
+            $superlinkAlipayNo = isset($extendField['superlink_alipay_no']) ? $extendField['superlink_alipay_no'] : '';
+            if (isset($extendField['superlink_platform_payment'])) {
+                $superlinkPlatformPayment = floatval($extendField['superlink_platform_payment']);
+            }
+        }
+        
+        // 如果订单级没有，尝试从行级提取
+        if (empty($superlinkPlatformOrderId)) {
+            foreach ($this->_ordersdf['order_objects'] as $k => $_object) {
+                foreach ($_object['order_items'] as $itemKey => $_item) {
+                    if (isset($_item['extend_item_list']['superlink_platform_order_id']) && !empty($_item['extend_item_list']['superlink_platform_order_id'])) {
+                        $superlinkPlatformOrderId = $_item['extend_item_list']['superlink_platform_order_id'];
+                        break 2;
+                    }
+                }
+            }
+        }
+        
+        // 判断是否为产地优选订单
+        if (!empty($superlinkPlatformOrderId)) {
+            foreach ($this->_ordersdf['order_objects'] as $k => $_object) {
+                $superlinkObjectAmounts[$k] = array(
+                    'amount' => 0,
+                    'sale_price' => 0,
+                    'divide_order_fee' => 0,
+                    'pmt_price' => 0,
+                    'part_mjz_discount' => 0,
+                );
+                
+                foreach ($_object['order_items'] as $itemKey => $_item) {
+                    $extendItemList = isset($_item['extend_item_list']) ? $_item['extend_item_list'] : array();
+                    
+                    // 从行级提取字段
+                    $superlinkPlatformSubOrderId = isset($extendItemList['superlink_platform_sub_order_id']) ? $extendItemList['superlink_platform_sub_order_id'] : '';
+                    $superlinkOrderSupplyPrice = isset($extendItemList['superlink_order_supply_price']) ? floatval($extendItemList['superlink_order_supply_price']) : 0;
+                    $superlinkItemPayment = isset($extendItemList['superlink_platform_payment']) ? floatval($extendItemList['superlink_platform_payment']) : 0;
+                    
+                    // 如果订单级没有实付金额，尝试从行级获取
+                    if ($superlinkPlatformPayment <= 0 && $superlinkItemPayment > 0) {
+                        $superlinkPlatformPayment = $superlinkItemPayment;
+                    }
+                    
+                    // 初始化订单级信息（只初始化一次）
+                    if (empty($superlinkInfo)) {
+                        $superlinkInfo = array(
+                            'superlink_platform_order_id' => $superlinkPlatformOrderId,
+                            'superlink_platform_sub_order_id' => $superlinkPlatformSubOrderId,
+                            'superlink_platform_payment' => $superlinkPlatformPayment > 0 ? $superlinkPlatformPayment : 0,
+                            'superlink_alipay_no' => $superlinkAlipayNo,
+                            'superlink_order_supply_price' => 0, // 订单级汇总后设置
+                        );
+                    }
+                    
+                    // 如果有供货单价，进行金额计算
+                    if ($superlinkOrderSupplyPrice > 0) {
+                        // 获取数量
+                        $quantity = isset($_object['quantity']) ? floatval($_object['quantity']) : 1;
+                        if ($quantity <= 0) $quantity = 1;
+                        
+                        // 行金额计算：amount = sale_price = divide_order_fee = superlink_order_supply_price * quantity
+                        $itemAmount = bcmul($superlinkOrderSupplyPrice, $quantity, 2);
+                        
+                        // 累计订单级供货总价
+                        $superlinkOrderSupplyPriceTotal = bcadd($superlinkOrderSupplyPriceTotal, $itemAmount, 2);
+                        
+                        // 更新行明细金额
+                        // 行单价：price = superlink_order_supply_price
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['price'] = $superlinkOrderSupplyPrice;
+                        // 行金额：amount = sale_price = divide_order_fee = superlink_order_supply_price * quantity
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['amount'] = $itemAmount;
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['sale_price'] = $itemAmount;
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['divide_order_fee'] = $itemAmount;
+                        // 优惠置零：pmt_price = 0，part_mjz_discount = 0
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['pmt_price'] = 0;
+                        $this->_ordersdf['order_objects'][$k]['order_items'][$itemKey]['part_mjz_discount'] = 0;
+                        
+                        // 累计 object 层金额
+                        $superlinkObjectAmounts[$k]['amount'] = bcadd($superlinkObjectAmounts[$k]['amount'], $itemAmount, 2);
+                        $superlinkObjectAmounts[$k]['sale_price'] = bcadd($superlinkObjectAmounts[$k]['sale_price'], $itemAmount, 2);
+                        $superlinkObjectAmounts[$k]['divide_order_fee'] = bcadd($superlinkObjectAmounts[$k]['divide_order_fee'], $itemAmount, 2);
+                    }
+                }
+                
+                // 更新 object 层金额（汇总所有 items）
+                if ($superlinkObjectAmounts[$k]['amount'] > 0) {
+                    $objectQuantity = isset($_object['quantity']) ? floatval($_object['quantity']) : 1;
+                    if ($objectQuantity <= 0) $objectQuantity = 1;
+                    $objectPrice = bcdiv($superlinkObjectAmounts[$k]['amount'], $objectQuantity, 2);
+                    
+                    $this->_ordersdf['order_objects'][$k]['price'] = $objectPrice;
+                    $this->_ordersdf['order_objects'][$k]['amount'] = $superlinkObjectAmounts[$k]['amount'];
+                    $this->_ordersdf['order_objects'][$k]['sale_price'] = $superlinkObjectAmounts[$k]['sale_price'];
+                    $this->_ordersdf['order_objects'][$k]['divide_order_fee'] = $superlinkObjectAmounts[$k]['divide_order_fee'];
+                    $this->_ordersdf['order_objects'][$k]['pmt_price'] = 0;
+                    $this->_ordersdf['order_objects'][$k]['part_mjz_discount'] = 0;
+                }
+            }
+            
+            // 如果有产地优选信息，更新订单级金额和设置相关字段
+            if (!empty($superlinkInfo) && $superlinkOrderSupplyPriceTotal > 0) {
+                // 更新订单级供货总价
+                $superlinkInfo['superlink_order_supply_price'] = $superlinkOrderSupplyPriceTotal;
+                
+                // 设置订单级产地优选信息
+                $this->_ordersdf['superlink_info'] = $superlinkInfo;
+                
+                // 汇总更新订单级金额
+                // cost_item = total_amount = payed = 汇总所有行的 divide_order_fee
+                $this->_ordersdf['cost_item'] = $superlinkOrderSupplyPriceTotal;
+                $this->_ordersdf['total_amount'] = $superlinkOrderSupplyPriceTotal;
+                // 实付金额：使用 superlink_platform_payment（如果存在），否则使用汇总的供货价
+                $this->_ordersdf['payed'] = $superlinkPlatformPayment > 0 ? $superlinkPlatformPayment : $superlinkOrderSupplyPriceTotal;
+                
+                // 设置关联订单号
+                if (!empty($superlinkInfo['superlink_platform_order_id'])) {
+                    $this->_ordersdf['relate_order_bn'] = $superlinkInfo['superlink_platform_order_id'];
+                }
+                
+                // 组织支付单数据到 payments 数组
+                if (!empty($superlinkInfo['superlink_alipay_no'])) {
+                    // 初始化 payments 数组（如果不存在）
+                    if (!isset($this->_ordersdf['payments']) || !is_array($this->_ordersdf['payments'])) {
+                        $this->_ordersdf['payments'] = array();
+                    }
+                    
+                    // 获取支付时间
+                    $payTime = isset($this->_ordersdf['payment_detail']['pay_time']) 
+                        ? kernel::single('ome_func')->date2time($this->_ordersdf['payment_detail']['pay_time'])
+                        : (isset($this->_ordersdf['paytime']) ? $this->_ordersdf['paytime'] : time());
+                    
+                    // 获取支付方式
+                    $payBn = isset($this->_ordersdf['pay_bn']) ? $this->_ordersdf['pay_bn'] : 'alipay';
+                    
+                    // 支付金额：使用 superlink_platform_payment（如果存在），否则使用汇总的供货价
+                    $paymentAmount = $superlinkPlatformPayment > 0 ? $superlinkPlatformPayment : $superlinkOrderSupplyPriceTotal;
+                    
+                    // 组织支付单数据
+                    $paymentData = array(
+                        'trade_no' => $superlinkInfo['superlink_alipay_no'],  // 支付单号（支付宝单号）
+                        'money' => $paymentAmount,                            // 支付金额
+                        'pay_time' => $payTime,                                // 支付时间
+                        'pay_bn' => $payBn,                                    // 支付方式
+                        'paycost' => 0,                                        // 支付手续费
+                        'account' => '',                                       // 支付账号
+                        'bank' => '',                                          // 银行
+                        'pay_account' => '',                                   // 支付账户
+                        'paymethod' => '',                                      // 支付方法
+                        'memo' => '产地优选超链订单支付',                       // 备注
+                        'op_name' => isset($this->_ordersdf['payment_detail']['op_name']) 
+                            ? $this->_ordersdf['payment_detail']['op_name'] 
+                            : $this->__channelObj->channel['node_type'],
+                    );
+                    
+                    // 添加到 payments 数组
+                    $this->_ordersdf['payments'][] = $paymentData;
+                }
+            }
+        }
     }
 
         /**
@@ -784,7 +1306,6 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
             //$plugins[] = 'orderextend'; //公共类中已经定义
             $plugins[] = 'orderdetial';
         }
-        
         return $plugins;
     }
 
@@ -817,14 +1338,16 @@ class erpapi_shop_matrix_tmall_response_order extends erpapi_shop_response_order
         if($this->_ordersdf['cn_info']['asdp_biz_type'] == 'aox' || $this->_ordersdf['cn_info']['logistics_agreement']['asdp_biz_type'] == 'aox'){
             $plugins[] = 'orderextend';
         }
-        
         return $plugins;
     }
 
     protected function get_update_components()
     {
         $components = array('markmemo','custommemo','marktype','oversold');
-
+        if($this->_tgOrder['is_delivery'] == 'N') {
+            $components[] = 'master';
+            $components[] = 'items';
+        }
         $rs = app::get('ome')->model('order_extend')->getList('extend_status',array('order_id'=>$this->_tgOrder['order_id']));
         // 如果ERP收货人信息未发生变动时，则更新淘宝收货人信息
         if ($rs[0]['extend_status'] != 'consignee_modified') {