|
@@ -756,7 +756,7 @@ class Checkout extends BaseService
|
|
|
'order_source' => $this->orderSource['source'],
|
|
'order_source' => $this->orderSource['source'],
|
|
|
'order_source_id' => $this->orderSource['source_id'],
|
|
'order_source_id' => $this->orderSource['source_id'],
|
|
|
'points_bonus' => $order['pointsBonus'],
|
|
'points_bonus' => $order['pointsBonus'],
|
|
|
- 'order_status' => OrderStatusEnum::NORMAL,
|
|
|
|
|
|
|
+ 'order_status' => OrderStatusEnum::NORMAL,
|
|
|
'store_id' => $this->storeId,
|
|
'store_id' => $this->storeId,
|
|
|
];
|
|
];
|
|
|
if ($order['delivery'] == DeliveryTypeEnum::EXPRESS) {
|
|
if ($order['delivery'] == DeliveryTypeEnum::EXPRESS) {
|
|
@@ -783,14 +783,14 @@ class Checkout extends BaseService
|
|
|
'user_id' => $this->user['user_id'],
|
|
'user_id' => $this->user['user_id'],
|
|
|
'store_id' => $this->storeId,
|
|
'store_id' => $this->storeId,
|
|
|
'goods_id' => $goods['goods_id'],
|
|
'goods_id' => $goods['goods_id'],
|
|
|
- 'goods_name' => $goods['goods_name'],
|
|
|
|
|
- 'image_id' => $goods['images'][0]['image_id'],
|
|
|
|
|
|
|
+ 'goods_no' => $goods['goods_no'] ?: '',
|
|
|
|
|
+ 'image_id' => (int)current($goods['goods_images'])['file_id'],
|
|
|
'deduct_stock_type' => $goods['deduct_stock_type'],
|
|
'deduct_stock_type' => $goods['deduct_stock_type'],
|
|
|
'spec_type' => $goods['spec_type'],
|
|
'spec_type' => $goods['spec_type'],
|
|
|
'goods_sku_id' => $goods['skuInfo']['goods_sku_id'],
|
|
'goods_sku_id' => $goods['skuInfo']['goods_sku_id'],
|
|
|
- 'goods_props' => $goods['skuInfo']['goods_props'],
|
|
|
|
|
- 'content' => $goods['content'],
|
|
|
|
|
- 'goods_sku_no' => $goods['skuInfo']['goods_sku_no'],
|
|
|
|
|
|
|
+ 'goods_props' => $goods['skuInfo']['goods_props'] ?: '',
|
|
|
|
|
+ 'content' => $goods['content'] ?? '',
|
|
|
|
|
+ 'goods_sku_no' => $goods['skuInfo']['goods_sku_no'] ?: '',
|
|
|
'goods_price' => $goods['skuInfo']['goods_price'],
|
|
'goods_price' => $goods['skuInfo']['goods_price'],
|
|
|
'line_price' => $goods['skuInfo']['line_price'],
|
|
'line_price' => $goods['skuInfo']['line_price'],
|
|
|
'goods_weight' => $goods['skuInfo']['goods_weight'],
|
|
'goods_weight' => $goods['skuInfo']['goods_weight'],
|