|
@@ -222,10 +222,9 @@ class GoodsService extends BaseService
|
|
|
* @param $orderNo 订单号
|
|
* @param $orderNo 订单号
|
|
|
* @return array|false
|
|
* @return array|false
|
|
|
*/
|
|
*/
|
|
|
- public function getOrderGoods($ids, $goods, $userId, $orderNo='')
|
|
|
|
|
|
|
+ public function getOrderGoods($ids, $goods, $userId, $orderNo='', $discountPoint=0)
|
|
|
{
|
|
{
|
|
|
// 用户信息
|
|
// 用户信息
|
|
|
- $discountPoint = 0;
|
|
|
|
|
if(empty($orderNo)){
|
|
if(empty($orderNo)){
|
|
|
$userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
|
|
$userInfo = MemberModel::where(['id' => $userId, 'mark' => 1])
|
|
|
->select(['id','openid', 'discount_point', 'status'])
|
|
->select(['id','openid', 'discount_point', 'status'])
|