Merge branch 'dev-sxb' into dev-sxb-01

app/controller/api/Auth.php

@@ -2926,4 +2926,16 @@ class Auth extends BaseController
 
         return app('json')->success($userTokens);
     }
+
+    /**
+     * @return mixed
+     * @author 史晨
+     * @date 2025/11/3 09:22
+     * 注册是否显示邀请码
+     */
+    public function isInviteCode()
+    {
+        $data['show'] = 0;
+        return app('json')->success($data);
+    }
 }

app/controller/api/douhuomall/Take.php

@@ -108,8 +108,13 @@ class Take
             }
 
             // 5、将 未同步到的商品 进行下架
+            sort($spu_id_list);
+            sort($goods_id_list);
             $goodsIds = array_diff($spu_id_list, $goods_id_list);
-            $this->remove($goodsIds);
+            if (!empty($goodsIds)) {
+                Db::name('log')->insert(['data' => '供应链拉取数据下架商品记录：' . json_encode(['spu_id_list' => $spu_id_list, 'goods_id_list' => $goods_id_list, 'goodsIds' => $goodsIds])]);
+                $this->remove($goodsIds);
+            }
 
             return 'sussess';
         } catch (Exception $e) {

route/api.php

@@ -641,6 +641,8 @@ Route::group('api/', function () {
 
     //非强制登录
     Route::group(function () {
+        // 注册是否显示邀请码
+        Route::get('isInviteCode', 'api.Auth/isInviteCode');
         // 将 所有用户 令牌设置为失效
         Route::get('invalidateAllTokens', 'api.Auth/invalidateAllTokens');