|
@@ -1160,6 +1160,22 @@ class Dhorder
|
|
|
return 'ok';
|
|
|
}
|
|
|
*/
|
|
|
+ public function goodsd_api($id){
|
|
|
+ $name = '';
|
|
|
+ $goods = Dever::db('agent/dh_order_goods')->state(array('order_id'=>$id));
|
|
|
+ foreach($goods as $k1 => $v1){
|
|
|
+ $goods_info[] = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
|
|
|
+ }
|
|
|
+
|
|
|
+ if(isset($goods_info)){
|
|
|
+ foreach($goods_info as $v2){
|
|
|
+ $goods_name[] = $v2['name'];
|
|
|
+
|
|
|
+ }
|
|
|
+ $name = implode(',',$goods_name);
|
|
|
+ }
|
|
|
+ return $name;
|
|
|
+ }
|
|
|
|
|
|
public function out_dhorder_api($data){
|
|
|
$header = array('订单编号', '会员姓名', '会员等级', '会员手机号', '收货姓名(或自提人)', '联系电话', '收货地址', '商品名称', '商品数量', '商品原价','订单状态','下单时间', '付款时间','完成时间','卖家订单备注','权益发放时间','代理商终审时间');
|
|
@@ -1194,17 +1210,7 @@ class Dhorder
|
|
|
}
|
|
|
$name = '';
|
|
|
if($v['type'] == 1){
|
|
|
- $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)){
|
|
|
- foreach($goods_info as $v2){
|
|
|
- $goods_name[] = $v2['name'];
|
|
|
- }
|
|
|
- $name = implode(',',$goods_name);
|
|
|
- }
|
|
|
+ $name = $this->goodsd_api($v['id']);
|
|
|
}elseif($v['type'] == 2){
|
|
|
$goods = Dever::db('card/info')->find(array('id'=>$v['type_id']));
|
|
|
if($goods){
|