Просмотр исходного кода

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

sunxbiao 1 год назад
Родитель
Сommit
183d9ffaea
1 измененных файлов с 8 добавлено и 3 удалено
  1. 8 3
      app/common/repositories/merchant/order/OrderGzcRepository.php

+ 8 - 3
app/common/repositories/merchant/order/OrderGzcRepository.php

@@ -70,7 +70,8 @@ class OrderGzcRepository extends BaseRepository
70 70
 
71 71
                 foreach ($data as $gzcData) {
72 72
                     if (!empty($gzcData['link_id']) && !empty($gzcData['bill'])) {
73
-                        $orderTypeMap[$gzcData['bill']['type_shop']][$gzcData['bill']['link_id']] = $gzcData['id'];
73
+                        $orderTypeMap[$gzcData['bill']['type_shop']][$gzcData['bill']['link_id']][] = $gzcData['id'];
74
+
74 75
                     }
75 76
                 }
76 77
 
@@ -80,11 +81,15 @@ class OrderGzcRepository extends BaseRepository
80 81
                             $config = $orderMap[$orderType];
81 82
                             $result = Db::table($config['table'])
82 83
                                 ->whereIn($config['pk'], array_keys($map))
84
+                                ->field($config['field'])
83 85
                                 ->select()
84 86
                                 ->toArray();
85 87
                             if (!empty($result)) {
86 88
                                 foreach ($result as $orderData) {
87
-                                    $orderDetailMap[$map[$orderData['order_id']]] = $orderData;
89
+                                    foreach ($map[$orderData['order_id']] as $gzcId) {
90
+                                        $orderData['source'] = $orderMap[$orderType]['name'];
91
+                                        $orderDetailMap[$gzcId] = $orderData;
92
+                                    }
88 93
                                 }
89 94
                             }
90 95
                         }
@@ -108,7 +113,7 @@ class OrderGzcRepository extends BaseRepository
108 113
                         $item['alipay_no'],
109 114
                         $item['wxpay_account'],
110 115
                         $item['wxpay_no'],
111
-                        $orderMap[$item['order_type']]['name'],
116
+                        $orderDetailMap[$item['id']]['source'],
112 117
                         $orderDetailMap[$item['id']]['order_money'],
113 118
                         $orderDetailMap[$item['id']]['commission'],
114 119
                         $item['out_trade_no'],