|
@@ -1194,9 +1194,12 @@ class Dhorder
|
|
|
}
|
|
|
$name = '';
|
|
|
if($v['type'] == 1){
|
|
|
- $goods = Dever::db('goods/info')->find(array('id'=>$v['type_id']));
|
|
|
- if($goods){
|
|
|
- $name = $goods['name'];
|
|
|
+ $goods = Dever::db('agent/dh_order_goods')->state(array('order_id'=>$v['id']));
|
|
|
+ foreach($goods as $k1 => $v1){
|
|
|
+ $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
|
|
|
+ }
|
|
|
+ if(isset($goods_info)){
|
|
|
+ $name = $goods_info['name'];
|
|
|
}
|
|
|
}elseif($v['type'] == 2){
|
|
|
$goods = Dever::db('card/info')->find(array('id'=>$v['type_id']));
|
|
@@ -1209,7 +1212,7 @@ class Dhorder
|
|
|
$name = $goods['name'];
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
$goods_status = Dever::db('agent/dh_order')->config['status'];
|
|
|
$status = Dever::status($goods_status, $v['status']);
|
|
|
$d = array
|