|
|
@@ -40,7 +40,6 @@ class ROrder extends MongoAr
|
|
|
public $status=0;//订单状态 0=>待支付 1=>已支付 2=>已处理 3=>已接单 4=>已出发 5=>已上门 6=>已完成 -1=>已取消 -2=>已退款
|
|
|
|
|
|
public $memo = '';//用户备注
|
|
|
-
|
|
|
public $remark = '';//后台备注
|
|
|
|
|
|
public $type = 0;//订单类型
|
|
|
@@ -126,6 +125,8 @@ class ROrder extends MongoAr
|
|
|
$newRow['channel'] = CommonFn::get_val_if_isset($row,'channel','wx_pub');
|
|
|
$newRow['type'] = CommonFn::get_val_if_isset($row,'type','');
|
|
|
|
|
|
+ $newRow['counts'] = CommonFn::get_val_if_isset($row,'counts',1);
|
|
|
+
|
|
|
$newRow['booking_time'] = CommonFn::get_val_if_isset($row,'booking_time',0);
|
|
|
$newRow['order_time'] = CommonFn::get_val_if_isset($row,'order_time',0);
|
|
|
$newRow['have_comment'] = CommonFn::get_val_if_isset($row,'have_comment',0);
|
|
|
@@ -153,7 +154,6 @@ class ROrder extends MongoAr
|
|
|
$newRow['price'] = CommonFn::get_val_if_isset($row,'price',0);
|
|
|
$newRow['final_price'] = intval(CommonFn::get_val_if_isset($row,'final_price',0));
|
|
|
$newRow['sum_price'] = $newRow['final_price'];
|
|
|
- $newRow['af_sum_price'] = $newRow['price'];
|
|
|
$newRow['memo'] = CommonFn::get_val_if_isset($row,'memo','');
|
|
|
$newRow['remark'] = CommonFn::get_val_if_isset($row,'remark','');
|
|
|
|
|
|
@@ -301,7 +301,7 @@ class ROrder extends MongoAr
|
|
|
$where['address.mobile'] = $newRow['address']['mobile'];
|
|
|
$where['status'] = array('$gt'=>0);
|
|
|
|
|
|
- $newRow['order_count'] = $mongo->wozhua_o2o->orders->count($where);
|
|
|
+ $newRow['order_count'] = $mongo->fuwu->orders->count($where);
|
|
|
}else{
|
|
|
$newRow['order_count'] = 0;
|
|
|
}
|
Charlie