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

app/common/repositories/agreement/AgreementRepository.php

@@ -23,6 +23,11 @@ class AgreementRepository extends BaseRepository
         return Db::name("user_agreement")->where(['agreement_id'=>$id])->find();
     }
 
+    /*详情*/
+    public function getDetailContent($id){
+        return Db::name("user_agreement")->where(['agreement_id' => $id])->find()['content'] ?? '';
+    }
+
     /*修改*/
     public function updateData($id,$data){
         return Db::name("user_agreement")

app/controller/admin/agreement/Agreement.php

@@ -42,5 +42,11 @@ class Agreement extends BaseController
         return app("json")->success($this->repository->updateData($id,$data));
     }
 
-
+    /*详情*/
+    public function  detailContent($id){
+        if ($id != 13) {
+            return '';
+        }
+        return $this->repository->getDetailContent($id);
+    }
 }

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

@@ -40,7 +40,7 @@ class Taskorderguquan
          * 13231658486周军市场补贴400
          * 13331043787张吉良65
          * 15332507711 张传莲 50
-         * 18715313601大饼200
+         * 18715313601大饼100
          */
         $data = [
             '13231658486' => 700,
@@ -63,7 +63,7 @@ class Taskorderguquan
             '13381085923' => 50,
             '13331043787' => 65,
             '15332507711' => 50,
-            '18715313601' => 200
+            '18715313601' => 100
         ];
 
         $result = Db::name("user")

app/traits/GzcApiRequest.php

@@ -56,7 +56,11 @@ trait GzcApiRequest
      */
     public static function checkAmount($user)
     {
-        $cardType = $user['card_type'] ? $user['card_type'] : 10;
+        Log::info('用户实名信息：' . json_encode($user));
+        $cardType = $user['card_type'];
+        if ($user['card_type'] == 2) {
+            $cardType = '10';
+        }
         $cxbData = [
             'platformNo' => env('GZC.PLATFORM_NO'),
             'appNo' => env('GZC.APP_NO'),
@@ -87,8 +91,6 @@ trait GzcApiRequest
 
         $amount = $cxbResponseData['extendData']['amount'] + $xfbResponseData['extendData']['amount'];
         return $amount;
-
-
     }
     public function getAmountFromGzc()
     {
@@ -107,17 +109,18 @@ trait GzcApiRequest
             return app('json')->fail('查询失败（第三方异常）');
         }
 
-        if (!is_array($res) || ($res['code'] ?? -1) !== 0) {
-            return app('json')->fail($res['message'] ?? '查询失败');
-        }
-
-        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? 0;
-        $amount = floatval($amountCents) * 0.01;
+        // 提取 amount（兼容多种字段位置）
+        $amountCents = $res['extendData']['amount'] ?? $res['data']['amount'] ?? $res['amount'] ?? null;
+        $amount = $amountCents === null ? 0.0 : floatval($amountCents) * 0.01;
         $formatted = sprintf('%.2f', $amount);
 
+        // 从 checkAmount 返回的 debug（若存在）
+        $debug = $res['debug'] ?? null;
+
+        // 返回 amount 与 debug 给调用方（前端 / 调试）
         return app('json')->success([
             'amount' => $formatted,
-            'debug'  => $res['debug'] ?? null,
+            'debug'  => $debug
         ]);
     }
     /**

route/admin.php

@@ -2,6 +2,8 @@
 
 use think\facade\Route;
 
+Route::get('agreement/detailContent/:id', 'admin.agreement.Agreement/detailContent');
+
 Route::group(config('admin.admin_prefix'), function () {
     Route::miss(function () {
         $DB = DIRECTORY_SEPARATOR;