平台后台-财务-财务操作-公正处入账明细-导出-增加字段

app/common/model/merchant/order/OrderGzc.php

@@ -12,6 +12,7 @@ namespace app\common\model\merchant\order;
 
 use app\common\model\BaseModel;
 use app\common\model\user\User;
+use app\common\model\user\UserBill;
 
 class OrderGzc extends BaseModel
 {
@@ -31,4 +32,8 @@ class OrderGzc extends BaseModel
         return $this->hasOne(User::class, 'uid', 'uid');
     }
 
+    public function bill()
+    {
+        return $this->hasOne(UserBill::class, 'bill_id', 'link_id');
+    }
 }

app/common/repositories/merchant/order/OrderGzcRepository.php

@@ -51,7 +51,7 @@ class OrderGzcRepository extends BaseRepository
         // 导出
         $is_excel = request()->param('is_excel', 0);
         if ($is_excel == 1) {
-            $data = $query->with('user')->select()->toArray();
+            $data = $query->with(['user', 'bill'])->select()->toArray();
 
             $arr = [];
             if (!empty($data)) {
@@ -69,8 +69,8 @@ class OrderGzcRepository extends BaseRepository
                 ];
 
                 foreach ($data as $gzcData) {
-                    if (!empty($gzcData['link_id'])) {
-                        $orderTypeMap[$gzcData['order_type']][$gzcData['link_id']] = $gzcData['id'];
+                    if (!empty($gzcData['link_id']) && !empty($gzcData['bill'])) {
+                        $orderTypeMap[$gzcData['bill']['type_shop']][$gzcData['bill']['link_id']] = $gzcData['id'];
                     }
                 }