diff --git a/app/admin/logic/shop/LocalStoreLogic.php b/app/admin/logic/shop/LocalStoreLogic.php index 3d1b754a..ae16b809 100755 --- a/app/admin/logic/shop/LocalStoreLogic.php +++ b/app/admin/logic/shop/LocalStoreLogic.php @@ -124,7 +124,6 @@ class LocalStoreLogic extends Logic public static function exportOrderData($filter) { $today = date('Y-m-d H:i:s', strtotime('today 02:00:00')); - try { $localStoreOrder = new LocalStoreOrder(); @@ -135,6 +134,7 @@ class LocalStoreLogic extends Logic $localStoreOrder->where($last_where)->update(['is_export' => 2]); $l_where[] = ['lso.is_checkout', '=', 1]; + $l_where[] = ['lso.state', '=', 1]; $l_where[] = ['lso.create_time', '<=', $today]; $l_where[] = ['lso.is_export', '=', 1]; $result = LocalStoreOrder::alias('lso')->where($l_where)->limit(1)->select()->toArray(); @@ -157,6 +157,7 @@ class LocalStoreLogic extends Logic ->toArray(); } else { $where[] = ['lso.is_checkout', '=', 0]; + $where[] = ['lso.state', '=', 1]; $where[] = ['lso.create_time', '<=', $today]; $where[] = ['lso.is_export', '=', 0]; // 获取导出结果的数据集 @@ -187,7 +188,7 @@ class LocalStoreLogic extends Logic $v['large_number'] = $v['large_number'] . ' '; if ($v['local_our_company'] == 1) { - $v['shopName'] = '东龙汇'; + $v['shopName'] = '东龙汇(浙江)电子商务有限公司'; } else if ($v['payment_type'] == 2) { $res = LocalStore::where('lstore_id', $v['lstore_id'])->field('bank_user_name')->find(); $v['shopName'] = $res['bank_user_name'];