|
|
@@ -225,6 +225,7 @@ class GoodsService extends BaseService
|
|
|
public function getOrderGoods($ids, $goods, $userId, $orderNo='')
|
|
|
{
|
|
|
// 用户信息
|
|
|
+ $discountPoint = 0;
|
|
|
if(empty($orderNo)){
|
|
|
$userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
|
|
|
->select(['id','openid', 'discount_point', 'status'])
|
|
|
@@ -244,9 +245,6 @@ class GoodsService extends BaseService
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
$list = $this->model->whereIn('id', $ids)
|
|
|
->where(['status'=>1,'mark'=>1])
|
|
|
->select(['id as goods_id','goods_name','category_id','store_id','delivery_fee','sku_type','price','stock','unit','weight','thumb','sku_type'])
|
