1

app/admin/controller/Store.php

@@ -406,17 +406,17 @@ class Store extends Controller
                 }
                 $goods_ids = array_column($goods_list->toArray(), "goods_id");
                 // 分批每次导入20条
-                $limit = 200;
-                // 根据商品总数量计算需要的队列任务数量
-                $jobCount = \count($goods_ids) / $limit;
-                // 逐次发布队列任务
-                for ($i = 0; $i < $jobCount; $i++) {
-                    $data = array_slice($goods_ids, $i * $limit, $limit);
-                    GoodsRealDeleteJob::dispatch([
-                            'list' => $data,
-                        ]);
+                // $limit = 200;
+                // // 根据商品总数量计算需要的队列任务数量
+                // $jobCount = \count($goods_ids) / $limit;
+                // // 逐次发布队列任务
+                // for ($i = 0; $i < $jobCount; $i++) {
+                //     $data = array_slice($goods_ids, $i * $limit, $limit);
+                //     GoodsRealDeleteJob::dispatch([
+                //             'list' => $data,
+                //         ]);
                     
-                }
+                // }
 
                 //删除商品sku
                 GoodsSku::whereIn('goods_id', $goods_ids)->delete();

app/api/controller/Dealer.php

@@ -63,7 +63,7 @@ class Dealer extends Controller
     {
         $dealer = $this->dealer;
         if (!$dealer) {
-            return $this->renderError('您没有购买分销会员');
+            return $this->renderError('您还没有成为服务商');
         }
         $dealer = $dealer->toArray();
         $dealer['update_time'] = date("Y-m-d", strtotime($dealer['update_time']));

app/api/controller/Invite.php

@@ -15,6 +15,7 @@ use app\common\model\UploadFile;
 use app\common\model\dealer\Setting;
 use app\store\model\User;
 use app\store\model\user\GradeLog;
+use app\store\model\dealer\User;
 
 class Invite extends Controller
 {
@@ -184,6 +185,21 @@ class Invite extends Controller
                 'create_time' => time(),
             ];
             GradeLog::create($gradeLog);
+
+            if (!DealerUserModel::isDealerUser($this->user['user_id'])) {
+                // 新增分销商用户
+                $model = new UserModel();
+                $mobile = $model->where(['user_id' => $this->user['user_id']])->value('mobile');
+                DealerUserModel::add($this->user['user_id'], [
+                    'real_name' => $mobile,
+                    'mobile' => $mobile,
+                    'store_id' => $storeId,
+                ]);
+            } else {
+                //更新分销用户
+                DealerUserModel::update(['is_delete' => 0], ['user_id' => $this->user['user_id']]);
+            }
+            
             return $this->renderSuccess('升级成功');
         }
                     

app/api/controller/Region copy.php

@@ -1,52 +0,0 @@
-<?php
-// +----------------------------------------------------------------------
-// | 萤火商城系统 [ 致力于通过产品和服务，帮助商家高效化开拓市场 ]
-// +----------------------------------------------------------------------
-// | Copyright (c) 2017~2023 https://www.yiovo.com All rights reserved.
-// +----------------------------------------------------------------------
-// | Licensed 这不是一个自由软件，不允许对程序代码以任何形式任何目的的再发行
-// +----------------------------------------------------------------------
-// | Author: 萤火科技 <admin@yiovo.com>
-// +----------------------------------------------------------------------
-declare (strict_types=1);
-
-namespace app\api\controller;
-
-use app\api\model\Region as RegionModel;
-use think\response\Json;
-
-/**
- * 地区管理
- * Class Region
- * @package app\api\controller
- */
-class Region extends Controller
-{
-    /**
-     * 获取所有地区
-     * @return Json
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function all(): Json
-    {
-        $list = RegionModel::getCacheAll();
-        return $this->renderSuccess(compact('list'));
-    }
-
-    /**
-     * 获取所有地区(树状)
-     * @return Json
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
-    public function tree(): Json
-    {
-        $model = new RegionModel();
-        $list = $model->getNewTreeList();
-        //$list = array_values($list);
-        return $this->renderSuccess(compact('list'));
-    }
-}