更新
This commit is contained in:
parent
ea3a3dadc4
commit
7281120afe
@ -592,7 +592,9 @@ class StoreOtherOrderCreateRepository extends StoreOrderRepository
|
|||||||
'mark' => $mark[$merchantCart['mer_id']] ?? '',
|
'mark' => $mark[$merchantCart['mer_id']] ?? '',
|
||||||
'coupon_price' => bcadd($merchantCart['order']['coupon_price'], $merchantCart['order']['platform_coupon_price'], 2),
|
'coupon_price' => bcadd($merchantCart['order']['coupon_price'], $merchantCart['order']['platform_coupon_price'], 2),
|
||||||
'platform_coupon_price' => $merchantCart['order']['platform_coupon_price'],
|
'platform_coupon_price' => $merchantCart['order']['platform_coupon_price'],
|
||||||
'pay_type' => $pay_type
|
'pay_type' => $pay_type,
|
||||||
|
'paid'=>1,
|
||||||
|
'pay_time'=>date('Y-m-d H:i:s',time()),
|
||||||
];
|
];
|
||||||
$allUseCoupon = array_merge($allUseCoupon, $merchantCart['order']['useCouponIds']);
|
$allUseCoupon = array_merge($allUseCoupon, $merchantCart['order']['useCouponIds']);
|
||||||
$orderList[] = $_order;
|
$orderList[] = $_order;
|
||||||
|
@ -164,7 +164,11 @@ class StoreOrder extends BaseController
|
|||||||
$addressId,
|
$addressId,
|
||||||
$post
|
$post
|
||||||
);
|
);
|
||||||
halt($data);
|
if($data){
|
||||||
|
return app('json')->success('创建成功', $data);
|
||||||
|
}else{
|
||||||
|
return app('json')->error('创建失败', $data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user