BA报单修改

frontendApi/modules/v1/controllers/UserController.php

@@ -672,24 +672,8 @@ class UserController extends BaseController {
             }
         }
 
-        //所有自选商品
-        $isDecReg = Cache::getSystemConfig()['isDecReg']['VALUE'];
-        $isDec = BaUser::getEnCodeInfo(\Yii::$app->user->id)['IS_DEC'];
-        $isStudio = BaUser::getEnCodeInfo(\Yii::$app->user->id)['IS_STUDIO'];
-        $query_condition= " AND (1<>1";
-        if(!$isDecReg || ($isDecReg && $isDec==1)){
-            $query_condition = " AND (FIND_IN_SET(1,GIFT_TYPE)>0";
-        }
-        if($isStudio==1){
-            $query_condition.= " OR FIND_IN_SET(3,GIFT_TYPE)>0";
-        }
-        $query_condition.= ")";
         // 只查询普通商品
-        $allGoods = ShopGoods::find()->where("STATUS=1 AND CATEGORY_TYPE=1 AND ID='399659569762144384'".$query_condition)->orderBy('SORT ASC')->asArray()->all();
-
-        //$allGoods = ShopGoods::findAllAsArray('STATUS=1');
-        // 所有开户行
-//        $allOpenBank = OpenBank::find()->where('STATUS=1')->orderBy('LIST_ORDER ASC')->asArray()->all();
+        $allGoods = ShopGoods::find()->where("ID='399659569762144384'")->orderBy('SORT ASC')->asArray()->all();
         if (!$userName) {
             return static::notice('Failed to generate member number', 400); // 会员编号生成失败
         }
@@ -697,9 +681,7 @@ class UserController extends BaseController {
         $redis->setex('key_'.$userName , 3600 , $userName);
 
         return static::notice([
-//            'allDecPackage' => $allDecPackage,
             'allGoods' => $allGoods,
-//            'allOpenBank' => $allOpenBank,
             'userName' => $userName,
             'payList' => ShopGoods::payTypes(),
             'sellType' => ShopGoods::CATEGORY_TYPE,
@@ -719,7 +701,6 @@ class UserController extends BaseController {
         $userInfo['REAL_NAME'] = '';
         $user = BaUser::findOneAsArray('ID=:ID', [':ID' => $userId], 'REAL_NAME');
         $uInfo = BaUserInfo::findOneAsArray('USER_ID=:USER_ID', [':USER_ID' => $userId], 'REC_UID');
-//        print_r($user);exit;
         if($user){
             $rec_user = UserInfo::findOneAsArray('USER_ID=:USER_ID',[':USER_ID' => $uInfo['REC_UID']], 'USER_ID, USER_NAME');
             $userInfo['REAL_NAME'] = $user['REAL_NAME'];