|
@@ -588,6 +588,13 @@ class Fullorderexcel extends Start_Controller {
|
|
|
$feq = str_replace('product_id,',"extra_price as product_id,",$feq);
|
|
$feq = str_replace('product_id,',"extra_price as product_id,",$feq);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ //添加订单前缀
|
|
|
|
|
+ $shopqz_list = [];
|
|
|
|
|
+ if(strpos($feq,'shopqz') != false){
|
|
|
|
|
+ $feq = str_replace('shopqz,',"shop as shopqz,",$feq);
|
|
|
|
|
+ $shop_list = $this->shop->find_all("1 = 1","id,shortname");
|
|
|
|
|
+ $shopqz_list = array_column($shop_list,'shortname','id');
|
|
|
|
|
+ }
|
|
|
$tt_cate_one = [];
|
|
$tt_cate_one = [];
|
|
|
$tt_cate_two = [];
|
|
$tt_cate_two = [];
|
|
|
if($sj == 'fullordertt'){
|
|
if($sj == 'fullordertt'){
|
|
@@ -773,6 +780,9 @@ class Fullorderexcel extends Start_Controller {
|
|
|
$info_list[$key]['rowtotal'] = $tmp_sub_str;
|
|
$info_list[$key]['rowtotal'] = $tmp_sub_str;
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
+ if(isset($value['shopqz'])){
|
|
|
|
|
+ $info_list[$key]['shopqz'] = isset($shopqz_list[$value['shopqz']])?$shopqz_list[$value['shopqz']]:'';
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
if(isset($value['dbapinocc'])){
|
|
if(isset($value['dbapinocc'])){
|
|
|
|
|
|