Merge remote-tracking branch 'origin/dev' into dev

app/common/repositories/store/order/StoreOrderRepository.php

@@ -11740,7 +11740,7 @@ class StoreOrderRepository extends BaseRepository
             /** @var StoreCartRepository $storeCartRepository */
             $storeCartRepository = app()->make(StoreCartRepository::class);
             $storeCartEntity = $storeCartRepository->getCartEntityListByUidAndProductIdList($storeOrderEntity->getUid(), [90619]);
-            if (!empty($storeCartEntityList)) {
+            // if (!empty($storeCartEntity)) {
                 $xfbData = [
                     'uid' => $sharedProsperityUserEntity->getUserId(),
                     'before' => 0,
@@ -11753,7 +11753,7 @@ class StoreOrderRepository extends BaseRepository
                     'type' => 1,
                     'addtime' => time()
                 ];
-            }
+            // }
             /** @var UserSignXfbRepository $xfbRepository */
             $xfbRepository = app()->make(UserSignXfbRepository::class);
             $xfbRepository->create($xfbData);

app/common/repositories/user/UserSignXfbRepository.php

@@ -3,18 +3,12 @@
 namespace app\common\repositories\user;
 
 use app\common\dao\user\UserDao;
-use app\common\dao\user\UserSignVrDao;
-use app\common\enum\user\UserSignVrEnum;
+use app\common\model\user\UserSignXfb;
 use app\common\repositories\BaseRepository;
-use app\common\repositories\store\order\StoreOrderRepository;
-use app\entity\data\user\UserEntity;
-use app\entity\data\user\UserSignVrEntity;
-use think\db\exception\DbException;
-use think\exception\ValidateException;
 
 class UserSignXfbRepository extends BaseRepository
 {
-    public function __construct(UserSignVrDao $dao)
+    public function __construct(UserSignXfb $dao)
     {
         $this->dao = $dao;
     }