|
@@ -1899,6 +1899,16 @@ 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');
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
$typeclass_lpdl = [];
|
|
$typeclass_lpdl = [];
|
|
|
//料品大类
|
|
//料品大类
|
|
|
if(strpos($feq,'lpdl')!= false){
|
|
if(strpos($feq,'lpdl')!= false){
|
|
@@ -2135,6 +2145,9 @@ class Fullorderexcel extends Start_Controller {
|
|
|
}
|
|
}
|
|
|
$info_list[$key]['lhdycc'] = trim($tmp_lhdycc_str,"<br>") ;
|
|
$info_list[$key]['lhdycc'] = trim($tmp_lhdycc_str,"<br>") ;
|
|
|
}
|
|
}
|
|
|
|
|
+ if(isset($value['shopqz'])){
|
|
|
|
|
+ $info_list[$key]['shopqz'] = isset($shopqz_list[$value['shopqz']])?$shopqz_list[$value['shopqz']]:'';
|
|
|
|
|
+ }
|
|
|
if(isset($value['product_id'])){
|
|
if(isset($value['product_id'])){
|
|
|
$tmp_product_id = "";
|
|
$tmp_product_id = "";
|
|
|
$product_ids = json_decode($value['product_id'],true);
|
|
$product_ids = json_decode($value['product_id'],true);
|