moonsflyer 9 月之前
父節點
當前提交
a9bdf47118

+ 11 - 0
addon/cashier/shop/controller/Order.php

@@ -14,6 +14,7 @@ use app\model\order\Config as ConfigModel;
 use addon\cashier\model\order\CashierOrder as OrderModel;
 use app\model\order\OrderCommon as OrderCommonModel;
 use app\model\store\Store;
+use app\model\system\UserGroup;
 use app\model\web\Config as WebConfig;
 use app\shop\controller\BaseShop;
 
@@ -171,6 +172,16 @@ class Order extends BaseShop
                 }
             }
 
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
+            $userGroupWhere['uid'] = $userInfo['uid'];
+            $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+            $store_id_arr = array_column($userGroupList['data'],'store_id');
+            if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                $condition[] = [ "a.store_id", "in", $store_id_arr];
+            }
+
             $list = $order_common_model->getOrderPageList($condition, $page_index, $page_size, $order, $field, $alias, $join);
             if (!empty($list[ 'data' ][ 'list' ])) {
                 foreach ($list[ 'data' ][ 'list' ] as $k => $v) {

+ 16 - 0
addon/giftcard/shop/controller/Order.php

@@ -12,6 +12,8 @@ namespace addon\giftcard\shop\controller;
 
 use addon\giftcard\model\card\Card as CardModel;
 use addon\giftcard\model\order\GiftCardOrder;
+use app\model\member\Member;
+use app\model\system\UserGroup;
 
 /**
  * 礼品卡订单控制器
@@ -81,6 +83,20 @@ class Order extends Giftcard
             $join = [
                 [ 'member m', 'o.member_id = m.member_id', 'left' ]
             ];
+
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
+            $userGroupWhere['uid'] = $userInfo['uid'];
+            $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+            $store_id_arr = array_column($userGroupList['data'],'store_id');
+            if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                $mObj = new Member();
+                $member_condition[] = [ "store_id", "in", $store_id_arr];
+                $member_list = $mObj->getMemberList($member_condition,'member_id,nickname');
+                $member_id_arr = array_column($member_list['data'],'member_id');
+                $condition[] = [ "member_id", "in", $member_id_arr];
+            }
             $list = $order_model->getOrderDetailPageList($condition, $page, $page_size, $order, $field, 'o', $join);
             return $list;
         }

+ 10 - 0
addon/store/shop/controller/Store.php

@@ -20,6 +20,7 @@ use app\model\order\Order;
 use app\model\store\Store as StoreModel;
 use app\model\system\Address as AddressModel;
 use app\model\system\User;
+use app\model\system\UserGroup;
 use app\model\web\Config as ConfigModel;
 use app\model\web\Config as WebConfig;
 use app\shop\controller\BaseShop;
@@ -126,6 +127,15 @@ class Store extends BaseShop
             if (!empty($keyword)) {
                 $condition[] = [ "store_name", "like", "%" . $keyword . "%" ];
             }
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
+            $userGroupWhere['uid'] = $userInfo['uid'];
+            $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+            $store_id_arr = array_column($userGroupList['data'],'store_id');
+            if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                $condition[] = [ "store_id", "in", $store_id_arr];
+            }
             $order = 'is_default desc,store_id desc';
             $list = $store_model->getStorePageList($condition, $page, $page_size, $order);
             return $list;

+ 5 - 5
app/index/view/base.html

@@ -29,14 +29,14 @@
 		<div class="head-block-title">
 			<div class="head-block-left">
 				<div>
-					<img src="INDEX_IMG/logo_new.png"/>
+<!--					<img src="INDEX_IMG/fq.png"/>-->
 				</div>
-				<span>单商户V5版</span>
+<!--				<span>单商户V5版</span>-->
 			</div>
 			<div class="head-block-right">
-				<a href="http://www.niushop.com" class="other-links-text" target="_blank">官方网站</a>
-				<span>|</span>
-				<a href="http://bbs.niushop.com" class="other-links-text" target="_blank">技术论坛</a>
+				<a href="http://www.fangqiuwangluo.com" class="other-links-text" target="_blank">官方网站</a>
+<!--				<span>|</span>-->
+<!--				<a href="http://bbs.niushop.com" class="other-links-text" target="_blank">技术论坛</a>-->
 			</div>
 		</div>
 	</div>

+ 3 - 3
app/index/view/index/center.html

@@ -7,10 +7,10 @@
     <div><img src="INDEX_IMG/back1.png"/></div>
     <span></span>
     <p>欢迎使用</p>
-    <p>NIUSHOP商城系统</p>
+    <p>中参商城系统</p>
 </div>
 <div class="guide-links">
-    <a href="http://www.niushop.com" target="_blank">
+    <a href="/" target="_blank">
         <li>
             <div>
                 <img class="no-select" src="INDEX_IMG/no_niuku.png">
@@ -64,7 +64,7 @@
         {if $copy.logo}
         <a href="{$copy.copyright_link}" target="_blank"><img src="{:img($copy.logo)}"></a>
         {else/}
-        <a href="{$copy.copyright_link}" target="_blank"><img src="INDEX_IMG/footer_logo.png"></a>
+<!--        <a href="{$copy.copyright_link}" target="_blank"><img src="INDEX_IMG/footer_logo.png"></a>-->
         {/if}
     </div>
 </div>

+ 2 - 0
app/model/system/Stat.php

@@ -20,6 +20,7 @@ use app\model\stat\MemberWithdrawStat;
 use app\model\stat\OrderStat;
 use app\model\stat\RechargeStat;
 use app\model\stat\VisitStat;
+use app\model\store\Store;
 use Carbon\Carbon;
 use think\facade\Cache;
 use think\facade\Db;
@@ -257,6 +258,7 @@ class Stat extends BaseModel
             [ 'day_time', '>=', $start_time ],
             [ 'day_time', '<=', $end_time ],
         ];
+
         $list = model('stat_shop')->getList($condition, $this->handleStatField());
         foreach ($list as $k => $v) {
             $list[ $k ][ 'goods_order_count' ] = numberFormat($list[ $k ][ 'goods_order_count' ]);

+ 30 - 3
app/shop/controller/Member.php

@@ -18,7 +18,9 @@ use app\model\member\MemberLabel as MemberLabelModel;
 use app\model\member\MemberLevel as MemberLevelModel;
 use app\model\member\MemberAccount as MemberAccountModel;
 use app\model\member\Config as ConfigModel;
+use app\model\store\Store;
 use app\model\system\Stat;
+use app\model\system\UserGroup;
 use Carbon\Carbon;
 use think\facade\Db;
 use phpoffice\phpexcel\Classes\PHPExcel;
@@ -39,12 +41,27 @@ class Member extends BaseShop
     public function index()
     {
         $member = new MemberModel();
+
+        $condition[] = [ 'site_id', '=', $this->site_id ];
+        $store_model = new Store();
+        $store_id_arr = [];
+        $userGroupModel = new UserGroup();
+        $userInfo = $this->user_info;
+        $userGroupWhere['uid'] = $userInfo['uid'];
+        $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+        $store_id_arr = array_column($userGroupList['data'],'store_id');
+        if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+            $condition[] = [ "store_id", "in", $store_id_arr];
+        }
         // 累计会员数
-        $total_count = $member->getMemberCount([ [ 'site_id', '=', $this->site_id ] ]);
+        $total_count = $member->getMemberCount($condition);
         // 今日新增数
-        $newadd_count = $member->getMemberCount([ [ 'site_id', '=', $this->site_id ], [ 'reg_time', 'between', [ date_to_time(date('Y-m-d 00:00:00')), time() ] ] ]);
+        $new_condition = $condition;
+        $new_condition[]=[ 'reg_time', 'between', [ date_to_time(date('Y-m-d 00:00:00')), time() ] ];
+        $newadd_count = $member->getMemberCount($new_condition);
         // 已购会员数
-        $buyed_count = $member->getMemberCount([ [ 'site_id', '=', $this->site_id ], [ 'order_num', '>', 0 ] ]);
+        $condition[] = [ 'order_num', '>', 0 ];
+        $buyed_count = $member->getMemberCount($condition);
         $this->assign('data', [
             'total_count' => $total_count[ 'data' ],
             'newadd_count' => $newadd_count[ 'data' ],
@@ -199,6 +216,16 @@ class Member extends BaseShop
             $order = 'last_visit_time desc';
             $field = '*';
 
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
+            $userGroupWhere['uid'] = $userInfo['uid'];
+            $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+            $store_id_arr = array_column($userGroupList['data'],'store_id');
+            if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                $condition[] = [ "store_id", "in", $store_id_arr];
+            }
+
             $member_model = new MemberModel();
             $result = $member_model->getMemberPageList($condition, $page, $page_size, $order, $field);
             $member_label_model = new MemberLabelModel();

+ 15 - 1
app/shop/controller/Memberlevel.php

@@ -14,6 +14,7 @@ use app\model\member\MemberLevel as MemberLevelModel;
 use addon\coupon\model\CouponType;
 use app\model\member\Member as MemberModel;
 use app\model\member\Config;
+use app\model\system\UserGroup;
 
 /**
  * 会员等级管理 控制器
@@ -49,13 +50,26 @@ class Memberlevel extends BaseShop
             }
 
             $list[ 'data' ][ 'list' ] = array_merge($list[ 'data' ][ 'list' ], $member_level);
+
             $member_status = 0;
+
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
+            $userGroupWhere['uid'] = $userInfo['uid'];
+            $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+            $store_id_arr = array_column($userGroupList['data'],'store_id');
+            if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                $store_where[] = [ "store_id", "in", $store_id_arr];
+            }
+
             if (!empty($list[ 'data' ][ 'list' ])) {
                 $member_model = new MemberModel();
                 foreach ($list[ 'data' ][ 'list' ] as $k => $item) {
                     $list[ 'data' ][ 'list' ][ $k ][ 'member_num' ] = 0;
                     if (isset($item[ 'level_id' ])) {
-                        $count = $member_model->getMemberCount([ [ 'member_level', '=', $item[ 'level_id' ] ], [ 'is_delete', '=', 0 ] ]);
+                        $store_where[] = [ [ 'member_level', '=', $item[ 'level_id' ] ], [ 'is_delete', '=', 0 ] ];
+                        $count = $member_model->getMemberCount($store_where);
                         $list[ 'data' ][ 'list' ][ $k ][ 'member_num' ] = $count[ 'data' ];
                     }
                     $list[ 'data' ][ 'list' ][ $k ][ 'level_vip' ] = 'VIP' . ( $k + 1 );

+ 12 - 0
app/shop/controller/Order.php

@@ -17,6 +17,7 @@ use app\model\order\OrderCommon as OrderCommonModel;
 use app\model\order\OrderExport;
 use app\model\store\Store as StoreModel;
 use app\model\system\Promotion as PromotionModel;
+use app\model\system\UserGroup;
 use app\model\web\Config as WebConfig;
 use phpoffice\phpexcel\Classes\PHPExcel;
 use phpoffice\phpexcel\Classes\PHPExcel\Writer\Excel2007;
@@ -311,6 +312,17 @@ class Order extends BaseShop
                 's.store_id = a.delivery_store_id',
                 'inner'
             ];
+
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
+            $userGroupWhere['uid'] = $userInfo['uid'];
+            $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+            $store_id_arr = array_column($userGroupList['data'],'store_id');
+            if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                $condition[] = [ "a.store_id", "in", $store_id_arr];
+            }
+
             $list = $order_common_model->getOrderPageList($condition, $page_index, $page_size, $order, $field = 'a.*,s.address,s.full_address', $alias, $join);
             return $list;
         } else {

+ 10 - 1
app/shop/controller/Orderrefund.php

@@ -14,6 +14,7 @@ use app\model\order\OrderCommon;
 use app\model\order\OrderRefund as OrderRefundModel;
 use app\model\order\OrderExport;
 use app\model\member\Member;
+use app\model\system\UserGroup;
 
 /**
  * 订单维权
@@ -97,7 +98,15 @@ class Orderrefund extends BaseShop
             } elseif (!empty($start_time) && !empty($end_time)) {
                 $condition[] = [ 'nop.refund_action_time', 'between', [ date_to_time($start_time), date_to_time($end_time) ] ];
             }
-
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
+            $userGroupWhere['uid'] = $userInfo['uid'];
+            $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+            $store_id_arr = array_column($userGroupList['data'],'store_id');
+            if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                $condition[] = [ "nop.store_id", "in", $store_id_arr];
+            }
             $list = $order_refund_model->getRefundOrderGoodsPageList($condition, $page_index, $page_size, "nop.refund_action_time desc");
             return $list;
         } else {

+ 1 - 0
app/shop/controller/Stat.php

@@ -71,6 +71,7 @@ class Stat extends BaseShop
             $fields[] = 'cashier_order_pay_money';
 
             $stat_list = $stat_model->getShopStatList($this->site_id, $start_time, $end_time)[ 'data' ];
+//            var_dump($stat_list);die;
             $stat_list = array_map(function($item) {
                 $item[ 'day_time' ] = date('Y-m-d', $item[ 'day_time' ]);
                 return $item;

+ 0 - 1
app/shop/controller/Store.php

@@ -60,7 +60,6 @@ class Store extends BaseShop
             $list = $store_model->getStorePageList($condition, $page, $page_size, $order);
             return $list;
         } else {
-
             //判断门店插件是否存在
             $store_is_exit = addon_is_exit('store', $this->site_id);
             $this->assign('store_is_exit', $store_is_exit);

+ 36 - 1
app/shop/controller/Verify.php

@@ -12,6 +12,7 @@ namespace app\shop\controller;
 
 use app\model\member\Member;
 use app\model\store\Store;
+use app\model\system\UserGroup;
 use app\model\verify\Verifier;
 use app\model\verify\Verify as VerifyModel;
 use app\model\verify\VerifyRecord;
@@ -176,6 +177,18 @@ class Verify extends BaseShop
             } elseif (!empty($start_time) && !empty($end_time)) {
                 $condition[] = [ 'create_time', 'between', [ date_to_time($start_time), date_to_time($end_time) ] ];
             }
+
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
+            $userGroupWhere['uid'] = $userInfo['uid'];
+            $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+            $store_id_arr = array_column($userGroupList['data'],'store_id');
+            array_push($store_id_arr,0);
+            if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                $condition[] = [ "store_id", "in", $store_id_arr];
+            }
+
             $list = $verify_model->getVerifyPageList($condition, $page, $page_size, 'id desc');
             return $list;
         } else {
@@ -260,13 +273,35 @@ class Verify extends BaseShop
             }
             if ($store_id) {
                 $condition[] = [ 'v.store_id', '=', $store_id ];
+            }else{
+                $store_model = new Store();
+                $store_id_arr = [];
+                $userGroupModel = new UserGroup();
+                $userInfo = $this->user_info;
+                $userGroupWhere['uid'] = $userInfo['uid'];
+                $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+                $store_id_arr = array_column($userGroupList['data'],'store_id');
+                if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                    $condition[] = [ "v.store_id", "in", $store_id_arr];
+                }
             }
             $list = $verifier->getVerifierPageList($condition, $page, $page_size, $order);
             return $list;
         } else {
             // 门店列表
             $store_model = new Store();
-            $store_list = $store_model->getStoreList([ [ 'site_id', "=", $this->site_id ], [ 'is_frozen', '=', 0 ] ], 'store_id,store_name', 'store_id desc')[ 'data' ];
+            $store_id_arr = [];
+            $userGroupModel = new UserGroup();
+            $userInfo = $this->user_info;
+            $userGroupWhere['uid'] = $userInfo['uid'];
+            $userGroupList = $userGroupModel->getUserList($userGroupWhere,'uid,store_id');
+            $store_id_arr = array_column($userGroupList['data'],'store_id');
+            if(!empty($store_id_arr) &&  !$userInfo['is_admin']){
+                $condition[] = [ "store_id", "in", $store_id_arr];
+            }
+
+            $condition[] = [ [ 'site_id', "=", $this->site_id ], [ 'is_frozen', '=', 0 ] ];
+            $store_list = $store_model->getStoreList($condition, 'store_id,store_name', 'store_id desc')[ 'data' ];
             $this->assign('store_list', $store_list);
             return $this->fetch("verify/user");
         }