|
@@ -369,11 +369,11 @@ class StoreOrderController
|
|
|
return app('json')->successful(StoreOrder::getUserOrderSearchList($request->uid(), $type, $page, $limit, $search));
|
|
|
}
|
|
|
|
|
|
- public function gift($id, Request $request)
|
|
|
+ public function gift($uni, Request $request)
|
|
|
{
|
|
|
- list($uid) = UtilService::postMore([['uid', 0]]);
|
|
|
+ list($uid) = UtilService::postMore([['uid', 0]], $request);
|
|
|
if (!$uid) return app('json')->fail('请选择要赠送的用户');
|
|
|
- if (!\app\admin\model\order\StoreOrder::where('id', $id)
|
|
|
+ if (!\app\admin\model\order\StoreOrder::where('unique', $uni)
|
|
|
->where('uid', $uid)
|
|
|
->where('refund_status', 0)
|
|
|
->where('paid', 1)
|
|
@@ -385,7 +385,7 @@ class StoreOrderController
|
|
|
->where('gift_uid', 0)
|
|
|
->find()
|
|
|
) return app('json')->fail('订单错误');
|
|
|
- $res = StoreOrder::where('id', $id)->update(['gift_uid' => $uid]);
|
|
|
+ $res = StoreOrder::where('unique', $uni)->update(['gift_uid' => $uid]);
|
|
|
if ($res) return app('json')->fail('赠送成功');
|
|
|
else return app('json')->fail('赠送失败');
|
|
|
}
|