|
@@ -633,8 +633,8 @@ abstract class OrderSettledService extends BaseService
|
|
|
'product_sku_id' => isset($product['product_sku']['product_sku_id'])? $product['product_sku']['product_sku_id'] : $product['product_sku_id'],
|
|
'product_sku_id' => isset($product['product_sku']['product_sku_id'])? $product['product_sku']['product_sku_id'] : $product['product_sku_id'],
|
|
|
'product_attr' => isset($product['product_sku']['product_attr'])? $product['product_sku']['product_attr'] : '默认',
|
|
'product_attr' => isset($product['product_sku']['product_attr'])? $product['product_sku']['product_attr'] : '默认',
|
|
|
'content' => $product['content'],
|
|
'content' => $product['content'],
|
|
|
- 'product_no' => $product['product_sku']['product_no'],
|
|
|
|
|
- 'product_price' => $product['product_sku']['product_price'],
|
|
|
|
|
|
|
+ 'product_no' => $product['spec_type']==20? $product['product_sku']['product_no'] : 'P00'.$product['product_id'],
|
|
|
|
|
+ 'product_price' => $product['spec_type']==20? $product['product_sku']['product_price'] : $product['product_price'],
|
|
|
'line_price' => $product['product_sku']['line_price'],
|
|
'line_price' => $product['product_sku']['line_price'],
|
|
|
'product_weight' => $product['product_sku']['product_weight'],
|
|
'product_weight' => $product['product_sku']['product_weight'],
|
|
|
'is_user_grade' => (int)$product['is_user_grade'],
|
|
'is_user_grade' => (int)$product['is_user_grade'],
|