|
@@ -1107,6 +1107,19 @@ class OrderCreate
|
|
|
$orderData['status'] = Order::STATUS_UNPAID;
|
|
|
$orderData['platform'] = request()->header('platform');
|
|
|
|
|
|
+ //直播间id
|
|
|
+ $orderData['room_id'] = 0;
|
|
|
+ $orderData['room_log_id'] = 0;
|
|
|
+ $room_log_id = request()->param('room_log_id',0);
|
|
|
+ if($room_log_id){
|
|
|
+ $room_id = Db::name('live_room_log')->where('id',$room_log_id)->value('room_id');
|
|
|
+ if($room_id){
|
|
|
+ $orderData['room_id'] = $room_id;
|
|
|
+ $orderData['room_log_id'] = $room_log_id;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
$ext = $result['promo_infos'] ? ['promo_infos' => $result['promo_infos']] : []; // 促销活动信息
|
|
|
if ($this->activity['activity']) {
|
|
|
$rules = $this->activity['activity']['rules'];
|
|
@@ -1198,6 +1211,9 @@ class OrderCreate
|
|
|
$orderItem->comment_status = 0;
|
|
|
$orderItem->refund_status = 0;
|
|
|
|
|
|
+ $orderItem->room_id = $orderData['room_id'];
|
|
|
+ $orderItem->room_log_id = $orderData['room_log_id'];
|
|
|
+
|
|
|
$ext = [
|
|
|
'original_dispatch_amount' => $buyInfo['original_dispatch_amount'], // 原始运费总金额(未判断活动的,并且也未合并相同运费模板商品的原始运费)
|
|
|
'promo_discount_fee' => bcadd($buyInfo['promo_discount_fee'], $buyInfo['dispatch_discount_fee'], 2), // 促销优惠,包含满包邮
|