Merge branch 'new-version' into david-1301a1246-bluestart

backendApi/modules/v1/models/lists/bonus/TraceUpQyList.php

@@ -42,7 +42,7 @@ class TraceUpQyList extends \common\libs\dataList\DataList implements DataListIn
         $userId = $this->others['userId'];
         $periodNum = $this->others['periodNum'];
         $data = UserNetwork::getAllParentFromPeriodWithPage($userId, $periodNum);
-        if ($data['list']) {
+        if (isset($data['list']) && $data['list']) {
             $decTotal = CalcCache::nowPeriodPerf($userId, $periodNum);
             foreach ($data['list'] as $key => $value) {
                 $perfPeriod = PerfPeriod::findOneAsArray('USER_ID=:USER_ID AND PERIOD_NUM=:PERIOD_NUM',[':USER_ID'=>$value['USER_ID'],':PERIOD_NUM'=>$periodNum]);
@@ -73,6 +73,8 @@ class TraceUpQyList extends \common\libs\dataList\DataList implements DataListIn
                 $data['list'][$key]['QY_5L'] = $data['list'][$key]['PV_5L_TOUCH'] + $pervSurplusPerf['SURPLUS_5L'];
                 unset($bonus,$bigLocation);
             }
+        } else {
+            $data['list'] = [];
         }
         $this->listData = $data;
     }

common/models/ShopGoods.php

@@ -167,7 +167,7 @@ class ShopGoods extends \common\components\ActiveRecord
                 'name'=>'积分支付'
             ],
             'exchange' => [
-                'name' => '积分兑换'
+                'name' => '无业绩兑换券'
             ]
         ];
     }

common/models/forms/OrderForm.php

@@ -386,7 +386,7 @@ class OrderForm extends Model
         $orderModel->USER_ID = $userId;
         $orderModel->USER_NAME = $userName;
         $orderModel->ORDER_AMOUNT = $this->_decAmount;
-        $orderModel->PV = $this->_decPv;
+        $orderModel->PV = $this->payType =='exchange' ? 0 : $this->_decPv;
         $orderModel->PAY_AMOUNT = $this->_payAmount;
         $orderModel->PAY_PV = $this->payType =='exchange' ? 0 : $this->_decPv; // 兑换积分不能算业绩
         $orderModel->PAY_AT = Date::nowTime();
@@ -412,6 +412,10 @@ class OrderForm extends Model
         }
         // 加入商品到订单商品表
         foreach($this->_orderGoods as $key=>$value){
+            // 增加判断,如果订单是兑换券购买,则AR_ORDER_GOODS中的REAL_PV真实PV应该是0
+            if ($orderModel->PAY_TYPE == 'exchange') {
+                $this->_orderGoods[$key]['REAL_PV'] = 0;
+            }
             $this->_orderGoods[$key]['ORDER_SN'] = $orderModel->SN;
             $this->_orderGoods[$key]['P_CALC_MONTH'] = Date::ociToDate($nowCalcMonth, Date::OCI_TIME_FORMAT_SHORT_MONTH);
         }

frontendApi/modules/v1/controllers/BaseController.php

@@ -47,8 +47,9 @@ class BaseController extends \yii\rest\ActiveController {
     public function beforeAction($action) {
         $this->forbiddenQuicklyUser();
 
-        // 增加的判断用户登录后未操作后的超时
-        if (Yii::$app->getUser()->getUserInfo()){
+        // 增加的判断用户登录后未操作后的超时 和 快速登录的逻辑
+        $isQuickly = User::isQuicklyLogin();
+        if ($isQuickly != 1 && Yii::$app->getUser()->getUserInfo()){
             $userId = Yii::$app->getUser()->getUserInfo()['id'];
             $redisKey = 'user:timeOut';
 

frontendEle/src/views/shop/order.vue

@@ -72,7 +72,7 @@
                         <div>￥{{balance.cash}}元</div>
                     </div>
                     <div class="sum_box">
-                        <div>兑换积分</div>
+                        <div>无业绩兑换券</div>
                         <div>{{balance.exchange}}</div>
                     </div>
                 </div>