|
|
@@ -2447,12 +2447,7 @@ class Sale extends Base
|
|
|
}
|
|
|
$item = Db::name("sale")->where(['orderCode' => $codeinfo['orderCode']])->find();
|
|
|
if($item['order_type']==3|| $item['order_type']==4){
|
|
|
-// $good=Db::name("good_zixun")->where(["spuCode"=>$good_code])->find();
|
|
|
-// if($good==false){
|
|
|
-// return error_show(1004,"未找到商品数据");
|
|
|
-// }
|
|
|
-
|
|
|
- $goodinfo = Db::name("consult_bids")->where(["spuCode"=>$item['good_code'],"is_del"=>0])->find();
|
|
|
+ $goodinfo = Db::name("good_zixun")->where(["spuCode"=>$item['good_code'],"is_del"=>0])->find();
|
|
|
if($goodinfo==false){
|
|
|
return error_show(1004,"未找到商品数据");
|
|
|
}
|
|
|
@@ -2475,6 +2470,7 @@ class Sale extends Base
|
|
|
$codeinfo['origin_price'] = isset($item['origin_price']) ? $item['origin_price'] : "";
|
|
|
$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['wsm_name'] = isset($wsmcode['wsm_name']) ? $wsmcode['wsm_name'] : "";
|
|
|
// $codeinfo['wsm_supplier'] = isset($wsmcode['name']) ? $wsmcode['name'] : "";
|
|
|
// $codeinfo['wsm_supplierNo'] = isset($wsmcode['code']) ? $wsmcode['code'] : "";
|
