|
@@ -1192,6 +1192,23 @@ class Dhorder
|
|
|
$zhongshen = date('Y-m-d H:i',$v1['cdate']);
|
|
|
}
|
|
|
}
|
|
|
+ $name = '';
|
|
|
+ if($v['type'] == 1){
|
|
|
+ $goods = Dever::db('goods/info')->find(array('id'=>$v['type_id']));
|
|
|
+ if($goods){
|
|
|
+ $name = $goods['name'];
|
|
|
+ }
|
|
|
+ }elseif($v['type'] == 2){
|
|
|
+ $goods = Dever::db('card/info')->find(array('id'=>$v['type_id']));
|
|
|
+ if($goods){
|
|
|
+ $name = $goods['name'];
|
|
|
+ }
|
|
|
+ }elseif($v['type'] == 3){
|
|
|
+ $goods = Dever::db('setting/prize')->find(array('id'=>$v['type_id']));
|
|
|
+ if($goods){
|
|
|
+ $name = $goods['name'];
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
$goods_status = Dever::db('agent/dh_order')->config['status'];
|
|
|
$status = Dever::status($goods_status, $v['status']);
|
|
@@ -1204,7 +1221,7 @@ class Dhorder
|
|
|
isset($address['contact']) ? $address['contact'] : '',
|
|
|
isset($address['mobile']) ? $address['mobile'] : '',
|
|
|
(isset($res['address_info']) ? $res['address_info'] : '').(isset($address['house_number']) ? $address['house_number'] : ''),
|
|
|
- $v['name'],
|
|
|
+ $name,
|
|
|
$v['num'],
|
|
|
$v['price'],
|
|
|
$status,
|
|
@@ -1228,23 +1245,6 @@ class Dhorder
|
|
|
foreach($data as $k => $v){
|
|
|
$member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
|
|
|
$role = Dever::db('setting/role')->find(array('id'=>$member['role']));
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
$d = array
|
|
|
(
|
|
|
$v['name'],
|