Merge branch 'dev-gzczuichu' into dev

app/controller/api/user/User.php

@@ -3380,15 +3380,7 @@ class User extends BaseController
 //            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,
-        ]);
-
+        return app('json')->success($res);
     }
 
     public function check_user_annual_fee()

app/traits/GzcApiRequest.php

@@ -87,7 +87,7 @@ trait GzcApiRequest
 
         $amount = $cxbResponseData['extendData']['amount'] + $xfbResponseData['extendData']['amount'];
         //return $amount;
-        return ['amount' => $amount, 'response' => $cxbResponseData, 'responsetwo' => $xfbResponseData];
+        return $xfbResponseData;
 
 
     }