|
@@ -41,7 +41,7 @@ class Order extends Api
|
|
->join($p,$p.'.id = '.$o.'.package_id','LEFT')
|
|
->join($p,$p.'.id = '.$o.'.package_id','LEFT')
|
|
->where($where)->order($o.'.createtime desc')->autopage()->select();
|
|
->where($where)->order($o.'.createtime desc')->autopage()->select();
|
|
if (!empty($result)) {
|
|
if (!empty($result)) {
|
|
- $statusArr = [2=>'待处理',3=>'已完成',4=>'已取消'];
|
|
|
|
|
|
+ $statusArr = [2=>'已接单',3=>'已完成',4=>'已取消'];
|
|
$paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
|
|
$paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
|
|
$timeArr = ['createtime','cancel_time','finish_time','server_time'];
|
|
$timeArr = ['createtime','cancel_time','finish_time','server_time'];
|
|
foreach ($result as $key => &$value) {
|
|
foreach ($result as $key => &$value) {
|
|
@@ -131,7 +131,7 @@ class Order extends Api
|
|
->join($p,$p.'.id = '.$o.'.package_id','LEFT')
|
|
->join($p,$p.'.id = '.$o.'.package_id','LEFT')
|
|
->where($where)->find();
|
|
->where($where)->find();
|
|
if (!empty($result)) {
|
|
if (!empty($result)) {
|
|
- $statusArr = [2=>'待处理',3=>'已完成',4=>'已取消'];
|
|
|
|
|
|
+ $statusArr = [2=>'已接单',3=>'已完成',4=>'已取消'];
|
|
$paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
|
|
$paytypeArr = [1=>'线下',2=>'余额',3=>'微信'];
|
|
$timeArr = ['createtime','cancel_time','finish_time','server_time'];
|
|
$timeArr = ['createtime','cancel_time','finish_time','server_time'];
|
|
foreach ($timeArr as $k => $v) {
|
|
foreach ($timeArr as $k => $v) {
|