Merge branch 'dev-gzczuichu' into dev

app/controller/api/user/User.php

@@ -3376,10 +3376,19 @@ class User extends BaseController
         $uid = $this->request->uid();
         $userInfo = Db::name('UserCertification')->where('uid', $uid)->field('user_name,user_card,card_type')->find();
         $res = GzcApiRequest::checkAmount($userInfo);
-        if(is_string($res)) {
-            return app('json')->fail($res);
-        }
-        return app('json')->success(['amount' => sprintf("%01.2f", $res * 0.01)]);
+//        if(is_string($res)) {
+//            return app('json')->fail($res);
+//        }
+//        return app('json')->success(['amount' => sprintf("%01.2f", $res * 0.01)]);
+        $cxbResponseData = $res['response'];
+        $xfbResponseData = $res['responsetwo'];
+        $amount = $res['amount'];
+        return app('json')->success([
+            'amount' => sprintf("%01.2f", $amount * 0.01),
+            'cxbResponseData' => $cxbResponseData,
+            'xfbResponseData' => $xfbResponseData,
+        ]);
+
     }
 
     public function check_user_annual_fee()

app/traits/GzcApiRequest.php

@@ -86,7 +86,10 @@ trait GzcApiRequest
         }
 
         $amount = $cxbResponseData['extendData']['amount'] + $xfbResponseData['extendData']['amount'];
-        return $amount;
+        //return $amount;
+        return ['amount' => $amount, 'response' => $cxbResponseData, 'responsetwo' => $xfbResponseData];
+
+
     }
     public function getAmountFromGzc()
     {