|
@@ -30,8 +30,6 @@ class ROrder extends MongoAr
|
|
|
public $price; //订单金额
|
|
|
|
|
|
public $final_price; //订单使用代金券之后的金额 如果没有使用代金券 $final_price=$price
|
|
|
-
|
|
|
- public $precedence = 0;//是否加急
|
|
|
|
|
|
public $coupons=array();//订单使用的代金券 数据库设计可以支持多张
|
|
|
|
|
@@ -57,9 +55,8 @@ class ROrder extends MongoAr
|
|
|
public $technician = ''; // 接单保洁师,user的id
|
|
|
public $technician_name = ''; // 接单保洁师姓名
|
|
|
|
|
|
- public $address = array(); //收货地址信息 包含 province city area position detail name mobile position
|
|
|
+ public $address = array(); //地址信息 包含 province city area position detail name mobile position
|
|
|
|
|
|
- public $third_platform_info = array(); // array() 第三方平台拓展字段,用于保存第三方平台相关信息,如平台支付ID等
|
|
|
|
|
|
public static $order_filter = array(
|
|
|
0 => array('name' => '未选择'),
|
|
@@ -129,7 +126,6 @@ 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['precedence'] = CommonFn::get_val_if_isset($row,'precedence',0);
|
|
|
$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);
|
|
@@ -235,19 +231,7 @@ class ROrder extends MongoAr
|
|
|
$newRow['coupons']=CommonFn::$empty;
|
|
|
}
|
|
|
|
|
|
- $append_orders = array();
|
|
|
- if(isset($row['append_orders'])&&is_array($row['append_orders'])){
|
|
|
- foreach ($row['append_orders'] as $a_order) {
|
|
|
- $a_order_obj = AppendOrder::get($a_order);
|
|
|
- if(!$a_order_obj || $a_order_obj->status != 1){
|
|
|
- continue;
|
|
|
- }
|
|
|
- $newRow['sum_price'] += $a_order_obj->price;
|
|
|
- $newRow['af_sum_price'] += $a_order_obj->price;
|
|
|
- $append_orders[] = $a_order_obj->parseRow($a_order_obj);
|
|
|
- }
|
|
|
- }
|
|
|
- $newRow['append_orders'] = $append_orders;
|
|
|
+
|
|
|
if(!isset($newRow['coupons'])||empty($newRow['coupons'])){
|
|
|
$newRow['coupons']=CommonFn::$empty;
|
|
|
}
|