|
|
@@ -3279,7 +3279,7 @@ class Sale extends Base
|
|
|
->where(["k.wsm_code" => $value['wsm_code']])->field("k.name as wsm_name,c.name,c.code")->find();
|
|
|
$addr = Db::name("order_addr")->where(["id" => $value['addrid']])->find();
|
|
|
if($addr){
|
|
|
- $addinfo =json_decode($addr['addr_code'],true);
|
|
|
+ $addinfo =$addr['addr_code']!=''?json_decode($addr['addr_code'],true)??$addr['addr_code']: '' ;
|
|
|
if(is_string($addinfo)){
|
|
|
$addinfo=["provice_code"=>'',"city_code"=>'',"area_code"=>''];
|
|
|
list($addinfo['provice_code'],$addinfo['city_code'],$addinfo['area_code']) = explode(",",$addr['addr_code']);
|
|
|
@@ -3330,6 +3330,14 @@ class Sale extends Base
|
|
|
}
|
|
|
$int = isset($goodinfo['cat_id']) && $goodinfo['cat_id'] != 0 ? made($goodinfo['cat_id']) : [];
|
|
|
$addr = Db::name("order_addr")->where(["id" => $codeinfo['addrid']])->find();
|
|
|
+ if($addr){
|
|
|
+ $addinfo =$addr['addr_code']!=''?json_decode($addr['addr_code'],true)??$addr['addr_code']: '' ;
|
|
|
+ if(is_string($addinfo)){
|
|
|
+ $addinfo=["provice_code"=>'',"city_code"=>'',"area_code"=>''];
|
|
|
+ list($addinfo['provice_code'],$addinfo['city_code'],$addinfo['area_code']) = explode(",",$addr['addr_code']);
|
|
|
+ }
|
|
|
+ $addr['addr_cn'] =GetAddr(json_encode($addinfo));
|
|
|
+ }
|
|
|
$codeinfo['good_name'] = isset($item['good_name']) ? $item['good_name'] : "";
|
|
|
$codeinfo['good_num'] = isset($item['good_num']) ? $item['good_num'] : "";
|
|
|
$codeinfo['good_code'] = isset($item['good_code']) ? $item['good_code'] : "";
|
|
|
@@ -3337,7 +3345,7 @@ class Sale extends Base
|
|
|
$codeinfo['sale_price'] = isset($item['sale_price']) ? $item['sale_price'] : "";
|
|
|
$codeinfo['total_price'] = isset($item['total_price']) ? $item['total_price'] : "";
|
|
|
$codeinfo['skuCode'] = isset($item['skuCode']) ? $item['skuCode'] : "";
|
|
|
- $codeinfo['addr'] = GetAddr($addr['addr_code']);
|
|
|
+ $codeinfo['addr'] = $addr['addr_cn']??'';
|
|
|
$codeinfo['addr'] .= isset($addr['addr']) ? $addr['addr'] : "";
|
|
|
$codeinfo['addr_code'] = isset($addr['addr_code']) ? $addr['addr_code'] : "";
|
|
|
$codeinfo['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
|
