瀏覽代碼

SQL打印

York 3 年之前
父節點
當前提交
150cbe0642
共有 2 個文件被更改,包括 305 次插入293 次删除
  1. 69 58
      common/config/main.php
  2. 236 235
      frontendApi/modules/v1/controllers/ShopController.php

+ 69 - 58
common/config/main.php

@@ -1,58 +1,69 @@
-<?php
-$mainConfig = require_once __DIR__ . '/config.php';
-return [
-    'language' => 'zh-CN',
-    'timeZone' => 'PRC',
-    'aliases' => [
-        '@bower' => '@vendor/bower-asset',
-        '@npm'   => '@vendor/npm-asset',
-//        'anlity/swooleAsyncTimer' => '@backend/runtime/tmp-extensions/yii2-swoole-async-timer',
-    ],
-    'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
-    'components' => [
-        'db' => array_merge([
-            'class' => 'yii\db\Connection',
-            'enableSlaves' => false,
-//            'enableSavepoint' => false,
-        ], $mainConfig['db'], $mainConfig['slavesDb']),
-//        'dbShop' => array_merge(['class' => 'yii\db\Connection', 'schemaMap' => ['oci' => 'common\helpers\Schema']], $mainConfig['dbShop']),
-        'dbLog' => array_merge(['class' => 'yii\mongodb\Connection',], $mainConfig['dbLog']),
-        'dbCalc' => array_merge(['class' => 'yii\db\Connection'], $mainConfig['dbCalc']),
-//        'dbShopCalc' => array_merge(['class' => 'yii\db\Connection', 'schemaMap' => ['oci' => 'common\helpers\Schema'],], $mainConfig['dbShopCalc']),
-        'dbNetPoint' => array_merge(['class' => 'yii\db\Connection'], $mainConfig['dbNetPoint']),
-        // 'cache' => [
-        //     //'class' => 'yii\caching\FileCache',
-        //     'class' => 'dcb9\redis\Cache',
-        //     'redis' => $mainConfig['cacheRedis'],
-        // ],
-        'cache' => [
-            'class' => 'yii\redis\Cache',
-            'redis' => $mainConfig['cacheRedis'],
-            // 'redis' => [
-            //     'hostname' => '127.0.0.1',
-            //     'port' => 6379,
-            //     'database' => 0,
-            // ]
-        ],
-        'tokenRedis' => array_merge(['class' => 'yii\redis\Connection'], $mainConfig['tokenRedis']),
-        'redis' => array_merge(['class' => 'yii\redis\Connection'], $mainConfig['otherRedis']),
-        // 'tokenRedis' => array_merge(['class' => 'common\components\Redis'], $mainConfig['tokenRedis']),
-        // 'redis' => array_merge(['class' => 'common\components\Redis'], $mainConfig['otherRedis']),
-        'mailer' => [
-            'class' => 'yii\swiftmailer\Mailer',
-            'viewPath' => '@common/mail',
-            // send all mails to a file by default. You have to set
-            // 'useFileTransport' to false and configure a transport
-            // for the mailer to send real emails.
-            'useFileTransport' => true,
-        ],
-        'swooleAsyncTimer' => [
-            'class' => 'common\components\SwooleAsyncTimer',
-        ],
-    ],
-    'controllerMap' => [
-        'swoole_server' => [
-            'class' => 'anlity\swooleAsyncTimer\SwooleAsyncTimerController',
-        ],
-    ],
-];
+<?php
+$mainConfig = require_once __DIR__ . '/config.php';
+return [
+    'language' => 'zh-CN',
+    'timeZone' => 'PRC',
+    'aliases' => [
+        '@bower' => '@vendor/bower-asset',
+        '@npm'   => '@vendor/npm-asset',
+//        'anlity/swooleAsyncTimer' => '@backend/runtime/tmp-extensions/yii2-swoole-async-timer',
+    ],
+    'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
+    'components' => [
+        'log' => [
+            'targets' => [
+                [
+                    'class' => 'yii\log\FileTarget',
+                    'levels' => ['error', 'warning', 'info'],
+                    'categories' => ['yii\db\*', 'app\models\*'],
+                    'logFile' => '@runtime/logs/sql.log',
+                ],
+                'db' => [ 'class' => 'yii\log\FileTarget'],
+            ],
+        ],
+        'db' => array_merge([
+            'class' => 'yii\db\Connection',
+            'enableSlaves' => false,
+//            'enableSavepoint' => false,
+        ], $mainConfig['db'], $mainConfig['slavesDb']),
+//        'dbShop' => array_merge(['class' => 'yii\db\Connection', 'schemaMap' => ['oci' => 'common\helpers\Schema']], $mainConfig['dbShop']),
+        'dbLog' => array_merge(['class' => 'yii\mongodb\Connection',], $mainConfig['dbLog']),
+        'dbCalc' => array_merge(['class' => 'yii\db\Connection'], $mainConfig['dbCalc']),
+//        'dbShopCalc' => array_merge(['class' => 'yii\db\Connection', 'schemaMap' => ['oci' => 'common\helpers\Schema'],], $mainConfig['dbShopCalc']),
+        'dbNetPoint' => array_merge(['class' => 'yii\db\Connection'], $mainConfig['dbNetPoint']),
+        // 'cache' => [
+        //     //'class' => 'yii\caching\FileCache',
+        //     'class' => 'dcb9\redis\Cache',
+        //     'redis' => $mainConfig['cacheRedis'],
+        // ],
+        'cache' => [
+            'class' => 'yii\redis\Cache',
+            'redis' => $mainConfig['cacheRedis'],
+            // 'redis' => [
+            //     'hostname' => '127.0.0.1',
+            //     'port' => 6379,
+            //     'database' => 0,
+            // ]
+        ],
+        'tokenRedis' => array_merge(['class' => 'yii\redis\Connection'], $mainConfig['tokenRedis']),
+        'redis' => array_merge(['class' => 'yii\redis\Connection'], $mainConfig['otherRedis']),
+        // 'tokenRedis' => array_merge(['class' => 'common\components\Redis'], $mainConfig['tokenRedis']),
+        // 'redis' => array_merge(['class' => 'common\components\Redis'], $mainConfig['otherRedis']),
+        'mailer' => [
+            'class' => 'yii\swiftmailer\Mailer',
+            'viewPath' => '@common/mail',
+            // send all mails to a file by default. You have to set
+            // 'useFileTransport' to false and configure a transport
+            // for the mailer to send real emails.
+            'useFileTransport' => true,
+        ],
+        'swooleAsyncTimer' => [
+            'class' => 'common\components\SwooleAsyncTimer',
+        ],
+    ],
+    'controllerMap' => [
+        'swoole_server' => [
+            'class' => 'anlity\swooleAsyncTimer\SwooleAsyncTimerController',
+        ],
+    ],
+];

