Graychen / yii2-jd-deposit

src/actions/JdVerifyAction.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 use graychen\yii2\jd\deposit\filters\JdSignAuth;
 use yii\filters\VerbFilter;
 use yii\filters\RateLimiter;
-use yii\base\Action;
 
 class JdVerifyAction extends action
 {

src/controllers/DepositController.php

Doc Comments +4 added lines, -4 removed lines

@@ -55,7 +55,7 @@ 
 
     /**
      * 生成签名验证串sign
-     * @param array $params post或get请求的请求参数数组
+     * @param string $params post或get请求的请求参数数组
      * @return string sign签名验证串
      */
     public function createSign($params)
@@ -68,7 +68,7 @@ 
 
     /**
      * Lists all Order models.
-     * @return mixed
+     * @return string
      */
     public function actionIndex()
     {
@@ -86,7 +86,7 @@ 
     /**
      * Displays a single Order model.
      * @param integer $id
-     * @return mixed
+     * @return string
      */
     public function actionView($id)
     {
@@ -99,7 +99,7 @@ 
      * Deletes an existing Order model.
      * If deletion is successful, the browser will be redirected to the 'index' page.
      * @param integer $id
-     * @return mixed
+     * @return \yii\web\Response
      */
     public function actionDelete($id)
     {

Spacing +8 added lines, -8 removed lines

@@ -35,7 +35,7 @@ 
     {
         $params = Yii::$app->request->getBodyParams();
         $client = new Client();
-        $data = base64_encode(json_encode(['orderId' =>$params['orderId'],'orderStatus'=>$params['orderStatus']]));
+        $data = base64_encode(json_encode(['orderId' =>$params['orderId'], 'orderStatus'=>$params['orderStatus']]));
         $allData = [
             'customerId' => getenv('JINDONG_API_CUSTOMERID'),
             'timestamp'=>date("YmdHis"),
@@ -43,11 +43,11 @@ 
             'data'=>$data
         ];
         $res = $client->request('POST', 'http://card.jd.com/api/gameApi.action', $allData);
-        $body=$res->getBody();
-        $arrBody=json_decode($body, true);
-        if ($arrBody['retCode']==100) {
-            $orderDeposit=OrderDeposit::find()->where(['sn'=>'JD'.$params['orderId']])->one();
-            $orderDeposit->status=$params['orderStatus'];
+        $body = $res->getBody();
+        $arrBody = json_decode($body, true);
+        if ($arrBody['retCode'] == 100) {
+            $orderDeposit = OrderDeposit::find()->where(['sn'=>'JD' . $params['orderId']])->one();
+            $orderDeposit->status = $params['orderStatus'];
             $orderDeposit->save();
         }
         return $body;
@@ -61,7 +61,7 @@ 
     public function createSign($params)
     {
         $data = $params;
-        $signStr="customerId=".getenv('JINDONG_API_CUSTOMERID')."&data=".$data."&timestamp=".date("YmdHis")."&".getenv('JINDONG_API_PRIVATEKEY');
+        $signStr = "customerId=" . getenv('JINDONG_API_CUSTOMERID') . "&data=" . $data . "&timestamp=" . date("YmdHis") . "&" . getenv('JINDONG_API_PRIVATEKEY');
         $sign = md5($signStr);
         return $sign;
     }
@@ -74,7 +74,7 @@ 
     {
         $searchModel = new SearchDeposit();
         $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-        $total=Order::getOrderTotal();
+        $total = Order::getOrderTotal();
 
         return $this->render('index', [
             'searchModel' => $searchModel,

src/models/Order.php

Doc Comments +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 
     /**
      * 订单状态列表
-     * @return array
+     * @return string[]
      */
     public static function getStatusList()
     {

Indentation +3 added lines, -3 removed lines

@@ -52,9 +52,9 @@
     public function rules()
     {
         return [
-           [['id', 'game_id', 'type','user_id','hours', 'status', 'created_at', 'updated_at', 'payment_method'], 'integer'],
-           [['sn',  'serverinfo', 'account', 'password', 'remark', 'client_id', 'name', 'description'], 'safe'],
-           [['count', 'final_price'], 'number'],
+            [['id', 'game_id', 'type','user_id','hours', 'status', 'created_at', 'updated_at', 'payment_method'], 'integer'],
+            [['sn',  'serverinfo', 'account', 'password', 'remark', 'client_id', 'name', 'description'], 'safe'],
+            [['count', 'final_price'], 'number'],
         ];
     }
 

Spacing +7 added lines, -7 removed lines

@@ -12,13 +12,13 @@ 
 class Order extends \yii\db\ActiveRecord
 {
     public $source = 'PC';
-    const TYPE_JD= 'JD充值';
-    const SOURCE_JD= 'JD';//京东
+    const TYPE_JD = 'JD充值';
+    const SOURCE_JD = 'JD'; //京东
     const PAYMENT_METHOD_JD = 9; //京东支付
 
-    const STATUS_SUCCESS=0;
-    const STATUS_RECHARGE=1;
-    const STATUS_FAILURE=2;
+    const STATUS_SUCCESS = 0;
+    const STATUS_RECHARGE = 1;
+    const STATUS_FAILURE = 2;
 
     const TYPE_PEIWAN_PUTONG = 1; //普通陪玩
     const TYPE_PEIWAN_YANZHI = 2; //颜值陪玩
@@ -52,8 +52,8 @@ 
     public function rules()
     {
         return [
-           [['id', 'game_id', 'type','user_id','hours', 'status', 'created_at', 'updated_at', 'payment_method'], 'integer'],
-           [['sn',  'serverinfo', 'account', 'password', 'remark', 'client_id', 'name', 'description'], 'safe'],
+           [['id', 'game_id', 'type', 'user_id', 'hours', 'status', 'created_at', 'updated_at', 'payment_method'], 'integer'],
+           [['sn', 'serverinfo', 'account', 'password', 'remark', 'client_id', 'name', 'description'], 'safe'],
            [['count', 'final_price'], 'number'],
         ];
     }

src/models/OrderDeposit.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace graychen\yii2\jd\deposit\models;
 
-use Yii;
 use yii\base\Model;
 use yii\behaviors\TimestampBehavior;
 use yii\web\ConflictHttpException;

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
  */
 class OrderDeposit extends Model
 {
-    public $orderId;//京东订单号
-    public $buyNum;//购买数量
+    public $orderId; //京东订单号
+    public $buyNum; //购买数量
     public $skuId; //对应京东的商品 skuId
     public $brandId; //对应京东游戏品牌 ID
     public $userIp; //用户 ip 地址

src/models/SearchDeposit.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 namespace graychen\yii2\jd\deposit\models;
 
-use Yii;
 use yii\base\Model;
 use yii\data\ActiveDataProvider;
 use graychen\yii2\jd\deposit\models\Order;

src/views/default/index.php

Spacing +4 added lines, -4 removed lines

@@ -83,13 +83,13 @@ 
                 'created_at:dateTime',
                 [
                     'attribute' => 'payment_method',
-                    'value' => function ($model) {
+                    'value' => function($model) {
                         return '京东支付';
                     }
                 ],
                 [
                     'attribute' => 'status',
-                    'value' => function ($model) {
+                    'value' => function($model) {
                         return OrderDeposit::getStatusList()[$model->status];
                     }
                 ],
@@ -99,13 +99,13 @@ 
                     'class' => 'yii\grid\ActionColumn',
                     'template' => '{view} {successStatus} {failStatus}',
                     'buttons' => [
-                        'successStatus' => function ($url, $model, $key) {
+                        'successStatus' => function($url, $model, $key) {
                             return Html::a('<span>充值成功</span>', 'javascript:void(0);', [
                                 'title' => '充值成功',
                                 'onclick' => 'changeStatus(' . substr($model->sn, 2) . ',0,this)'
                             ]);
                         },
-                        'failStatus' => function ($url, $model, $key) {
+                        'failStatus' => function($url, $model, $key) {
                             return Html::a('<span>充值失败</span>', 'javascript:void(0);', [
                                 'title' => '充值失败',
                                 'onclick' => 'changeStatus(' . substr($model->sn, 2) . ',2,this)'

src/views/default/view.php

Spacing +8 added lines, -8 removed lines

@@ -34,21 +34,21 @@ 
             'game_id',
             [
                 'attribute' => 'type',
-                'value' => function ($model) {
+                'value' => function($model) {
                     return $model::getTypeList()[$model->type];
                 }
             ],
             [
                 'attribute' => 'beauty',
-                'value' => function ($model) {
+                'value' => function($model) {
                     return $model::getBeautyList()[$model->beauty];
                 }
             ],
             'user_id',
             [
                 'attribute' => 'current_tiers',
-                'value' => function ($model) {
-                    return DataPack::kingGloryLevels()[$model->current_tiers-1]['name'];
+                'value' => function($model) {
+                    return DataPack::kingGloryLevels()[$model->current_tiers - 1]['name'];
                 },
                 'visible' => $model->game_id == $model::GAME_KG,
             ],
@@ -58,8 +58,8 @@ 
             ],
             [
                 'attribute' => 'target_tiers',
-                'value' => function ($model) {
-                    return DataPack::kingGloryLevels()[$model->target_tiers-1]['name'];
+                'value' => function($model) {
+                    return DataPack::kingGloryLevels()[$model->target_tiers - 1]['name'];
                 },
                 'visible' => $model->game_id == $model::GAME_KG,
             ],
@@ -83,7 +83,7 @@ 
             'remark',
             [
                 'attribute' => 'status',
-                'value' => function ($model) {
+                'value' => function($model) {
                     return $model::getStatusList()[$model->status];
                 }
             ],
@@ -91,7 +91,7 @@ 
             'updated_at:dateTime',
             [
                 'attribute' => 'payment_method',
-                'value' => function ($model) {
+                'value' => function($model) {
                     return $model::getPaymentMethodList()[$model->payment_method];
                 }
             ],