|
@@ -769,7 +769,7 @@ class Manage
|
|
|
$shop[$v['type_id']] = 0;
|
|
|
}
|
|
|
|
|
|
- $order_goods = Dever::db('shop/buy_order_goods')->select(array('order_id' => $v['id']));
|
|
|
+ $order_goods = Dever::db('shop/buy_order_goods')->select(array('order_id' => $v['id'], 'status' => 1));
|
|
|
$c_price = 0;
|
|
|
foreach($order_goods as $k1 => $v1){
|
|
|
$goods = Dever::load('goods/lib/info')->getPayInfo($v1['goods_id'], $v1['sku_id']);
|
|
@@ -780,6 +780,9 @@ class Manage
|
|
|
}
|
|
|
}
|
|
|
$price = ($v['price'] + $v['record_cash'] - $c_price);
|
|
|
+ if ($price < 0) {
|
|
|
+ $price = 0;
|
|
|
+ }
|
|
|
$total += $price;
|
|
|
$shop[$v['type_id']] += $price * $per;
|
|
|
$shop[$v['type_id']] = round($shop[$v['type_id']], 2);
|