Kirin 2 years ago
parent
commit
c6ab8708b1

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

@@ -9,6 +9,7 @@ namespace app\admin\model\order;
 
 use app\admin\model\system\SystemStore;
 use app\admin\model\system\SystemStorePoint;
+use app\models\store\StoreSeparateAccountRecord;
 use crmeb\basic\BaseModel;
 use crmeb\traits\ModelTrait;
 use think\facade\Route as Url;
@@ -234,6 +235,11 @@ HTML;
                 $item['_status'] = 7;
             }
             $item['_store_order'] = $item['store_order'] ? "后台下单" : "前台下单";
+            $item['separate'] = StoreSeparateAccountRecord::with('user')->where('order_id', $item['id'])->select();
+            $item['separate_info'] = '';
+            foreach ($item['separate'] as $iyyy) {
+                $item['separate_info'] .= $iyyy['user']['nickname'] . '(' . $iyyy['uid'] . ')' . ':' . $iyyy['money'] . '元,' . $iyyy['notice'] . ';';
+            }
         }
         if (isset($where['excel']) && $where['excel'] == 1) {
             self::SaveExcel($data);
@@ -330,12 +336,13 @@ HTML;
                 $item['status_name'],
                 $item['add_time'],
                 $item['time_area'],
+                $item['separate_info'],
                 $item['mark']
             ];
         }
         PHPExcelService::setExcelHeader(['订单号', '订单类型', '收货人姓名', '收货人电话', '收货地址', '门店', '自提点', '商品信息',
             '总价格', '实际支付', '邮费', '配送费', '合计', '押金', '已退押金', '使用积分',
-            '优惠金额', '支付状态', '支付时间', '订单状态', '下单时间', '送达时间', '用户备注'])
+            '优惠金额', '支付状态', '支付时间', '订单状态', '下单时间', '送达时间', '分账情况', '用户备注'])
             ->setExcelTile('订单导出' . date('YmdHis', time()), '订单信息' . time(), ' 生成时间:' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)
             ->ExcelSave();

+ 7 - 1
app/models/store/StoreSeparateAccountRecord.php

@@ -2,13 +2,14 @@
 
 namespace app\models\store;
 
+use app\models\user\User;
 use crmeb\services\UtilService;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 
 class StoreSeparateAccountRecord extends BaseModel
 {
-	/**
+    /**
      * 数据表主键
      * @var string
      */
@@ -21,4 +22,9 @@ class StoreSeparateAccountRecord extends BaseModel
     protected $name = 'store_separate_account_record';
 
     use ModelTrait;
+
+    public function user()
+    {
+        return self::hasOne(User::class, 'uid', 'uid')->field('uid,nickname');
+    }
 }