Merge branch 'dev' of http://16.162.42.175:8014/guanli/aklast into dev

common/models/UserNetwork.php

@@ -337,7 +337,7 @@ class UserNetwork extends \common\components\ActiveRecord
         $table = self::getTableNameFromPeriod($periodNum);
         $db = $table['db'];
         $tableName = $table['tableName'];
-        return $db->createCommand("SELECT USER_ID,TOP_DEEP,RELATIVE_LOCATION FROM {$tableName} WHERE PARENT_UID=:PARENT_UID")->bindValues([':PARENT_UID'=>$userId])->queryAll();
+        return $db->createCommand("SELECT USER_ID,TOP_DEEP,RELATIVE_LOCATION FROM {$tableName} WHERE PARENT_UID=:PARENT_UID AND USER_ID NOT IN (SELECT HIDDEN_USER_ID FROM AR_USER_NETWORK_HIDDEN WHERE USER_ID=:PARENT_UID)")->bindValues([':PARENT_UID'=>$userId])->queryAll();
     }
 
     /**

common/models/forms/OrderForm.php

@@ -536,7 +536,7 @@ class OrderForm extends Model
             $isResaleUmbrella = Cache::getSystemConfig()['isResaleUmbrella']['VALUE'];
             if($isResaleUmbrella){
                 $userId = Info::getUserIdByUserName($this->userName);
-                $userNetwork = UserNetwork::find()->where("USER_ID=:USER_ID AND (USER_ID='{$loginUserId}' OR INSTR(PARENT_UIDS,'{$loginUserId}')>0)", ['USER_ID'=>$userId])->count();
+                $userNetwork = UserNetwork::find()->where("USER_ID=:USER_ID AND INSTR(PARENT_UIDS,'{$loginUserId}')>0", ['USER_ID'=>$userId])->count();
                 if(!$userNetwork){
                     throw new Exception($this->userName.'不是您的伞下会员，不能为其复消！');
                 }
@@ -619,6 +619,7 @@ class OrderForm extends Model
         $orderModel->SN = 'OS'.$ordNo;
         $orderModel->DEC_SN = 'DS'.$ordNo;
         $orderModel->ORDER_TYPE = $this->type;
+        $orderModel->ORDER_CATEGORY = 'STUDIO';
         $orderModel->USER_ID = $userId;
         $orderModel->USER_NAME = $this->userName;
         $orderModel->ORDER_AMOUNT = $this->_decAmount;

common/models/forms/TransferForm.php

@@ -303,6 +303,9 @@ class TransferForm extends Model {
         }
         $fromData = Balance::getLogData($this->_fromUserInfo['ID']);
         $toData = Balance::getLogData($this->_toUserInfo['ID']);
+        if ($this->_fromUserInfo['ID']==$this->_toUserInfo['ID'] && $this->_transferConfig['out']==$this->_transferConfig['in']){
+            throw new \Exception('不能给同一账户转账');
+        }
         $this->userOperateLogger->saveBeforeContent=array_merge($fromData,$toData);
 
         $db = \Yii::$app->db;

frontendApi/modules/v1/controllers/UserController.php

@@ -318,7 +318,7 @@ class UserController extends BaseController {
 //            $query_condition = " AND (FIND_IN_SET(1,GIFT_TYPE)>0";
 //        }
         if($isStudio==1){
-            $query_condition = " AND ((FIND_IN_SET(1,GIFT_TYPE)>0 OR (FIND_IN_SET(3,GIFT_TYPE)>0)";
+            $query_condition = " AND ((FIND_IN_SET(1,GIFT_TYPE)>0) OR (FIND_IN_SET(3,GIFT_TYPE)>0)";
         }else{
             $query_condition = " AND (FIND_IN_SET(1,GIFT_TYPE)>0";
         }
@@ -374,7 +374,7 @@ class UserController extends BaseController {
         $isStudio = User::getEnCodeInfo(\Yii::$app->user->id)['IS_STUDIO'];
 
         if($isStudio==1){
-            $query_condition = " AND ((FIND_IN_SET(1,GIFT_TYPE)>0 OR (FIND_IN_SET(3,GIFT_TYPE)>0)";
+            $query_condition = " AND ((FIND_IN_SET(1,GIFT_TYPE)>0) OR (FIND_IN_SET(3,GIFT_TYPE)>0)";
         }else{
             $query_condition = " AND (FIND_IN_SET(1,GIFT_TYPE)>0";
         }

sql/upgrade/1035.sql

@@ -0,0 +1,4 @@
+CREATE TABLE `AR_USER_NETWORK_HIDDEN`  (
+  `USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
+  `HIDDEN_USER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;