|
@@ -245,7 +245,7 @@ class GoodsService extends BaseService
|
|
|
if($list){
|
|
if($list){
|
|
|
$skus = GoodsSkuModel::whereIn('goods_id', $ids)->select(['id','sku_name','price','stock'])->get()->keyBy('id');
|
|
$skus = GoodsSkuModel::whereIn('goods_id', $ids)->select(['id','sku_name','price','stock'])->get()->keyBy('id');
|
|
|
$skus = $skus?$skus->toArray() :[];
|
|
$skus = $skus?$skus->toArray() :[];
|
|
|
- $result = ['store_id'=>0,'discount_total'=>0,'delivery_fee'=>0,'goods_total'=>0,'order_total'=>0,'count'=>0,'goods'=>[]];
|
|
|
|
|
|
|
+ $result = ['store_id'=>0,'discount_total'=>0.00,'delivery_fee'=>0.00,'goods_total'=>0,'order_total'=>0,'count'=>0,'goods'=>[]];
|
|
|
foreach ($list as $item){
|
|
foreach ($list as $item){
|
|
|
$item['order_no'] = $orderNo;
|
|
$item['order_no'] = $orderNo;
|
|
|
$id = isset($item['goods_id'])?$item['goods_id']:0;
|
|
$id = isset($item['goods_id'])?$item['goods_id']:0;
|