|
|
@@ -76,7 +76,6 @@ class Sale extends Base
|
|
|
$is_stock=$ct['is_stock'];
|
|
|
$spuCode = $ct['spuCode'];
|
|
|
$skuCode = $ct['skuCode'];
|
|
|
-
|
|
|
$is_activity= isset($this->post['is_activity'])&&$this->post['is_activity']!=="" ?$this->post['is_activity']:"";
|
|
|
$actcode= isset($this->post['act_code'])&&$this->post['act_code']!=="" ?trim($this->post['act_code']):"";
|
|
|
if($order_type==1){
|
|
|
@@ -144,7 +143,7 @@ class Sale extends Base
|
|
|
"demo_fee"=>$ct['demo_fee'],
|
|
|
"good_num"=>$good_num,
|
|
|
"good_type"=>$goodtype,
|
|
|
- "order_type"=>$order_type,
|
|
|
+ "order_type"=>$is_stock==1?1:2,
|
|
|
'send_way'=>2
|
|
|
|
|
|
];
|
|
|
@@ -1252,7 +1251,7 @@ class Sale extends Base
|
|
|
"demo_fee"=>$good['demo_fee'],
|
|
|
"good_num"=>$data['good_num'],
|
|
|
"good_type"=>1,
|
|
|
- "order_type"=>2,
|
|
|
+ "order_type"=>$good['is_stock']==1?1:2,
|
|
|
'send_way'=>2
|
|
|
];
|
|
|
if($good['is_stock']==0) {
|
