Kirin 2 years ago
parent
commit
a1ec906ee1
2 changed files with 4 additions and 3 deletions
  1. 4 1
      app/admin/model/order/StoreOrder.php
  2. 0 2
      app/models/store/StoreExchangeOrder.php

+ 4 - 1
app/admin/model/order/StoreOrder.php

@@ -100,6 +100,8 @@ class StoreOrder extends BaseModel
             $item['add_time'] = $item['add_time'] ? date('Y-m-d H:i:s', $item['add_time']) : '';
             $item['arrive_time'] = $item['arrive_time'] ? date('Y-m-d H:i:s', $item['arrive_time']) : '';
             $item['back_integral'] = $item['back_integral'] ?: 0;
+            $item['award'] = \app\models\user\UserBill::where('status', 1)->where('link_id', $item['id'])->where('type', 'brokerage')->where('pm', 1)
+                ->sum('money');
             if ($item['pink_id'] || $item['combination_id']) {
                 $pinkStatus = StorePink::where('order_id_key', $item['id'])->value('status');
                 switch ($pinkStatus) {
@@ -338,12 +340,13 @@ HTML;
                 $item['separate_user'],
                 $item['separate_money'],
                 $item['separate_notice'],
+                $item['award'],
                 $item['mark']
             ];
         }
         PHPExcelService::setExcelHeader(['订单号', '订单类型', '收货人姓名', '收货人电话', '收货地址', '门店', '自提点', '商品信息',
             '总价格', '实际支付', '邮费', '配送费', '合计', '押金', '已退押金', '使用积分',
-            '优惠金额', '支付状态', '支付时间', '订单状态', '下单时间', '送达时间', '分账用户', '分账金额', '分账情况', '用户备注'])
+            '优惠金额', '支付状态', '支付时间', '订单状态', '下单时间', '送达时间', '分账用户', '分账金额', '分账情况', '产出佣金', '用户备注'])
             ->setExcelTile('订单导出' . date('YmdHis', time()), '订单信息' . time(), ' 生成时间:' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)
             ->ExcelSave();

+ 0 - 2
app/models/store/StoreExchangeOrder.php

@@ -92,8 +92,6 @@ class StoreExchangeOrder extends BaseModel
             $v['add_time'] = $v['add_time'] ? date('Y-m-d H:i:s', $v['add_time']) : '';
             $v['verify_time'] = $v['verify_time'] ? date('Y-m-d H:i:s', $v['verify_time']) : '';
             $v['gift_time'] = $v['gift_time'] ? date('Y-m-d H:i:s', $v['gift_time']) : '';
-            $v['award'] = UserBill::where('status', 1)->where('type', 'brokerage')->where('pm', 1)
-                ->sum('money');
         }
         if (isset($where['excel']) && $where['excel'] == 1) {
             self::SaveExcel($data);