+ 236 - 235
frontendApi/modules/v1/controllers/ShopController.php

@@ -1,236 +1,237 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: leo
- * Date: 2018/2/24
- * Time: 下午12:48
- */
-
-namespace frontendApi\modules\v1\controllers;
-
-use common\helpers\Date;
-use common\helpers\Form;
-use common\helpers\user\Info;
-use common\models\DecOrder;
-use common\models\forms\DeclarationForm;
-use common\models\forms\OrderForm;
-use common\models\Order;
-use common\models\ReceiveAddress;
-use common\models\Region;
-use common\models\ShopGoods;
-use common\models\User;
-use common\models\UserBonus;
-use common\models\UserWallet;
-
-class ShopController extends BaseController {
-    public $modelClass = DecOrder::class;
-
-    /**
-     * 商品列表
-     * @return mixed
-     * @throws \yii\web\HttpException
-     */
-    public function actionIndex() {
-        $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0';
-        $isStudio = User::getEnCodeInfo(\Yii::$app->user->id)['IS_STUDIO'];
-        if($isStudio==1){
-            $condition.= " OR FIND_IN_SET(4,GIFT_TYPE)>0";
-        }
-        $condition.=")";
-
-        $data = ShopGoods::lists($condition, [], [
-            'orderBy' => 'SORT ASC,CREATED_AT DESC',
-            'from' => ShopGoods::tableName(),
-        ]);
-        foreach ($data['list'] as $key => $value) {
-            if ($value['TYPE'] == 1 || $value['TYPE'] == 2) {
-                $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
-            } else {
-                $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
-            }
-            // $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
-        }
-        return static::notice($data);
-    }
-
-    /**
-     * 获取商品详情
-     * @return mixed
-     * @throws \yii\web\HttpException
-     */
-    public function actionGoodsDetail(){
-        $id = \Yii::$app->request->get('id');
-        $data = null;
-        if($id){
-            $data = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1', [':ID'=>$id]);
-        }
-        return static::notice($data);
-    }
-
-    /**
-     * 购物车订单展示
-     * @throws \yii\web\HttpException
-     */
-    public function actionShowCart(){
-        $userId = \Yii::$app->user->id;
-        $payList = ShopGoods::payTypes();
-        $allAddress = ReceiveAddress::findAllAsArray('USER_ID=:USER_ID', [':USER_ID'=>$userId]);
-        if($allAddress) {
-            foreach ($allAddress as $key => $row) {
-                $allAddress[$key]['PROVINCE_NAME'] = Region::getCnName($row['PROVINCE']);
-                $allAddress[$key]['CITY_NAME'] = Region::getCnName($row['CITY']);
-                $allAddress[$key]['COUNTY_NAME'] = Region::getCnName($row['COUNTY']);
-            }
-        }
-        $userBalance = [
-            'points' => 0,
-            'cash' => 0,
-            'exchange' => 0
-        ];
-        if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
-            $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
-            $userBalance['exchange'] = $userBonusResult['EXCHANGE_POINTS'];
-        }
-        if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
-            $userBalance['cash'] = $userCashResult['CASH'];
-        }
-        return static::notice(['payList'=>$payList,'allAddress'=>$allAddress,'userBalance'=>$userBalance]);
-    }
-
-    /**
-     * 确认订单
-     */
-    public function actionSureOrder(){
-        if (\Yii::$app->request->isPost) {
-            $formModel = new OrderForm();
-            $formModel->scenario = 'userOrder';
-            $formModel->remark = '复销备注';
-            $post = \Yii::$app->request->post();
-            $post['type'] = DeclarationForm::TYPE_FX;
-            if ($formModel->load($post, '') && $formModel->add()) {
-                return static::notice('购物成功');
-            } else {
-                return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
-            }
-        }
-    }
-
-    /**
-     * 订单支付成功
-     * @throws \yii\web\HttpException
-     */
-    public function actionPaySuccess(){
-        $orderSn = \Yii::$app->request->get('orderSn');
-        $data = null;
-        if($orderSn){
-            $data = Order::findOneAsArray('SN=:SN', [':SN'=>$orderSn]);
-        }
-        return static::notice($data);
-    }
-
-    /**
-     * 我的报单
-     * @return mixed
-     * @throws \yii\web\HttpException
-     */
-    public function actionDecOrderList() {
-        $condition = ' AND USER_ID=:USER_ID AND IS_DEL=0';
-        $params[':USER_ID'] = \Yii::$app->user->id;
-        $data = DecOrder::lists($condition, $params, [
-            'select' => 'DO.*,U.USER_NAME USER_NAME,U.REAL_NAME REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME',
-            'orderBy' => 'DO.CREATED_AT DESC',
-            'from' => DecOrder::tableName() . ' AS DO',
-            'join' => [
-                ['LEFT JOIN', User::tableName() . ' AS U', 'DO.TO_USER_ID=U.ID'],
-                ['LEFT JOIN', User::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID'],
-                ['LEFT JOIN', User::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID'],
-            ],
-        ]);
-        return static::notice($data);
-    }
-
-    /**
-     * 我的订单
-     * @return mixed
-     * @throws \yii\web\HttpException
-     */
-    public function actionOrderList() {
-        $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
-        $condition = " AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname')";
-        $params[':USER_ID'] = \Yii::$app->user->id;
-        $data = Order::lists($condition, $params, [
-            'select' => 'O.*,U.REAL_NAME',
-            'orderBy' => 'O.CREATED_AT DESC',
-            'from' => Order::tableName() . ' AS O',
-            'join' => [
-                ['LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID'],
-            ],
-        ]);
-        foreach ($data['list'] as $key => $value) {
-            //$data['list'][$key]['PROVINCE_NAME'] = $value['PROVINCE'] ? Region::getCnName($value['PROVINCE']) : '';
-           //$data['list'][$key]['CITY_NAME'] = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
-            //$data['list'][$key]['COUNTY_NAME'] = $value['COUNTY'] ? Region::getCnName($value['COUNTY']) : '';
-            $data['list'][$key]['PAY_AT'] = Date::convert($value['PAY_AT'],'Y-m-d H:i:s');
-        }
-        return static::notice($data);
-    }
-
-    /**
-     * 会员复消
-     */
-    public function actionReconsume() {
-        $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0 OR FIND_IN_SET(4,GIFT_TYPE)>0)';
-        $data = ShopGoods::lists($condition, [], [
-            'orderBy' => 'SORT ASC,CREATED_AT DESC',
-            'from' => ShopGoods::tableName(),
-        ]);
-        foreach ($data['list'] as $key => $value) {
-            if ($value['TYPE'] == 1 || $value['TYPE'] == 2) {
-                $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
-            } else {
-                $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
-            }
-            //$data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
-        }
-        return static::notice($data);
-    }
-
-    /**
-     * 帮会员复消购物车
-     * @throws \yii\web\HttpException
-     */
-    public function actionReconsumeCart(){
-        $userId = \Yii::$app->user->id;
-        $payList = ['cash'=>['name'=>'余额支付'],];
-        $userBalance = [
-            'points' => 0,
-            'cash' => 0
-        ];
-        if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
-            $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
-        }
-        if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
-            $userBalance['cash'] = $userCashResult['CASH'];
-        }
-        return static::notice(['payList'=>$payList,'userBalance'=>$userBalance]);
-    }
-
-    /**
-     * 帮会员复消确认订单
-     */
-    public function actionReconsumeSureOrder(){
-        if (\Yii::$app->request->isPost) {
-            $formModel = new OrderForm();
-            $formModel->scenario = 'reconsumeOrder';
-            $formModel->remark = '帮会员复销';
-            $post = \Yii::$app->request->post();
-            $post['type'] = DeclarationForm::TYPE_FX;
-            if ($formModel->load($post, '') && $formModel->reconsumeAdd()) {
-                return static::notice('帮会员复消成功');
-            } else {
-                return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
-            }
-        }
-    }
-
+<?php
+/**
+ * Created by PhpStorm.
+ * User: leo
+ * Date: 2018/2/24
+ * Time: 下午12:48
+ */
+
+namespace frontendApi\modules\v1\controllers;
+
+use common\helpers\Date;
+use common\helpers\Form;
+use common\helpers\user\Info;
+use common\models\DecOrder;
+use common\models\forms\DeclarationForm;
+use common\models\forms\OrderForm;
+use common\models\Order;
+use common\models\ReceiveAddress;
+use common\models\Region;
+use common\models\ShopGoods;
+use common\models\User;
+use common\models\UserBonus;
+use common\models\UserWallet;
+
+class ShopController extends BaseController {
+    public $modelClass = DecOrder::class;
+
+    /**
+     * 商品列表
+     * @return mixed
+     * @throws \yii\web\HttpException
+     */
+    public function actionIndex() {
+        $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0';
+        $isStudio = User::getEnCodeInfo(\Yii::$app->user->id)['IS_STUDIO'];
+        if($isStudio==1){
+            $condition.= " OR FIND_IN_SET(4,GIFT_TYPE)>0";
+        }
+        $condition.=")";
+
+        $data = ShopGoods::lists($condition, [], [
+            'orderBy' => 'SORT ASC,CREATED_AT DESC',
+            'from' => ShopGoods::tableName(),
+        ]);
+        foreach ($data['list'] as $key => $value) {
+            if ($value['TYPE'] == 1 || $value['TYPE'] == 2) {
+                $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
+            } else {
+                $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
+            }
+            // $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
+        }
+        return static::notice($data);
+    }
+
+    /**
+     * 获取商品详情
+     * @return mixed
+     * @throws \yii\web\HttpException
+     */
+    public function actionGoodsDetail(){
+        $id = \Yii::$app->request->get('id');
+        $data = null;
+        if($id){
+            $data = ShopGoods::findOneAsArray('ID=:ID AND STATUS=1', [':ID'=>$id]);
+        }
+        return static::notice($data);
+    }
+
+    /**
+     * 购物车订单展示
+     * @throws \yii\web\HttpException
+     */
+    public function actionShowCart(){
+        $userId = \Yii::$app->user->id;
+        $payList = ShopGoods::payTypes();
+        $allAddress = ReceiveAddress::findAllAsArray('USER_ID=:USER_ID', [':USER_ID'=>$userId]);
+        if($allAddress) {
+            foreach ($allAddress as $key => $row) {
+                $allAddress[$key]['PROVINCE_NAME'] = Region::getCnName($row['PROVINCE']);
+                $allAddress[$key]['CITY_NAME'] = Region::getCnName($row['CITY']);
+                $allAddress[$key]['COUNTY_NAME'] = Region::getCnName($row['COUNTY']);
+            }
+        }
+        $userBalance = [
+            'points' => 0,
+            'cash' => 0,
+            'exchange' => 0
+        ];
+        if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
+            $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
+            $userBalance['exchange'] = $userBonusResult['EXCHANGE_POINTS'];
+        }
+        if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
+            $userBalance['cash'] = $userCashResult['CASH'];
+        }
+        return static::notice(['payList'=>$payList,'allAddress'=>$allAddress,'userBalance'=>$userBalance]);
+    }
+
+    /**
+     * 确认订单
+     */
+    public function actionSureOrder(){
+        if (\Yii::$app->request->isPost) {
+            $formModel = new OrderForm();
+            $formModel->scenario = 'userOrder';
+            $formModel->remark = '复销备注';
+            $post = \Yii::$app->request->post();
+            $post['type'] = DeclarationForm::TYPE_FX;
+            if ($formModel->load($post, '') && $formModel->add()) {
+                return static::notice('购物成功');
+            } else {
+                return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
+            }
+        }
+    }
+
+    /**
+     * 订单支付成功
+     * @throws \yii\web\HttpException
+     */
+    public function actionPaySuccess(){
+        $orderSn = \Yii::$app->request->get('orderSn');
+        $data = null;
+        if($orderSn){
+            $data = Order::findOneAsArray('SN=:SN', [':SN'=>$orderSn]);
+        }
+        return static::notice($data);
+    }
+
+    /**
+     * 我的报单
+     * @return mixed
+     * @throws \yii\web\HttpException
+     */
+    public function actionDecOrderList() {
+        $condition = ' AND USER_ID=:USER_ID AND IS_DEL=0';
+        $params[':USER_ID'] = \Yii::$app->user->id;
+        $data = DecOrder::lists($condition, $params, [
+            'select' => 'DO.*,U.USER_NAME USER_NAME,U.REAL_NAME REAL_NAME,RU.USER_NAME REC_USER_NAME,RU.REAL_NAME REC_REAL_NAME,CU.USER_NAME CON_USER_NAME,CU.REAL_NAME CON_REAL_NAME',
+            'orderBy' => 'DO.CREATED_AT DESC',
+            'from' => DecOrder::tableName() . ' AS DO',
+            'join' => [
+                ['LEFT JOIN', User::tableName() . ' AS U', 'DO.TO_USER_ID=U.ID'],
+                ['LEFT JOIN', User::tableName() . ' AS RU', 'DO.REC_USER_ID=RU.ID'],
+                ['LEFT JOIN', User::tableName() . ' AS CU', 'DO.CON_USER_ID=CU.ID'],
+            ],
+
+        ]);
+        return static::notice($data);
+    }
+
+    /**
+     * 我的订单
+     * @return mixed
+     * @throws \yii\web\HttpException
+     */
+    public function actionOrderList() {
+        $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
+        $condition = " AND ORDER_TYPE='FX' AND (USER_ID=:USER_ID OR CREATE_USER='$uname')";
+        $params[':USER_ID'] = \Yii::$app->user->id;
+        $data = Order::lists($condition, $params, [
+            'select' => 'O.*,U.REAL_NAME',
+            'orderBy' => 'O.CREATED_AT DESC',
+            'from' => Order::tableName() . ' AS O',
+            'join' => [
+                ['LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID'],
+            ],
+        ]);
+        foreach ($data['list'] as $key => $value) {
+            //$data['list'][$key]['PROVINCE_NAME'] = $value['PROVINCE'] ? Region::getCnName($value['PROVINCE']) : '';
+           //$data['list'][$key]['CITY_NAME'] = $value['CITY'] ? Region::getCnName($value['CITY']) : '';
+            //$data['list'][$key]['COUNTY_NAME'] = $value['COUNTY'] ? Region::getCnName($value['COUNTY']) : '';
+            $data['list'][$key]['PAY_AT'] = Date::convert($value['PAY_AT'],'Y-m-d H:i:s');
+        }
+        return static::notice($data);
+    }
+
+    /**
+     * 会员复消
+     */
+    public function actionReconsume() {
+        $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0 OR FIND_IN_SET(4,GIFT_TYPE)>0)';
+        $data = ShopGoods::lists($condition, [], [
+            'orderBy' => 'SORT ASC,CREATED_AT DESC',
+            'from' => ShopGoods::tableName(),
+        ]);
+        foreach ($data['list'] as $key => $value) {
+            if ($value['TYPE'] == 1 || $value['TYPE'] == 2) {
+                $data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
+            } else {
+                $data['list'][$key]['DISCOUNT'] = $value['SELL_DISCOUNT']*100;
+            }
+            //$data['list'][$key]['DISCOUNT'] = ShopGoods::GOODS_TYPE[$value['TYPE']]['discount'];
+        }
+        return static::notice($data);
+    }
+
+    /**
+     * 帮会员复消购物车
+     * @throws \yii\web\HttpException
+     */
+    public function actionReconsumeCart(){
+        $userId = \Yii::$app->user->id;
+        $payList = ['cash'=>['name'=>'余额支付'],];
+        $userBalance = [
+            'points' => 0,
+            'cash' => 0
+        ];
+        if ($userBonusResult = UserBonus::findOneAsArray(['USER_ID' => $userId])) {
+            $userBalance['points'] = $userBonusResult['RECONSUME_POINTS'];
+        }
+        if ($userCashResult = UserWallet::findOneAsArray(['USER_ID' => $userId])) {
+            $userBalance['cash'] = $userCashResult['CASH'];
+        }
+        return static::notice(['payList'=>$payList,'userBalance'=>$userBalance]);
+    }
+
+    /**
+     * 帮会员复消确认订单
+     */
+    public function actionReconsumeSureOrder(){
+        if (\Yii::$app->request->isPost) {
+            $formModel = new OrderForm();
+            $formModel->scenario = 'reconsumeOrder';
+            $formModel->remark = '帮会员复销';
+            $post = \Yii::$app->request->post();
+            $post['type'] = DeclarationForm::TYPE_FX;
+            if ($formModel->load($post, '') && $formModel->reconsumeAdd()) {
+                return static::notice('帮会员复消成功');
+            } else {
+                return static::notice(Form::formatErrorsForApi($formModel->getErrors()),400);
+            }
+        }
+    }
+
 }