float

www/protected/modules/o2o/controllers/MyOrderController.php

@@ -140,5 +140,33 @@ class MyOrderController extends CController {
         $success = $order_obj->save();
         O2oApp::response($success, '保存失败，请重试', []);
     }
+    /**
+     * 用户签字保洁师确认完成
+     */
+    public function actionTechComplete() {
+        $order = Yii::app()->request->getParam('order', '');
+        $user  = intval(Yii::app()->request->getParam('user', 0));
+        $url = Yii::app()->request->getParam('o2oImage', '');
+        if (!CommonFn::isMongoId($order) || $user == 0) {
+            O2oApp::response(false, '订单或用户不存在', []);
+        }
+
+        $order_obj = ROrder::get(new MongoId($order));
+        $flag = false;
+        foreach($order_obj->technicians as $data){
+            if ($user == $data['technician_id']) {
+                $flag = true;break;
+            }
+        }
+        if (!$order_obj || !$flag) {
+            O2oApp::response(false, '用户或订单ID错误', []);
+        }
+
+        $order_obj->signUrl = $url;
+        $order_obj->status = 6;
+        $success = $order_obj->save();
+        O2oApp::response($success, '保存失败，请重试', []);
+    }
+
 
 }

www/protected/modules/o2o/controllers/OrderController.php

@@ -31,7 +31,7 @@ class  OrderController extends O2oBaseController{
             //}
         }
         //双十一活动暂用  start 判断用户是否购买过
-        $doubleEleventId = '581fe5a6a84ea0e36c8b45bb';
+      /*  $doubleEleventId = '581fe5a6a84ea0e36c8b45bb';
         if($products[0]['product'] == $doubleEleventId) {
             $criteria_user = new EMongoCriteria();
             $criteria_user->user('==', new MongoId($user_id));
@@ -63,7 +63,7 @@ class  OrderController extends O2oBaseController{
             }
 
 
-        }
+        }*/
 
         //end
 
@@ -110,7 +110,7 @@ class  OrderController extends O2oBaseController{
             $o2o_address['poi'] = isset($address['address']['poi'])?$address['address']['poi']:array();
         }
         $product_list = array();
-        $price = 0;
+        $price = 0.0;
         $service_type = 0;
         foreach ($products as $product) {
             if(isset($product['product_id']) && $product['count'] >= 1){
@@ -182,7 +182,7 @@ class  OrderController extends O2oBaseController{
         $order->price = $price;
         $order->channel = $order_channel;
         $order->counts = $counts;
-        $order->final_price = ceil($final_price*100)/100;
+        $order->final_price = $final_price;
         $order->pay_price = $order->final_price-$balance;
         $order->address = $o2o_address;
         $order->memo = $memo;

www/protected/modules/o2o/models/ROrder.php

@@ -30,9 +30,9 @@ class ROrder extends MongoAr
     public $price;  //订单金额
 
     public $final_price;  //订单使用代金券之后的金额  如果没有使用代金券   $final_price=$price
-
     public $pay_price;//订单最终支付的金额  price-coupons-用户要支付的余额
 
+    public $signUrl;//签字图片链接 上传到七牛
     public $coupons=array();//订单使用的代金券  数据库设计可以支持多张
     
     public $coupon_type;
@@ -157,11 +157,11 @@ class ROrder extends MongoAr
 
 
         $newRow['sum_price'] = 0;
-        $newRow['price'] = CommonFn::get_val_if_isset($row,'price',0);
+        $newRow['price'] = floatval(CommonFn::get_val_if_isset($row,'price',0));
 
         $newRow['af_sum_price'] = $newRow['price'];
-        $newRow['final_price'] = intval(CommonFn::get_val_if_isset($row,'final_price',0));
-        $newRow['pay_price'] = CommonFn::get_val_if_isset($row,'pay_price',$newRow['final_price']);
+        $newRow['final_price'] = floatval(CommonFn::get_val_if_isset($row,'final_price',0));
+        $newRow['pay_price'] = floatval(CommonFn::get_val_if_isset($row,'pay_price',$newRow['final_price']));
         $newRow['sum_price'] = $newRow['final_price'];
         $newRow['memo'] = CommonFn::get_val_if_isset($row,'memo','');
         $newRow['remark'] = CommonFn::get_val_if_isset($row,'remark','');