Merge branch 'refs/heads/dev' into dev-sc-260204

app/common/repositories/shared/SharedProsperityUserRepository.php

@@ -5,6 +5,7 @@ namespace app\common\repositories\shared;
 use app\common\dao\shared\SharedProsperityUserDao;
 use app\common\repositories\BaseRepository;
 use app\entity\data\shared\SharedProsperityUserEntity;
+use think\db\exception\DbException;
 
 class SharedProsperityUserRepository extends BaseRepository
 {
@@ -61,4 +62,57 @@ class SharedProsperityUserRepository extends BaseRepository
         $entity = SharedProsperityUserEntity::newInstance($result);
         return $entity;
     }
+
+    /**
+     * @param $id
+     * @param $data
+     * @return int
+     */
+    public function update($id, $data): int
+    {
+        try {
+            return $this->dao->update($id, $data);
+        } catch (DbException $e) {
+            return 0;
+        }
+    }
+
+    /**
+     * @param SharedProsperityUserEntity $sharedProsperityUserEntity
+     * @return SharedProsperityUserEntity
+     */
+    public function updateByEntity(SharedProsperityUserEntity $sharedProsperityUserEntity): SharedProsperityUserEntity
+    {
+        if (empty($sharedProsperityUserEntity->getId())) {
+            return SharedProsperityUserEntity::newInstance();
+        }
+        $result = $this->update($sharedProsperityUserEntity->getId(), $sharedProsperityUserEntity->toUnderlineArray());
+        if ($result > 0) {
+            return $this->getSharedProsperityUserEntityByUserId($sharedProsperityUserEntity->getUserId());
+        }
+        return SharedProsperityUserEntity::newInstance();
+    }
+
+    /**
+     * 绑定 上级
+     * @param int $userId
+     * @param int $parentId
+     * @return bool
+     */
+    public function bindParentId(int $userId, int $parentId): bool
+    {
+        $sharedProsperityUserEntity = $this->getSharedProsperityUserEntityByUserId($userId);
+        if (empty($sharedProsperityUserEntity->getUserId())) {
+            return false;
+        }
+        $sharedProsperityUserEntityByParentId = $this->getSharedProsperityUserEntityByUserId($parentId);
+        if (empty($sharedProsperityUserEntityByParentId->getUserId())) {
+            return false;
+        }
+        $sharedProsperityUserEntity = $this->updateByEntity($sharedProsperityUserEntity->setParentId($sharedProsperityUserEntityByParentId->getUserId()));
+        if (empty($sharedProsperityUserEntity->getId())) {
+            return false;
+        }
+        return true;
+    }
 }

app/controller/api/Auth.php

@@ -17,6 +17,7 @@ use app\common\model\user\User;
 use app\common\model\user\UserCertification;
 use app\common\repositories\merchant\order\OrderGzcRepository;
 use app\common\repositories\merchant\order\OrderMerchantRepository;
+use app\common\repositories\shared\SharedProsperityUserRepository;
 use app\common\repositories\store\order\StoreGroupOrderRepository;
 use app\common\repositories\store\order\StoreOrderRepository;
 use app\common\repositories\store\order\StoreOrderStatusRepository;
@@ -27,6 +28,7 @@ use app\common\repositories\wechat\RoutineQrcodeRepository;
 use app\common\repositories\wechat\WechatUserRepository;
 use app\controller\api\user\Volunteer;
 use app\controller\api\util\Signature;
+use app\entity\data\shared\SharedProsperityUserEntity;
 use app\models\routine\RoutineQrcode;
 use app\traits\GongApiRequest;
 use app\traits\GzcApiRequest;
@@ -541,6 +543,18 @@ class Auth extends BaseController
         }
         // Log::info($data);
         $user = $repository->registr($data['phone'], $data['password'],'APP',"","",1,$data['spread']);
+
+            // 注意创建完用户后 需要立马创建 共富体系 用户数据
+            /** @var SharedProsperityUserRepository $sharedProsperityUserRepository */
+            $sharedProsperityUserRepository = app()->make(SharedProsperityUserRepository::class);
+            $sharedProsperityUserEntity = $sharedProsperityUserRepository->createByEntity(
+                SharedProsperityUserEntity::newInstance()
+                    ->setUserId($user->uid)
+            );
+            if (!empty($data['spread']) && !empty($sharedProsperityUserEntity->getUserId())) {
+                $sharedProsperityUserRepository->bindParentId((int)$sharedProsperityUserEntity->getUserId(), (int)$data['spread']);
+            }
+
         // $repository->registr($data['phone'], $data['password'],'APP',$data['spread']);
         $repository->addagent($user);
         $user = $repository->mainUser($user);