|
|
@@ -3032,7 +3032,7 @@ class Customer extends Start_Controller {
|
|
|
$fdata = $this->customer->find_all($where.$wid,'email,shop','time desc');
|
|
|
foreach ($fdata as $key=>$value)
|
|
|
{
|
|
|
- $d = $this->fullorder->find_all('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0 and extra_status = 0 ','orderinfo,state,product,shipremarks,name,email,country,dtime,shouldmoney','time desc');
|
|
|
+ $d = $this->fullorder->find_all('email = "'.$value['email'].'" and shop = "'.$value['shop'].'" and mergeid = 0 and extra_status = 0 ','orderinfo,state,extra_price,product,shipremarks,name,email,country,dtime,shouldmoney','time desc');
|
|
|
if($nu == 2)
|
|
|
{
|
|
|
if(count($d) > 1)
|
|
|
@@ -3056,6 +3056,18 @@ class Customer extends Start_Controller {
|
|
|
$emailpass = $this->setting->get_excelpass($v['email']);
|
|
|
$v['email'] = $emailpass;
|
|
|
}
|
|
|
+
|
|
|
+ $product_ids = "";
|
|
|
+ if(!empty($v['extra_price'])){
|
|
|
+ $extra_price = json_decode($v['extra_price'],true);
|
|
|
+ foreach($extra_price as $key=>$item){
|
|
|
+ if(!empty($item['product_id'])){
|
|
|
+ $product_ids .= $item['product_id'].";";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $v['extra_price'] = $product_ids;
|
|
|
+
|
|
|
$info_list[] = $v;
|
|
|
}
|
|
|
}
|
|
|
@@ -3081,11 +3093,23 @@ class Customer extends Start_Controller {
|
|
|
$emailpass = $this->setting->get_excelpass($v['email']);
|
|
|
$v['email'] = $emailpass;
|
|
|
}
|
|
|
+
|
|
|
+ $product_ids = "";
|
|
|
+ if(!empty($v['extra_price'])){
|
|
|
+ $extra_price = json_decode($v['extra_price'],true);
|
|
|
+ foreach($extra_price as $key=>$item){
|
|
|
+ if(!empty($item['product_id'])){
|
|
|
+ $product_ids .= $item['product_id'].";";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $v['extra_price'] = $product_ids;
|
|
|
+
|
|
|
$info_list[] = $v;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- $fzh = "<td>订单号</td><td>订单状态</td><td>产品名</td><td>仓库品名</td><td>客户名</td><td>客户邮箱</td><td>客户国家</td><td>下单时间</td><td>订单金额</td>";
|
|
|
+ $fzh = "<td>订单号</td><td>订单状态</td><td>产品ID</td><td>产品名</td><td>仓库品名</td><td>客户名</td><td>客户邮箱</td><td>客户国家</td><td>下单时间</td><td>订单金额</td>";
|
|
|
$title = "老客户订单列表";
|
|
|
}
|
|
|
$titlename = "<table border=1>
|