Merge branch 'dev'

app/controller/api/store/merchant/Merchant.php

@@ -228,8 +228,6 @@ class Merchant extends BaseController
             $hasProductMerIdList = array_column($hasProductMerIdList->toArray(), 'mer_id');
         }
         $query = Db::name('merchant')->where($where);
-        $page = 1;
-        $limit = 100;
         if (!empty($hasProductMerIdList) && is_array($hasProductMerIdList)) {
             $query->whereIn('mer_id', $hasProductMerIdList);
         }

app/traits/GzcApiRequest.php

@@ -87,6 +87,8 @@ trait GzcApiRequest
 
         $amount = $cxbResponseData['extendData']['amount'] + $xfbResponseData['extendData']['amount'];
         return $amount;
+
+
     }
     public function getAmountFromGzc()
     {
@@ -105,18 +107,17 @@ trait GzcApiRequest
             return app('json')->fail('查询失败（第三方异常）');
         }
 
-        // 提取 amount（兼容多种字段位置）
-        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? null;
-        $amount = $amountCents === null ? 0.0 : floatval($amountCents) * 0.01;
-        $formatted = sprintf('%.2f', $amount);
+        if (!is_array($res) || ($res['code'] ?? -1) !== 0) {
+            return app('json')->fail($res['message'] ?? '查询失败');
+        }
 
-        // 从 checkAmount 返回的 debug（若存在）
-        $debug = $res['debug'] ?? null;
+        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? 0;
+        $amount = floatval($amountCents) * 0.01;
+        $formatted = sprintf('%.2f', $amount);
 
-        // 返回 amount 与 debug 给调用方（前端 / 调试）
         return app('json')->success([
             'amount' => $formatted,
-            'debug'  => $debug
+            'debug'  => $res['debug'] ?? null,
         ]);
     }
     /**