Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -45,10 +45,6 @@ class CashController extends Frontend
|
|||||||
*/
|
*/
|
||||||
public function withdraw()
|
public function withdraw()
|
||||||
{
|
{
|
||||||
DatabaseRoute::getDb('tb_user', 25182, true)->insert([
|
|
||||||
'user_id' => 25182
|
|
||||||
]);
|
|
||||||
$this->success();
|
|
||||||
$amount = $this->request->get('amount');
|
$amount = $this->request->get('amount');
|
||||||
$isAlipay = $this->request->get('isAlipay');
|
$isAlipay = $this->request->get('isAlipay');
|
||||||
$userId = $this->getUserId();
|
$userId = $this->getUserId();
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class DiscSpinningController extends Frontend
|
|||||||
$userInfo = $this->auth->getUser();
|
$userInfo = $this->auth->getUser();
|
||||||
Log::info('抽奖'. json_encode($userInfo));
|
Log::info('抽奖'. json_encode($userInfo));
|
||||||
|
|
||||||
debounce("user:disc-spinning:draw:".$userInfo['user_id'], 1);
|
debounce("user:disc-spinning:interval:limit:user:".$userInfo['user_id'], 2);
|
||||||
$userId = $userInfo['user_id'];
|
$userId = $userInfo['user_id'];
|
||||||
$resp = [];
|
$resp = [];
|
||||||
runWithLock("user:disc-spinning:limit:user:lock:".$this->getUserId(), 60, function () use ($params, $userId, &$resp, $userInfo) {
|
runWithLock("user:disc-spinning:limit:user:lock:".$this->getUserId(), 60, function () use ($params, $userId, &$resp, $userInfo) {
|
||||||
@@ -79,7 +79,6 @@ class DiscSpinningController extends Frontend
|
|||||||
'draws' => $resp
|
'draws' => $resp
|
||||||
]);
|
]);
|
||||||
}catch (DuplicateException $e) {
|
}catch (DuplicateException $e) {
|
||||||
(new TbUserBlacklist())->addBlackUser($userId, "重复抽奖");
|
|
||||||
throw $e;
|
throw $e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ class OrderController extends BaseController
|
|||||||
|
|
||||||
$params = request()->get();
|
$params = request()->get();
|
||||||
$userInfo = $this->auth->getUser();
|
$userInfo = $this->auth->getUser();
|
||||||
debounce('insertCourseOrders'.$userInfo['user_id']);
|
debounce('insertCourseOrders:'.$userInfo['user_id']);
|
||||||
Log::info('生成商品订单信息接口入参为: {}', $params);
|
Log::info('生成商品订单信息接口入参为: {}', $params);
|
||||||
|
|
||||||
self::checkWxBind();
|
self::checkWxBind();
|
||||||
|
|||||||
Reference in New Issue
Block a user