|
@@ -241,22 +241,16 @@ class ROrderController extends AdminController{
|
|
|
$orders = ROrder::model()->findAll($criteria);
|
|
|
$orderId = '';
|
|
|
$fin_price = 0;
|
|
|
- $t =0;
|
|
|
foreach ($orders as $value) {
|
|
|
$orderId .= (string)$value->_id.',';
|
|
|
- echo $value->final_price;
|
|
|
$fin_price += $value->final_price*0.5;
|
|
|
- $t += $value->final_price;
|
|
|
}
|
|
|
- echo $t*0.5;
|
|
|
- echo $fin_price;
|
|
|
- var_dump(number_format($fin_price,2));
|
|
|
- exit;
|
|
|
+
|
|
|
$orderId = rtrim(trim($orderId),',');
|
|
|
if ($status == -2){
|
|
|
if ($remark == '1'){
|
|
|
//已出发 已上门 订单
|
|
|
- $res = self::feedbackOrder(1,$order->OrderNo,$orderId,number_format($fin_price,2));
|
|
|
+ $res = self::feedbackOrder(1,$order->OrderNo,$orderId,$fin_price);
|
|
|
} else {
|
|
|
$res = self::feedbackOrder(1,$order->OrderNo,$orderId,0);
|
|
|
}
|