|
|
@@ -2841,6 +2841,10 @@ class Goodup extends Base
|
|
|
// if($good_zixun_list[$value['spuCode']]['is_gold_price']==1&&$param['is_fixed']==1){
|
|
|
// return error_show(1004," {$good_zixun_list[$value['spuCode']]['good_name']}商品使用实时金价，不可使用一口价！");
|
|
|
// }
|
|
|
+ $bd=[];
|
|
|
+ if($good_zixun_list[$value['spuCode']]['order_source']==2 ||$good_zixun_list[$value['spuCode']]['order_source']==3){
|
|
|
+ $bd = Db::name('consult_bids')->where(['spuCode'=> $value['spuCode']])->findOrEmpty();
|
|
|
+ }
|
|
|
//改变编码规则，将原来的skuCode后两位换成序列号
|
|
|
//str_pad字符串填充
|
|
|
$skuCode = makeNo("SN");
|
|
|
@@ -2896,9 +2900,9 @@ class Goodup extends Base
|
|
|
'packing_weight' => '',
|
|
|
'good_bar' => '',
|
|
|
'supply_area' => $good_zixun_list[$value['spuCode']]['supply_area'],
|
|
|
- 'delivery_place' => '',
|
|
|
- 'origin_place' => '',
|
|
|
- 'delivery_day' => 0,
|
|
|
+ 'delivery_place' =>$bd['delivery_place']??"",
|
|
|
+ 'origin_place' =>$bd['origin_place']??'',
|
|
|
+ 'delivery_day' => $bd['delivery_day']??'',
|
|
|
'lead_time' => '',
|
|
|
'sample_day' => '',
|
|
|
'sample_fee' => '',
|
|
|
@@ -2964,9 +2968,9 @@ class Goodup extends Base
|
|
|
'packing_weight' => '',
|
|
|
'good_bar' => '',
|
|
|
'supply_area' => $good_zixun_list[$value['spuCode']]['supply_area'],
|
|
|
- 'delivery_place' => '',
|
|
|
- 'origin_place' => '',
|
|
|
- 'delivery_day' => '',
|
|
|
+ 'delivery_place' =>$bd['delivery_place']??'',
|
|
|
+ 'origin_place' =>$bd['origin_place']??'',
|
|
|
+ 'delivery_day' => $bd['delivery_day']??'',
|
|
|
'lead_time' => '',
|
|
|
'sample_day' => '',
|
|
|
'sample_fee' => '',
|
|
|
@@ -3002,7 +3006,7 @@ class Goodup extends Base
|
|
|
}
|
|
|
|
|
|
//good_spec
|
|
|
- if (!empty($good_zixun_list[$value['spuCode']]['specinfo'])) {
|
|
|
+ if ($good_zixun_list[$value['spuCode']]['specinfo']!=='') {
|
|
|
|
|
|
$spec_list = json_decode($good_zixun_list[$value['spuCode']]['specinfo'], true);
|
|
|
|
