|
@@ -10,6 +10,17 @@ class ROrderController extends AdminController{
|
|
|
$channels = CommonFn::getComboboxData($channel_option, 100, true, 100);
|
|
|
|
|
|
|
|
|
+ // 服务信息
|
|
|
+ $criteria_main = new EMongoCriteria();
|
|
|
+ $criteria_main->status('==', 1);
|
|
|
+ $cursor_main = Product::model()->findAll($criteria_main);
|
|
|
+ $rows_main = CommonFn::getRowsFromCursor($cursor_main);
|
|
|
+ $main_row = array();
|
|
|
+ foreach($rows_main as $row){
|
|
|
+ $ids = (string)$row['_id'];
|
|
|
+ $main_row[$ids] = array('name' =>$row['name']);
|
|
|
+ }
|
|
|
+ $main_products = CommonFn::getComboboxData($main_row, 100, true, 100);
|
|
|
// 服务点信息
|
|
|
$criteria_station = new EMongoCriteria();
|
|
|
$cursor = Station::model()->findAll($criteria_station);
|
|
@@ -27,6 +38,7 @@ class ROrderController extends AdminController{
|
|
|
|
|
|
$this->render('index', array(
|
|
|
'status' => $status,
|
|
|
+ 'main_products'=> $main_products,
|
|
|
'channels' => $channels,
|
|
|
'station' => $station,
|
|
|
'type' => $type
|
|
@@ -486,10 +498,11 @@ class ROrderController extends AdminController{
|
|
|
$channel = Yii::app()->request->getParam('channel', '');
|
|
|
$booking_time = Yii::app()->request->getParam('booking_time_add', '');
|
|
|
$order_time = Yii::app()->request->getParam('order_time_add', '');
|
|
|
+ $main_products = Yii::app()->request->getParam('main_products', '');
|
|
|
$price = Yii::app()->request->getParam('price', 0);
|
|
|
$final_price = Yii::app()->request->getParam('final_price', 0);
|
|
|
$status = Yii::app()->request->getParam('status', -3);
|
|
|
- $station = Yii::app()->request->getParam('station', '5548b05e0eb9fbc5728b51ea');
|
|
|
+ $station = Yii::app()->request->getParam('station', '57db39709f5160bb048b456a');
|
|
|
// --------- 地址信息 ---------
|
|
|
$mobile = Yii::app()->request->getParam('mobile', 0);
|
|
|
$latitude = Yii::app()->request->getParam('latitude', 0);
|
|
@@ -499,6 +512,8 @@ class ROrderController extends AdminController{
|
|
|
$area = Yii::app()->request->getParam('area', '');
|
|
|
$poi_name = Yii::app()->request->getParam('poi_name', '');
|
|
|
$detail = Yii::app()->request->getParam('detail', '');
|
|
|
+ $extra = Yii::app()->request->getParam('extra',array());
|
|
|
+ $extra = json_decode($extra);
|
|
|
|
|
|
// 数据完整性检查
|
|
|
// 2015-11-02 因存在赠送订单,删除金额的数据检查 : $price == 0 || $final_price == 0 ||
|
|
@@ -540,7 +555,21 @@ class ROrderController extends AdminController{
|
|
|
// 支付渠道
|
|
|
$pay_channel = $channel;
|
|
|
|
|
|
-
|
|
|
+ // 服务数据整合
|
|
|
+ $products[] = array(
|
|
|
+ 'product' => new MongoId($main_products),
|
|
|
+ 'count' => 1,
|
|
|
+ 'extra' =>$extra
|
|
|
+ );
|
|
|
+ if (!empty($box)) {
|
|
|
+ foreach ($box as $key => $value) {
|
|
|
+ $products[] = array(
|
|
|
+ 'product' => new MongoId($value),
|
|
|
+ 'count' => 1,
|
|
|
+ 'extra' =>$extra
|
|
|
+ );
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
// 地址数据整合
|
|
|
$address = array(
|
|
@@ -574,6 +603,7 @@ class ROrderController extends AdminController{
|
|
|
$rOrder->channel = $channel;
|
|
|
$rOrder->booking_time = intval($booking_time);
|
|
|
$rOrder->order_time = intval($order_time);
|
|
|
+ $rOrder->products = $products;
|
|
|
$rOrder->price = intval($price);
|
|
|
$rOrder->final_price = intval($final_price);
|
|
|
//$rOrder->precedence = intval($precedence);
|
|
@@ -588,7 +618,7 @@ class ROrderController extends AdminController{
|
|
|
$rOrder->address = $address;
|
|
|
$rOrder->pay_channel = $pay_channel;
|
|
|
|
|
|
- $addROrder_arr = array('channel', 'booking_time', 'order_time', 'price', 'final_price', 'precedence', 'coupons', 'user', 'status', 'memo', 'remark', 'type', 'have_comment', 'station', 'address', 'pay_channel');
|
|
|
+ $addROrder_arr = array('channel', 'booking_time', 'order_time', 'price','products', 'final_price', 'precedence', 'coupons', 'user', 'status', 'memo', 'remark', 'type', 'have_comment', 'station', 'address', 'pay_channel');
|
|
|
$success = $rOrder->save(true, $addROrder_arr);
|
|
|
|
|
|
CommonFn::requestAjax($success, '', array());
|