Merge branch 'feature/3305-menuChange'

common/models/forms/OrderDeleteForm.php

@@ -92,7 +92,7 @@ class OrderDeleteForm extends Model
         $sn = $this->orderSn;
         // 获取订单详情
         $orderInfo = Order::findUseDbCalc()
-        ->select('ID,DEC_SN,SN,USER_ID,ORDER_TYPE,IS_DELETE,PAY_AMOUNT,PAY_TYPE,ORDER_AMOUNT,USER_NAME,PV,PAY_PV,PERIOD_NUM,PROVINCE,CITY,COUNTY,ADDRESS,STATUS,NOTE')
+        ->select('ID,DEC_SN,SN,USER_ID,ORDER_TYPE,IS_DELETE,PAY_AMOUNT,PAY_TYPE,ORDER_AMOUNT,USER_NAME,PV,PAY_PV,PERIOD_NUM,PROVINCE,CITY,COUNTY,ADDRESS,STATUS,NOTE,ORDER_CATEGORY,CREATE_USER')
         ->where("SN=:SN", [':SN' => $sn])
         ->asArray()
         ->one();
@@ -101,7 +101,7 @@ class OrderDeleteForm extends Model
         // 如果是PayStack支付,订单是未支付状态,则去中间表查询,如果两个表都没有数据,订单不存在
         if (!$orderInfo) {
             $approachOrderInfo = ApproachOrder::findUseDbCalc()
-                ->select('ID,DEC_SN,SN,USER_ID,ORDER_TYPE,IS_DELETE,PAY_AMOUNT,PAY_TYPE,ORDER_AMOUNT,USER_NAME,PV,PAY_PV,PERIOD_NUM,PROVINCE,CITY,COUNTY,ADDRESS,STATUS,NOTE')
+                ->select('ID,DEC_SN,SN,USER_ID,ORDER_TYPE,IS_DELETE,PAY_AMOUNT,PAY_TYPE,ORDER_AMOUNT,USER_NAME,PV,PAY_PV,PERIOD_NUM,PROVINCE,CITY,COUNTY,ADDRESS,STATUS,NOTE,ORDER_CATEGORY,CREATE_USER')
                 ->where("SN=:SN", [':SN' => $sn])
                 ->asArray()
                 ->one();
@@ -179,6 +179,15 @@ class OrderDeleteForm extends Model
                         $isLock = 1;
                     }
                 }
