|
|
@@ -17,6 +17,7 @@ use app\common\model\user\User;
|
|
17
|
17
|
use app\common\model\user\UserCertification;
|
|
18
|
18
|
use app\common\repositories\merchant\order\OrderGzcRepository;
|
|
19
|
19
|
use app\common\repositories\merchant\order\OrderMerchantRepository;
|
|
|
20
|
+use app\common\repositories\product\ShareRepository;
|
|
20
|
21
|
use app\common\repositories\shared\SharedProsperityUserRepository;
|
|
21
|
22
|
use app\common\repositories\store\order\StoreGroupOrderRepository;
|
|
22
|
23
|
use app\common\repositories\store\order\StoreOrderRepository;
|
|
|
@@ -55,6 +56,7 @@ use think\db\exception\ModelNotFoundException;
|
|
55
|
56
|
use think\Env;
|
|
56
|
57
|
use think\Exception;
|
|
57
|
58
|
use think\exception\HttpResponseException;
|
|
|
59
|
+use think\exception\ValidateException;
|
|
58
|
60
|
use think\facade\Cache;
|
|
59
|
61
|
use think\facade\Db;
|
|
60
|
62
|
use think\facade\Log;
|
|
|
@@ -504,7 +506,7 @@ class Auth extends BaseController
|
|
504
|
506
|
// $repository->insterUser(16328, 14395);
|
|
505
|
507
|
|
|
506
|
508
|
// return "=====";
|
|
507
|
|
- $data = $this->request->params(['phone', 'sms_code', 'spread', 'password',"spread_phone","type","mer_id"]);
|
|
|
509
|
+ $data = $this->request->params(['phone', 'sms_code', 'spread', 'password',"spread_phone","type","mer_id", 'share_id']);
|
|
508
|
510
|
// $lockKey = 'lock:register:' . $data['phone'];
|
|
509
|
511
|
// $redis = \think\facade\Cache::store('redis')->handler();
|
|
510
|
512
|
// $acquired = $redis->set($lockKey, 1, ['nx', 'ex' => 15]);
|
|
|
@@ -533,6 +535,17 @@ class Auth extends BaseController
|
|
533
|
535
|
$user = $repository->accountByUser($data['phone']);
|
|
534
|
536
|
if ($user)
|
|
535
|
537
|
return app('json')->fail('手机号已存在');
|
|
|
538
|
+
|
|
|
539
|
+ if (!empty($data['share_id'])) {
|
|
|
540
|
+ /** @var ShareRepository $shareRepository */
|
|
|
541
|
+ $shareRepository = app()->make(ShareRepository::class);
|
|
|
542
|
+ $shareEntity = $shareRepository->getShareEntityByShareId($data['share_id']);
|
|
|
543
|
+ if (empty($shareEntity->getId())) {
|
|
|
544
|
+ throw new ValidateException('无效的分享信息');
|
|
|
545
|
+ }
|
|
|
546
|
+ $data['spread'] = $shareEntity->getUid();
|
|
|
547
|
+ }
|
|
|
548
|
+
|
|
536
|
549
|
if ($data["spread_phone"]){
|
|
537
|
550
|
$spread_user = $repository->accountByUser($data['spread_phone']);
|
|
538
|
551
|
if ($spread_user ){
|