完成了基本调整调整

server-tp6/app/store/controller/Partners.php

@@ -3,6 +3,7 @@ declare (strict_types=1);
 
 namespace app\store\controller;
 
+use app\common\model\qyt\Enterprise as EnterpriseModel;
 use app\store\controller\Controller;
 use app\store\model\Partners as PartnersModel;
 use app\store\model\partners\Order as OrderModel;
@@ -40,15 +41,47 @@ class Partners extends Controller
         $newList = [];
         $OrderModel = new OrderModel();
         $date = date("Y-m-d");
+        // 企油通企业：口径与下单时 Enterprise::resolve 一致（绑定且启用 -> 用绑定的；否则 -> 默认企业）
+        $bindIds = array_filter(array_map('intval', array_column($list['data'], 'qyt_enterprise_id')));
+        $enterprises = $bindIds
+            ? array_column(EnterpriseModel::whereIn('enterprise_id', $bindIds)
+                ->field('enterprise_id,company_name,passageway,is_enable')->select()->toArray(), null, 'enterprise_id')
+            : [];
+        $default = EnterpriseModel::getDefault();
         foreach ($list['data'] as $val){
             $val['day_money'] =$OrderModel->getOrderTotalPrice($date, $date, $val);
             $val['total_money'] =$OrderModel->getOrderTotalPrice(null, null, $val);
+            $val = array_merge($val, $this->enterpriseInfo((int)$val['qyt_enterprise_id'], $enterprises, $default));
             $newList[] = $val;
         }
         $list['data'] = $newList;
         return $this->renderSuccess(['list'=>$list,'user'=>$this->store['user']]);
     }
 
+    /**
+     * 合作商实际使用的企油通企业
+     * qyt_enterprise_source：bind 绑定 / default 未绑定走默认 / invalid 绑定的企业已停用或删除（实际走默认）/ none 无可用企业
+     */
+    private function enterpriseInfo(int $bindId, array $enterprises, $default): array
+    {
+        $bound = $bindId > 0 ? ($enterprises[$bindId] ?? null) : null;
+        if ($bound && (int)$bound['is_enable'] === 1) {
+            $source = 'bind';
+            $use = $bound;
+        } else {
+            $source = $bindId > 0 ? 'invalid' : 'default';
+            $use = $default ? $default->toArray() : null;
+            !$use && $source = $bindId > 0 ? 'invalid' : 'none';
+        }
+        return [
+            'qyt_enterprise_source'  => $source,
+            // 绑定失效时也把原绑定企业名带出来，便于排查
+            'qyt_bind_name'          => $bound['company_name'] ?? '',
+            'qyt_enterprise_name'    => $use['company_name'] ?? '',
+            'qyt_enterprise_channel' => isset($use['passageway']) ? ($use['passageway'] === 'pingan' ? '平安银行' : '支付宝企业码') : '',
+        ];
+    }
+
     /**
      * 获取所有商户
      * @return mixed