+                // PayStack支付退单不处理
+            } else if (!$approachOrderInfo && $orderInfo['ORDER_CATEGORY'] === 'STUDIO') {
+                // 工作室复消：退款给下单人
+                $createUser = User::findOneAsArray('USER_NAME=:USER_NAME', [':USER_NAME' => $orderInfo['CREATE_USER']]);
+                if (!$createUser) {
+                    $transaction->rollBack();
+                    throw new Exception('删除订单失败。查找下单人失败');
+                }
+                $userId = $createUser['ID'];
             }
 
             if (!$approachOrderInfo) {

common/models/forms/OrderForm.php

@@ -1004,6 +1004,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;

frontendApi/config/menu.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: Leo
- * Date: 2017/9/3
- * Time: 下午3:23
- */
 return [
     'dashboard'=>[
         'name'=>'Dashboard',//控制台
@@ -14,8 +8,9 @@ return [
         'action'=>'index',
         'routePath'=>'dashboard/index',
         'show'=>1,
+        'wiki' => 'dashboard',
         'child'=>[
-            ['name'=>'月奖金量', 'class'=>'', 'icon'=>'', 'controller'=>'dashboard', 'action'=>'bonus-num', 'routePath'=>'dashboard/bonus-num', 'show'=>0,],
+            ['name'=>'Month Bonus', 'class'=>'', 'icon'=>'', 'controller'=>'dashboard', 'action'=>'bonus-num', 'routePath'=>'dashboard/bonus-num', 'show'=>0, 'wiki' => 'monthBonus',], // 月奖
         ]
     ],
     'shop'=>[
@@ -26,16 +21,12 @@ return [
         'action'=>'',
         'routePath'=>'shop',
         'show'=>1,
+        'wiki' => 'shoppingMall',
         'child'=>[
-            ['name'=>'Products list', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'index', 'routePath'=>'shop/index', 'show'=>1],//商品列表
-            ['name'=>'Welcome Pack management', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer',],
-            ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1,],//报单列表
-            ['name'=>'Upgrade management', 'class'=>'', 'icon'=>'', 'controller'=>'upgrade', 'action'=>'dec', 'routePath'=>'user/upgrade', 'show'=>1,'allow'=>'declarer',],//升级管理
-            ['name'=>'Reconsume', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1,'allow'=>'studio'],//复消商品
-//            ['name'=>'申请退货', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-backing-out', 'routePath'=>'shop/order-backing-out', 'show'=>1,],//申请退货
-            ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1,],//订单列表
-//            ['name'=>'Brand Ambassador', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-dec', 'routePath'=>'user/ba-dec', 'show'=>1,'allow'=>'declarer',],
-//            ['name'=>'BA Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'ba-dec-order-list', 'routePath'=>'shop/ba-dec-order-list', 'show'=>1,'allow'=>'declarer',],
+            ['name'=>'Repeat Purchase', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'standard-products', 'routePath'=>'shop/standard-products', 'show'=>1, 'wiki' => 'repeatPurchase',],//复消
+            ['name'=>'Car Fund Products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'car-fund-products', 'routePath'=>'shop/car-fund-products', 'show'=>1, 'wiki' => 'carFundProducts',],//车奖商品
+            ['name'=>'Villa Fund Products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'villa-fund-products', 'routePath'=>'shop/villa-fund-products', 'show'=>1, 'wiki' => 'villaFundProducts',],//房奖商品
+            ['name'=>'My Order', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'own-order', 'routePath'=>'shop/own-order', 'show'=>1, 'wiki' => 'ownOrder',],//我的订单
         ]
     ],
     'user'=>[
@@ -46,13 +37,12 @@ return [
         'action'=>'',
         'routePath'=>'user',
         'show'=>1,
+        'wiki' => 'memberManagement',
         'child'=>[
-            ['name'=>'Personal info', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>1,],//个人资料
-            //['name'=>'上传身份证', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'id-card', 'routePath'=>'user/id-card', 'show'=>0,],
-            //['name'=>'开拓会员列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'rec-user', 'routePath'=>'user/rec-user', 'show'=>1,],
-//            ['name'=>'点位绑定列表', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'bind', 'routePath'=>'user/bind', 'show'=>1,],
-//            ['name'=>'点位绑定编辑', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'bind-edit', 'routePath'=>'user/bind-edit', 'show'=>0,],
-            ['name'=>'Reset Password', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'password', 'routePath'=>'user/password', 'show'=>1],
+            ['name'=>'Member Welcome Pack', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer', 'wiki' => 'welcomePack',], // 会员报单
+            ['name'=>'Member Repeat Purchase', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1, 'wiki' => 'memberRepeatPurchase',],//会员复消
+            ['name'=>'Member Upgrade', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/upgrade', 'show'=>1,'allow'=>'declarer', 'wiki' => 'memberUpgrade',],//会员升级
+            ['name'=>'Member Order', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'member-order', 'routePath'=>'shop/member-order', 'show'=>1, 'wiki' => 'memberOrder',],//会员订单
         ]
     ],
     'atlas'=>[
@@ -63,53 +53,35 @@ return [
         'action'=>'',
         'routePath'=>'atlas',
         'show'=>1,
+        'wiki' => 'networkChart',
         'child'=>[
-            ['name'=>'Placement network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>1,],
-            ['name'=>'Sponsor network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation', 'routePath'=>'atlas/relation', 'show'=>1,],
-//            ['name'=>'Brand Ambassador List', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'brand-ambassador-list', 'routePath'=>'atlas/brand-ambassador-list', 'show'=>1,],
+            ['name'=>'Placement Network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>1, 'wiki' => 'placementNetwork',],//安置网络
+            ['name'=>'Sponsor Network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation', 'routePath'=>'atlas/relation', 'show'=>1, 'wiki' => 'sponsorNetwork',],//推荐网路
         ]
     ],
     'bonus'=>[
-        'name'=>'Bonus management',//奖金管理
+        'name'=>'Bonus Management',//奖金管理
         'class' => '',
         'icon'=>'el-icon-coin',
         'controller'=>'bonus',
         'action'=>'',
         'routePath'=>'bonus',
         'show'=>1,
+        'wiki' => 'bonusManagement',
         'child'=>[
-            ['name'=>'My account', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'index', 'routePath'=>'bonus/index', 'show'=>1,],//我的账户
-//            ['name'=>'最新奖金', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'new', 'routePath'=>'bonus/new', 'show'=>1,'allow'=>'newBonusSwitch'],
-            ['name'=>'My bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/other', 'show'=>1,'allow'=>'pastBonusSwitch'],//往期奖金
-            ['name'=>'Team inquiry', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'teams', 'routePath'=>'bonus/teams', 'show'=>1,], // 团队查询
-            ['name'=>'Historical cumulative bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/historical-cumulative-bonus', 'show'=>1,'allow'=>'pastBonusSwitch'],//历史累积奖金
-            //['name'=>'实时业绩', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'real-time-perf', 'routePath'=>'bonus/real-time-perf', 'show'=>1,],
-            // ['name'=>'房产积分', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'fc-point', 'routePath'=>'bonus/fc-point', 'show'=>1,],
-//            ['name'=>'报单中心补助明细查询', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'flow-bt', 'routePath'=>'bonus/flow-bt', 'show'=>1,],
-//            ['name'=>'报单中心货补追溯', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'trace-fl', 'routePath'=>'bonus/trace-fl', 'show'=>1,],
-            ['name'=>'Withdrawal details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>0,],//提现明细
-            ['name'=>'申请提现', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-add', 'routePath'=>'finance/withdraw-add', 'show'=>0,],
-            ['name'=>'Recharge details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1,],//充值明细
-            ['name'=>'Apply for recharge', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-add', 'routePath'=>'finance/recharge-add', 'show'=>0,], // 申请充值
-            ['name'=>'Transfer details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list', 'routePath'=>'finance/transfer-list', 'show'=>1,'allow'=>'transferRecordSwitch'],
-            ['name'=>'Apply for Transfer', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-add', 'routePath'=>'finance/transfer-add', 'show'=>0,'allow'=>'transferSwitch'], // 我要转账
+            ['name'=>'My Account', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'index', 'routePath'=>'bonus/index', 'show'=>1, 'wiki' => 'myAccount',],//我的账户
+            ['name'=>'My Bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/other', 'show'=>1,'allow'=>'pastBonusSwitch', 'wiki' => 'myBonus'],//我的奖金
+            ['name'=>'Team Inquiry', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'teams', 'routePath'=>'bonus/teams', 'show'=>1, 'wiki' => 'teamInquiry'], // 团队查询
+            ['name'=>'Historical Cumulative Bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/historical-cumulative-bonus', 'show'=>1,'allow'=>'pastBonusSwitch', 'wiki' => 'historicalCumulativeBonus'],//历史累积奖金
+            ['name'=>'Withdrawal Details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>0, 'wiki' => 'withdrawalDetails'],//提现明细
+            ['name'=>'Apply For Withdraw', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-add', 'routePath'=>'finance/withdraw-add', 'show'=>0, 'wiki' => 'applyWithdraw'],// 申请提现
+            ['name'=>'Recharge Details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1, 'wiki' => 'rechargeDetails'],//充值明细
+            ['name'=>'Apply For Recharge', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-add', 'routePath'=>'finance/recharge-add', 'show'=>0, 'wiki' => 'applyRecharge'], // 申请充值
+            ['name'=>'Transfer Details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list', 'routePath'=>'finance/transfer-list', 'show'=>1,'allow'=>'transferRecordSwitch', 'wiki' => 'transferDetails'],//转账明细
+            ['name'=>'Apply For Transfer', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-add', 'routePath'=>'finance/transfer-add', 'show'=>0,'allow'=>'transferSwitch', 'wiki' => 'applyTransfer'], // 申请转账
         ]
     ],
-//    'finance'=>[
-//        'name'=>'Financial Management',//财务管理
-//        'class' => '',
-//        'icon'=>'el-icon-bank-card',
-//        'controller'=>'finance',
-//        'action'=>'',
-//        'routePath'=>'finance',
-//        'show'=>1,
-//        'child'=>[
-////            ['name'=>'会员复销池余额流水', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'reconsume-pool-flow', 'routePath'=>'finance/reconsume-pool-flow', 'show'=>1,],
-////            ['name'=>'转账记录', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list', 'routePath'=>'finance/transfer-list', 'show'=>1,'allow'=>'transferRecordSwitch'],
-////            ['name'=>'我要转账', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-add', 'routePath'=>'finance/transfer-add', 'show'=>1,'allow'=>'transferSwitch'],
-////
-//        ]
-//    ],
+
     'article'=>[
         'name'=>'Article Management',//文章管理
         'class' => '',
@@ -118,34 +90,25 @@ return [
         'action'=>'',
         'routePath'=>'article',
         'show'=>1,
+        'wiki' => 'articleManagement',
         'child'=>[
-
+            ['name'=>'System Notification', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'article-list', 'routePath'=>'article/article-list', 'show'=>1, 'wiki' => 'systemNotification'],//系统通知
         ]
     ],
-//    'message'=>[
-//        'name'=>'站内信',
-//        'class' => '',
-//        'icon'=>'el-icon-message',
-//        'controller'=>'message',
-//        'action'=>'',
-//        'routePath'=>'message',
-//        'show'=>1,
-//        'child'=>[
-//            ['name'=>'站内信列表', 'class'=>'', 'icon'=>'', 'controller'=>'message', 'action'=>'index', 'routePath'=>'message/list', 'show'=>1,],
-//            ['name'=>'站内信详情', 'class'=>'', 'icon'=>'', 'controller'=>'message', 'action'=>'detail', 'routePath'=>'message/detail', 'show'=>0,],
-//        ]
-//    ],
+
     'config'=>[
-        'name'=>'Setting',//设置
+        'name'=>'Personal Center',//个人中心
         'class' => '',
         'icon'=>'el-icon-setting',
         'controller'=>'config',
         'action'=>'',
         'routePath'=>'config',
         'show'=>1,
+        'wiki' => 'setting',
         'child'=>[
-//            ['name'=>'个人设置', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'base', 'routePath'=>'config/base', 'show'=>1,],
-            ['name'=>'Shipping Address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1,],//收货地址管理
+            ['name'=>'Shipping Address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1, 'wiki' => 'shippingAddress'],//收货地址
+            ['name'=>'Personal Info', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>1, 'wiki' => 'personalInfo',],//个人信息
+//            ['name'=>'Reset Password', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'password', 'routePath'=>'user/password', 'show'=>1, 'wiki' => 'resetPassword',],//重设密码
         ]
     ],
-];
+];

frontendApi/config/menuV2.php

@@ -1,117 +0,0 @@
-<?php
-return [
-    'dashboard'=>[
-        'name'=>'Dashboard',//控制台
-        'class' => '',
-        'icon'=>'el-icon-guide',
-        'controller'=>'dashboard',
-        'action'=>'index',
-        'routePath'=>'dashboard/index',
-        'show'=>1,
-        'wiki' => 'dashboard',
-        'child'=>[
-            ['name'=>'Month Bonus', 'class'=>'', 'icon'=>'', 'controller'=>'dashboard', 'action'=>'bonus-num', 'routePath'=>'dashboard/bonus-num', 'show'=>0, 'wiki' => 'monthBonus',], // 月奖
-        ]
-    ],
-    'shop'=>[
-        'name'=>'Shopping Mall',//商城管理
-        'class' => '',
-        'icon'=>'el-icon-goods',
-        'controller'=>'shop',
-        'action'=>'',
-        'routePath'=>'shop',
-        'show'=>1,
-        'wiki' => 'shoppingMall',
-        'child'=>[
-            ['name'=>'Standard Products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'standard-products', 'routePath'=>'shop/standard-products', 'show'=>1, 'wiki' => 'standardProducts',],//普通商品
-            ['name'=>'Car Fund Products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'car-fund-products', 'routePath'=>'shop/car-fund-products', 'show'=>1, 'wiki' => 'carFundProducts',],//车奖商品
-            ['name'=>'Villa Fund Products', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'villa-fund-products', 'routePath'=>'shop/villa-fund-products', 'show'=>1, 'wiki' => 'villaFundProducts',],//房奖商品
-            ['name'=>'Welcome Pack', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'dec', 'routePath'=>'user/dec', 'show'=>1,'allow'=>'declarer', 'wiki' => 'welcomePack',], // 报单管理
-            ['name'=>'Welcome Pack Listing', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'dec-order-list', 'routePath'=>'shop/dec-order-list', 'show'=>1, 'wiki' => 'welcomePackList',],//报单列表
-            ['name'=>'Upgrade Management', 'class'=>'', 'icon'=>'', 'controller'=>'upgrade', 'action'=>'dec', 'routePath'=>'user/upgrade', 'show'=>1,'allow'=>'declarer', 'wiki' => 'memberUpgrade',],//升级管理
-            ['name'=>'Reconsume', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'reconsume', 'routePath'=>'shop/reconsume', 'show'=>1,'allow'=>'studio', 'wiki' => 'reconsume'],//复消商品
-            ['name'=>'Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'order-list', 'routePath'=>'shop/order-list', 'show'=>1, 'wiki' => 'orderList',],//订单列表
-//            ['name'=>'Brand Ambassador', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'ba-dec', 'routePath'=>'user/ba-dec', 'show'=>1,'allow'=>'declarer', 'wiki' => 'brandAmbassador',],// BA会员
-//            ['name'=>'BA Order List', 'class'=>'', 'icon'=>'', 'controller'=>'shop', 'action'=>'ba-dec-order-list', 'routePath'=>'shop/ba-dec-order-list', 'show'=>1,'allow'=>'declarer', 'wiki' => 'BAOrderList',],// BA订单
-        ]
-    ],
-    'user'=>[
-        'name'=>'Member Management',//会员管理
-        'class' => '',
-        'icon'=>'el-icon-user',
-        'controller'=>'user',
-        'action'=>'',
-        'routePath'=>'user',
-        'show'=>0,
-        'wiki' => 'memberManagement',
-        'child'=>[
-            ['name'=>'Personal Info', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'index', 'routePath'=>'user/index', 'show'=>0, 'wiki' => 'personalInfo',],//个人资料
-            ['name'=>'Reset Password', 'class'=>'', 'icon'=>'', 'controller'=>'user', 'action'=>'password', 'routePath'=>'user/password', 'show'=>0, 'wiki' => 'resetPassword',],//重设密码
-        ]
-    ],
-    'atlas'=>[
-        'name'=>'Network Chart',
-        'class' => '',
-        'icon'=>'el-icon-data-line',
-        'controller'=>'atlas',
-        'action'=>'',
-        'routePath'=>'atlas',
-        'show'=>1,
-        'wiki' => 'networkChart',
-        'child'=>[
-            ['name'=>'Placement Network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'network', 'routePath'=>'atlas/network', 'show'=>1, 'wiki' => 'placementNetwork',],//安置网络
-            ['name'=>'Sponsor Network', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'relation', 'routePath'=>'atlas/relation', 'show'=>1, 'wiki' => 'sponsorNetwork',],//推荐网路
-//            ['name'=>'Brand Ambassador List', 'class'=>'', 'icon'=>'', 'controller'=>'atlas', 'action'=>'brand-ambassador-list', 'routePath'=>'atlas/brand-ambassador-list', 'show'=>1, 'wiki' => 'brandAmbassadorList',],// BA会员
-        ]
-    ],
-    'bonus'=>[
-        'name'=>'Bonus Management',//奖金管理
-        'class' => '',
-        'icon'=>'el-icon-coin',
-        'controller'=>'bonus',
-        'action'=>'',
-        'routePath'=>'bonus',
-        'show'=>1,
-        'wiki' => 'bonusManagement',
-        'child'=>[
-            ['name'=>'My Account', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'index', 'routePath'=>'bonus/index', 'show'=>1, 'wiki' => 'myAccount',],//我的账户
-            ['name'=>'My Bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/other', 'show'=>1,'allow'=>'pastBonusSwitch', 'wiki' => 'myBonus'],//我的奖金
-            ['name'=>'Team Inquiry', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'teams', 'routePath'=>'bonus/teams', 'show'=>1, 'wiki' => 'teamInquiry'], // 团队查询
-            ['name'=>'Historical Cumulative Bonus', 'class'=>'', 'icon'=>'', 'controller'=>'bonus', 'action'=>'other', 'routePath'=>'bonus/historical-cumulative-bonus', 'show'=>1,'allow'=>'pastBonusSwitch', 'wiki' => 'historicalCumulativeBonus'],//历史累积奖金
-            ['name'=>'Withdrawal Details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw', 'routePath'=>'finance/withdraw', 'show'=>0, 'wiki' => 'withdrawalDetails'],//提现明细
-            ['name'=>'Apply For Withdraw', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'withdraw-add', 'routePath'=>'finance/withdraw-add', 'show'=>0, 'wiki' => 'applyWithdraw'],// 申请提现
-            ['name'=>'Recharge Details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge', 'routePath'=>'finance/recharge', 'show'=>1, 'wiki' => 'rechargeDetails'],//充值明细
-            ['name'=>'Apply For Recharge', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'recharge-add', 'routePath'=>'finance/recharge-add', 'show'=>0, 'wiki' => 'applyRecharge'], // 申请充值
-            ['name'=>'Transfer Details', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-list', 'routePath'=>'finance/transfer-list', 'show'=>1,'allow'=>'transferRecordSwitch', 'wiki' => 'transferDetails'],//转账明细
-            ['name'=>'Apply For Transfer', 'class'=>'', 'icon'=>'', 'controller'=>'finance', 'action'=>'transfer-add', 'routePath'=>'finance/transfer-add', 'show'=>0,'allow'=>'transferSwitch', 'wiki' => 'applyTransfer'], // 申请转账
-        ]
-    ],
-
-    'article'=>[
-        'name'=>'Article Management',//文章管理
-        'class' => '',
-        'icon'=>'el-icon-document',
-        'controller'=>'article',
-        'action'=>'',
-        'routePath'=>'article',
-        'show'=>1,
-        'wiki' => 'articleManagement',
-        'child'=>[
-            ['name'=>'System Notification', 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'article-list', 'routePath'=>'article/article-list', 'show'=>1, 'wiki' => 'systemNotification'],//系统通知
-        ]
-    ],
-
-    'config'=>[
-        'name'=>'Setting',//设置
-        'class' => '',
-        'icon'=>'el-icon-setting',
-        'controller'=>'config',
-        'action'=>'',
-        'routePath'=>'config',
-        'show'=>1,
-        'wiki' => 'setting',
-        'child'=>[
-            ['name'=>'Shipping Address', 'class'=>'', 'icon'=>'', 'controller'=>'config', 'action'=>'receive-address-list', 'routePath'=>'config/receive-address-list', 'show'=>1, 'wiki' => 'shippingAddress'],//收货地址
-        ]
-    ],
-];

frontendApi/config/urlManagerRules.php

@@ -73,7 +73,8 @@ return [
             'POST sure-order' => 'sure-order',
             'POST reconsume-sure-order' => 'reconsume-sure-order',
             'GET pay-success' => 'pay-success',
-            'GET order-list' => 'order-list',
+            'GET own-order' => 'own-order',
+            'GET member-order' => 'member-order',
             'GET dec-order-list' => 'dec-order-list',
             'GET goods-active' => 'goods-active',
             'GET order-export/<orderSn>' => 'order-export',

frontendApi/modules/v1/controllers/BonusController.php

@@ -213,7 +213,7 @@ class BonusController extends BaseController {
      */
     public function actionWalletFlow(){
         $walletType = \Yii::$app->request->get('walletType');
-        if(!in_array($walletType,['bonus', 'cash', 'exchange', 'tourism_points', 'garage_points', 'villa_points'])) return static::notice('walletType error',400);
+        if(!in_array($walletType,['bonus', 'cash', 'exchange'/**, 'tourism_points', 'garage_points', 'villa_points'*/])) return static::notice('walletType error',400);
         $dealType = \Yii::$app->request->get('dealType');
         $createAt = \Yii::$app->request->get('createAt');
         $remark = \Yii::$app->request->get('remark');
@@ -278,27 +278,27 @@ class BonusController extends BaseController {
                 'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
                 'orderBy' => 'CREATED_AT DESC',
             ]);
-        } else if ($walletType == 'tourism_points') {
-                $dealLists = FlowTourismPoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
-                $data = FlowTourismPoints::lists($condition, $params, [
-                    'useSlaves' => true,
-                    'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
-                    'orderBy' => 'CREATED_AT DESC',
-                ]);
-        } else if ($walletType == 'garage_points') {
-            $dealLists = FlowGaragePoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
-            $data = FlowGaragePoints::lists($condition, $params, [
-                'useSlaves' => true,
-                'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
-                'orderBy' => 'CREATED_AT DESC',
-            ]);
-        } else if ($walletType == 'villa_points') {
-            $dealLists = FlowVillaPoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
-            $data = FlowVillaPoints::lists($condition, $params, [
-                'useSlaves' => true,
-                'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
-                'orderBy' => 'CREATED_AT DESC',
-            ]);
+//        } else if ($walletType == 'tourism_points') {
+//                $dealLists = FlowTourismPoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
+//                $data = FlowTourismPoints::lists($condition, $params, [
+//                    'useSlaves' => true,
+//                    'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
+//                    'orderBy' => 'CREATED_AT DESC',
+//                ]);
+//        } else if ($walletType == 'garage_points') {
+//            $dealLists = FlowGaragePoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
+//            $data = FlowGaragePoints::lists($condition, $params, [
+//                'useSlaves' => true,
+//                'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
+//                'orderBy' => 'CREATED_AT DESC',
+//            ]);
+//        } else if ($walletType == 'villa_points') {
+//            $dealLists = FlowVillaPoints::find()->groupBy('DEAL_TYPE_ID')->select('DEAL_TYPE_ID')->where('USER_ID=:USER_ID',[':USER_ID'=>\Yii::$app->user->id])->asArray()->all();
+//            $data = FlowVillaPoints::lists($condition, $params, [
+//                'useSlaves' => true,
+//                'select' => 'AMOUNT,TOTAL,IS_INCR,REMARK,REMARK_IS_SHOW,PERIOD_NUM,CALC_MONTH,CREATED_AT,DEAL_TYPE_ID,DEAL_TYPE_IS_PRESET',
+//                'orderBy' => 'CREATED_AT DESC',
+//            ]);
         } else {
             return static::notice('walletType error',400);
         }
@@ -414,8 +414,8 @@ class BonusController extends BaseController {
             $data['ORI_BONUS_BS_ABBR'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_BS_ABBR'])];
 
             $data['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($calcBonus['ORI_BONUS_QUARTER'] ?? 0.00)];
-            $data['BONUS_TOURISM'] = ['name' => '旅游奖', 'value' => Tool::formatPrice($calcBonus['BONUS_TOURISM'])];
-            $data['BONUS_GARAGE'] = ['name' => '车房奖', 'value' => Tool::formatPrice($calcBonus['BONUS_GARAGE'])];
+//            $data['BONUS_TOURISM'] = ['name' => '旅游奖', 'value' => Tool::formatPrice($calcBonus['BONUS_TOURISM'])];
+//            $data['BONUS_GARAGE'] = ['name' => '车房奖', 'value' => Tool::formatPrice($calcBonus['BONUS_GARAGE'])];
             $data['BONUS_TOTAL'] = ['name' => '合计', 'value' => Tool::formatPrice($calcBonus['BONUS_TOTAL'])];
 //            $data[] = ['name' => '管理费', 'value' => Tool::formatPrice($calcBonus['MANAGE_TAX'])];
             $data['BONUS_REAL'] = ['name' => '实发奖金', 'value' => Tool::formatPrice($calcBonus['BONUS_REAL'])];
@@ -544,8 +544,8 @@ class BonusController extends BaseController {
                 $calcBonus[$key]['ORI_BONUS_BS_ABBR'] = ['name' => '绩效奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_BS_ABBR'])];
 
                 $calcBonus[$key]['ORI_BONUS_QUARTER'] = ['name' => '季度奖金', 'value' => Tool::formatPrice($calcBonus[$key]['ORI_BONUS_QUARTER'] ?? 0)];
-                $calcBonus[$key]['BONUS_TOURISM'] = ['name' => '旅游奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOURISM'])];
-                $calcBonus[$key]['BONUS_GARAGE'] = ['name' => '车房奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_GARAGE'])];
+//                $calcBonus[$key]['BONUS_TOURISM'] = ['name' => '旅游奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOURISM'])];
+//                $calcBonus[$key]['BONUS_GARAGE'] = ['name' => '车房奖', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_GARAGE'])];
                 // 总奖金
                 $calcBonus[$key]['BONUS_TOTAL'] = ['name' => '合计', 'value' => Tool::formatPrice($calcBonus[$key]['BONUS_TOTAL'])];
 //                $calcBonus[$key]['RECONSUME_POINTS'] = ['name' => '复销积分', 'value' => Tool::formatPrice($calcBonus[$key]['RECONSUME_POINTS'])];

frontendApi/modules/v1/controllers/ShopController.php

@@ -433,33 +433,19 @@ class ShopController extends BaseController {
     }
 
     /**
+     * 我的订单.(自己复消+自己加入时的首单)
+     * 创建人是自己+USER_ID是自己的复消单、创建人不是自己+USER_ID是自己的报单
      * @throws HttpException
      */
-    public function actionOrderList() {
-        $version = \Yii::$app->request->get('v');
-
-        $data = $version == 2 ? $this->orderListV2() : $this->orderListV1();
-
-        return static::notice($data);
-    }
-
-    /**
-     * 我的订单
-     * @return mixed
-     * @throws HttpException
-     */
-    public function orderListV1() {
+    public function actionOwnOrder() {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
-        $condition = " (USER_ID=:USER_ID OR CREATE_USER='$uname') AND O.IS_DELETE = 0";
+        $condition = " O.USER_ID=:USER_ID AND O.USER_NAME='{$uname}' AND O.IS_DELETE = 0";
         $params[':USER_ID'] = \Yii::$app->user->id;
         $orderQuery = Order::find()
             ->alias('O')
             ->where($condition, $params)
-            ->select('O.*,U.REAL_NAME,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,SG.COVER')
-            ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
-            ->join('LEFT JOIN', OrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
-            ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
-            ->orderBy('O.CREATED_AT DESC');
+            ->select('O.ID,O.SN,O.USER_NAME,O.ORDER_TYPE,O.ORDER_AMOUNT,O.STATUS,O.CREATED_AT,O.PAY_TYPE,O.PAY_AT,O.CONSIGNEE,O.MOBILE,O.ADDRESS,O.CITY_NAME,O.LGA_NAME,O.PROVINCE,U.REAL_NAME')
+            ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID');
 
         // 订单中间表只查询待支付和支付失败的订单
         $params[':NOT_PAID'] = \Yii::$app->params['orderStatus']['notPaid']['value'];   // 待支付
@@ -467,11 +453,8 @@ class ShopController extends BaseController {
         $orderStandardQuery = ApproachOrder::find()
             ->alias('O')
             ->where($condition . ' AND (O.STATUS = :NOT_PAID OR O.STATUS = :FAIL_PAID)', $params)
-            ->select('O.*,U.REAL_NAME,SG.CATEGORY_TYPE,OG.REAL_PRICE,OG.TAX_RATE,OG.BUY_NUMS,OG.SKU_CODE,OG.GOODS_TITLE,OG.REAL_PV,SG.COVER')
-            ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID')
-            ->join('LEFT JOIN', ApproachOrderGoods::tableName() . ' AS OG', 'OG.ORDER_SN=O.SN')
-            ->join('LEFT JOIN', ShopGoods::tableName() . ' AS SG', 'SG.ID=OG.GOODS_ID')
-            ->orderBy('O.CREATED_AT DESC');
+            ->select('O.ID,O.SN,O.USER_NAME,O.ORDER_TYPE,O.ORDER_AMOUNT,O.STATUS,O.CREATED_AT,O.PAY_TYPE,O.PAY_AT,O.CONSIGNEE,O.MOBILE,O.ADDRESS,O.CITY_NAME,O.LGA_NAME,O.PROVINCE,U.REAL_NAME')
+            ->join('LEFT JOIN', User::tableName() . ' AS U', 'U.ID=O.USER_ID');
 
         $queryAll = $orderQuery->union($orderStandardQuery, true);
         $query = (new Query())->from(['Q' => $queryAll])->select('Q.*')->distinct()->orderBy(['CREATED_AT' => SORT_DESC]);
@@ -490,48 +473,35 @@ class ShopController extends BaseController {
         ];
 
         foreach ($data['list'] as $key => $value) {
-            if($value['ORDER_TYPE']=='ZC'){
-                $data['list'][$key]['ORDER_TYPE'] = 'Welcome Pack';
-            }else{
-                $data['list'][$key]['ORDER_TYPE'] = in_array($value['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Repeat Purchase': 'Points';
-            }
-            $data['list'][$key]['PAY_AT'] = $value['PAY_AT'] ? Date::convert($value['PAY_AT'],'Y-m-d H:i:s') : '';
-            $data['list'][$key]['CREATED_AT'] = $value['CREATED_AT'] ? Date::convert($value['CREATED_AT'],'Y-m-d H:i:s') : '';
-            $data['list'][$key]['CATEGORY_TYPE'] = intval($value['CATEGORY_TYPE']);
-            $data['list'][$key]['PAY_TYPE'] = array_column(ShopGoods::getSaleType(), NULL, 'label')[$value['PAY_TYPE']]['name'] ?? '';
-            $data['list'][$key]['STATUS'] = Tool::paramConvert(\Yii::$app->params['orderStatus'])[$value['STATUS']]['label'] ?? '';
-            $data['list'][$key]['CATEGORY'] = array_column(ShopGoods::getCategoryType(), NULL, 'id')[$value['CATEGORY_TYPE']]['name'] ?? ShopGoods::getCategoryType()[0]['name'];
-            $data['list'][$key]['FULL_ADDRESS'] = $value['ADDRESS'];//.', '.$value['CITY_NAME'].', '.$value['LGA_NAME'];
-            if($value['CITY_NAME']){
-                $data['list'][$key]['FULL_ADDRESS'] .= ', ' . $value['CITY_NAME'];
-            }
-            if($value['LGA_NAME']){
-                $data['list'][$key]['FULL_ADDRESS'] .= ', ' . $value['LGA_NAME'];
-            }
-            if($value['PROVINCE']){
-                $data['list'][$key]['FULL_ADDRESS'] .= ', ' . Region::getCnName($value['PROVINCE']);
+            if (($value['PAY_TYPE'] == 'pay_stack') && in_array($value['STATUS'], [\Yii::$app->params['orderStatus']['notPaid']['value'], \Yii::$app->params['orderStatus']['failPaid']['value']])) {
+                // 订单中间表
+                $orderGoods = ApproachOrderGoods::findAllAsArray('ORDER_SN=:SN', [':SN' => $value['SN']], 'SKU_CODE,GOODS_TITLE,BUY_NUMS,TAX_RATE,REAL_PV,REAL_PRICE');
+            } else {
+                // 订单表
+                $orderGoods = OrderGoods::findAllAsArray('ORDER_SN=:SN', [':SN' => $value['SN']], 'SKU_CODE,GOODS_TITLE,BUY_NUMS,TAX_RATE,REAL_PV,REAL_PRICE');
             }
-//            if($value['CITY']){
-//                $data['list'][$key]['FULL_ADDRESS'] .= Region::getCnName($value['CITY']);
-//            }
-//            if($value['COUNTY']){
-//                $data['list'][$key]['FULL_ADDRESS'] .= Region::getCnName($value['COUNTY']);
-//            }
-            $data['list'][$key]['TAX_AMOUNT'] = Tool::formatPrice(($value['REAL_PRICE'] - $value['REAL_PRICE'] / (1 + $value['TAX_RATE'] / 100)) * $value['BUY_NUMS']);
-            $data['list'][$key]['TOTAL_AMOUNT'] = Tool::formatPrice($value['REAL_PRICE'] * $value['BUY_NUMS']);
+            $data['list'][$key]['hasChildren'] = $orderGoods;
+            $data['list'][$key]['ORDER_TYPE'] = $value['ORDER_TYPE']=='ZC' ? 'Welcome Pack' : (in_array($value['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Repeat Purchase': 'Points');
+            $data['list'][$key]['PAY_TYPE'] = array_column(ShopGoods::SALE_TYPE, NULL, 'label')[$value['PAY_TYPE']]['name'] ?? '';
+            $data['list'][$key]['STATUS'] = \Yii::$app->params['orderStatus'][$value['STATUS']]['label'] ?? '';
+            $data['list'][$key]['FULL_ADDRESS'] = trim(implode(', ', [$value['ADDRESS'], $value['CITY_NAME'], $value['LGA_NAME'], Region::getCnName($value['PROVINCE'])]), ', ');
+            $data['list'][$key]['SHOW_BV'] = !in_array($value['PAY_TYPE'], [5, 6]);
+
+            unset($data['list'][$key]['ADDRESS'], $data['list'][$key]['CITY_NAME'], $data['list'][$key]['LGA_NAME'], $data['list'][$key]['PROVINCE']);
         }
 
-        return $data;
+        return static::notice($data);
     }
 
     /**
-     * 我的订单
-     * @return mixed
-     * @throws HttpException
+     * 会员订单.(给别人复消、给别人报单、给别人升级)
+     * 给别人复消：创建人是自己、USER_ID不是自己、ORDER_TYPE=FX
+     * 给别人报单：创建人是自己、USER_ID是自己、ORDER_TYPE=ZC、收货人不是自己
+     * 给别人升级：创建人是自己、USER_ID不是自己、ORDER_TYPE=ZC
      */
-    public function orderListV2() {
+    public function actionMemberOrder() {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
-        $condition = " (O.USER_ID=:USER_ID OR O.CREATE_USER='{$uname}') AND O.IS_DELETE = 0";
+        $condition = " O.USER_ID<>:USER_ID AND O.USER_NAME<>'{$uname}' AND O.CREATE_USER='{$uname}' AND O.IS_DELETE = 0";
         $params[':USER_ID'] = \Yii::$app->user->id;
         $orderQuery = Order::find()
             ->alias('O')
@@ -574,15 +544,15 @@ class ShopController extends BaseController {
             }
             $data['list'][$key]['hasChildren'] = $orderGoods;
             $data['list'][$key]['ORDER_TYPE'] = $value['ORDER_TYPE']=='ZC' ? 'Welcome Pack' : (in_array($value['PAY_TYPE'], ['cash', 'pay_stack']) ? 'Repeat Purchase': 'Points');
-            $data['list'][$key]['PAY_TYPE'] = array_column(ShopGoods::getSaleType(), NULL, 'label')[$value['PAY_TYPE']]['name'] ?? '';
-            $data['list'][$key]['STATUS'] = Tool::paramConvert(\Yii::$app->params['orderStatus'])[$value['STATUS']]['label'] ?? '';
+            $data['list'][$key]['PAY_TYPE'] = array_column(ShopGoods::SALE_TYPE, NULL, 'label')[$value['PAY_TYPE']]['name'] ?? '';
+            $data['list'][$key]['STATUS'] = \Yii::$app->params['orderStatus'][$value['STATUS']]['label'] ?? '';
             $data['list'][$key]['FULL_ADDRESS'] = trim(implode(', ', [$value['ADDRESS'], $value['CITY_NAME'], $value['LGA_NAME'], Region::getCnName($value['PROVINCE'])]), ', ');
             $data['list'][$key]['SHOW_BV'] = !in_array($value['PAY_TYPE'], [5, 6]);
 
             unset($data['list'][$key]['ADDRESS'], $data['list'][$key]['CITY_NAME'], $data['list'][$key]['LGA_NAME'], $data['list'][$key]['PROVINCE']);
         }
 
-        return $data;
+        return static::notice($data);
     }
 
     /**
@@ -686,9 +656,8 @@ class ShopController extends BaseController {
         $uname = Info::getUserNameByUserId(\Yii::$app->user->id);
         $orderSn = \Yii::$app->request->get('orderSn');
 
-        $condition = " AND (USER_ID=:USER_ID OR CREATE_USER='$uname') AND SN=:SN AND O.IS_DELETE = 0";
+        $condition = " AND SN=:SN AND O.IS_DELETE = 0";
         $params = [
-            ':USER_ID' => \Yii::$app->user->id,
             ':SN' => $orderSn,
         ];
 
@@ -1771,4 +1740,4 @@ ORDER;
 
         return static::notice(['fileUrl' => $path, 'targetName' => $file_name]);
     }
-}
+}

frontendApi/modules/v1/controllers/SiteController.php

@@ -113,20 +113,8 @@ class SiteController extends BaseController
         $empLevels = Cache::getEmpLevelConfig();
         // 皇冠星级
         $crownLevels = Cache::getStarCrownLevelConfig();
-        // 根据版本标识区分菜单
-        $version = Yii::$app->request->get('version', '');
-        if ($version == 'v2') {
-            // 菜单
-            $menu = require Yii::getAlias('@frontendApi/config/menuV2.php');
-        } else {
-            // 菜单
-            $menu = require Yii::getAlias('@frontendApi/config/menu.php');
-            // 获取全部文章分类
-            $allArticleCategory = ArticleCategory::getAllCategory();
-            foreach($allArticleCategory as $category){
-                $menu['article']['child'][] = ['name'=>$category['CATE_NAME'], 'class'=>'', 'icon'=>'', 'controller'=>'article', 'action'=>'list', 'routePath'=>'article/list/'.$category['ID'], 'show'=>1,];
-            }
-        }
+        // 菜单
+        $menu = require Yii::getAlias('@frontendApi/config/menu.php');
         $menu = $this->_childMenu($menu);
 
         // 时间差