commit

app/admin/controller/Index.php

@@ -31,6 +31,7 @@ class Index extends AuthController
             'role_name' => SystemRole::where('id', $roles[0])->field('role_name')->find(),
             'workermanPort' => Config::get('workerman.admin.port')
         ]);
+        $this->assign('roles', $adminInfo['roles']);
         return $this->fetch();
     }
 

app/admin/controller/order/StoreOrder.php

@@ -10,6 +10,7 @@ namespace app\admin\controller\order;
 use app\admin\controller\AuthController;
 use app\admin\model\order\StoreOrderCartInfo;
 use app\admin\model\system\Express;
+use app\models\user\UserNotice;
 use crmeb\repositories\OrderRepository;
 use crmeb\repositories\ShortLetterRepositories;
 use crmeb\services\{
@@ -70,7 +71,7 @@ class StoreOrder extends AuthController
             ['pay_type', ''],
             ['order', '']
         ]);
-        return Json::successful(StoreOrderModel::getBadge($where));
+        return Json::successful(StoreOrderModel::getBadge($where, $this->adminInfo));
     }
 
     /**
@@ -91,7 +92,7 @@ class StoreOrder extends AuthController
             ['limit', 20],
             ['excel', 0]
         ]);
-        return Json::successlayui(StoreOrderModel::OrderList($where));
+        return Json::successlayui(StoreOrderModel::OrderList($where, $this->adminInfo['uid']));
     }
 
     public function order_print($id = '')
@@ -328,7 +329,8 @@ class StoreOrder extends AuthController
                 if (!$data['delivery_id']) return Json::fail('请输入快递单号');
                 $data['status'] = 1;
                 StoreOrderModel::edit($data, $id);
-                event('StoreProductOrderDeliveryGoodsAfter', [$data, $id]);
+//                event('StoreProductOrderDeliveryGoodsAfter', [$data, $id]);
+                event('DeliverGoodsNews', $id);
                 StoreOrderStatus::setStatus($id, 'delivery_goods', '已发货 快递公司：' . $data['delivery_name'] . ' 快递单号：' . $data['delivery_id']);
                 break;
             case 2:

app/admin/model/order/StoreOrder.php

@@ -58,7 +58,7 @@ class StoreOrder extends BaseModel
         return $data;
     }
 
-    public static function OrderList($where)
+    public static function OrderList($where, $roles)
     {
         $model = self::getOrderWhere($where, self::alias('a')
             ->join('user r', 'r.uid=a.uid', 'LEFT'), 'a.', 'r')
@@ -212,6 +212,9 @@ HTML;
             } else if ($item['paid'] == 1 && $item['refund_status'] == 2) {
                 $item['_status'] = 7;
             }
+            if ($roles > 1){
+                $item['pay_price'] = 0;
+            }
         }
         if (isset($where['excel']) && $where['excel'] == 1) {
             self::SaveExcel($data);
@@ -535,88 +538,93 @@ HTML;
         return $model;
     }
 
-    public static function getBadge($where)
+    public static function getBadge($where, $user)
     {
         $price = self::getOrderPrice($where);
-        return [
-            [
-                'name' => '订单数量',
-                'field' => '件',
-                'count' => $price['count_sum'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '售出商品',
-                'field' => '件',
-                'count' => $price['total_num'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '订单金额',
-                'field' => '元',
-                'count' => $price['pay_price'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '退款金额',
-                'field' => '元',
-                'count' => $price['refund_price'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '微信支付金额',
-                'field' => '元',
-                'count' => $price['pay_price_wx'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '余额支付金额',
-                'field' => '元',
-                'count' => $price['pay_price_yue'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '运费金额',
-                'field' => '元',
-                'count' => $price['pay_postage'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '分佣金额',
-                'field' => '元',
-                'count' => $price['brokerage'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '线下支付金额',
-                'field' => '元',
-                'count' => $price['pay_price_offline'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '积分抵扣',
-                'field' => '分',
-                'count' => $price['use_integral'] . '(抵扣金额:￥' . $price['deduction_price'] . ')',
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ],
-            [
-                'name' => '退回积分',
-                'field' => '元',
-                'count' => $price['back_integral'],
-                'background_color' => 'layui-bg-blue',
-                'col' => 2
-            ]
-        ];
+        if ($user['roles'] == 1){
+            return [
+                [
+                    'name' => '订单数量',
+                    'field' => '件',
+                    'count' => $price['count_sum'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '售出商品',
+                    'field' => '件',
+                    'count' => $price['total_num'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '订单金额',
+                    'field' => '元',
+                    'count' => $price['pay_price'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '退款金额',
+                    'field' => '元',
+                    'count' => $price['refund_price'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '微信支付金额',
+                    'field' => '元',
+                    'count' => $price['pay_price_wx'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '余额支付金额',
+                    'field' => '元',
+                    'count' => $price['pay_price_yue'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '运费金额',
+                    'field' => '元',
+                    'count' => $price['pay_postage'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '分佣金额',
+                    'field' => '元',
+                    'count' => $price['brokerage'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '线下支付金额',
+                    'field' => '元',
+                    'count' => $price['pay_price_offline'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '积分抵扣',
+                    'field' => '分',
+                    'count' => $price['use_integral'] . '(抵扣金额:￥' . $price['deduction_price'] . ')',
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ],
+                [
+                    'name' => '退回积分',
+                    'field' => '元',
+                    'count' => $price['back_integral'],
+                    'background_color' => 'layui-bg-blue',
+                    'col' => 2
+                ]
+            ];
+        }else{
+            return  [];
+        }
+
     }
 
     /**

app/admin/view/index/index.php

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-    <title>喜嗨购管理系统</title>
+    <title>美丽人参管理系统</title>
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->
@@ -40,8 +40,8 @@
                         <ul class="dropdown-menu animated fadeInRight m-t-xs">
                             <li><a class="J_menuItem admin_close" href="{:Url('setting.systemAdmin/admin_info')}">个人资料</a>
                             </li>
-                            <li><a class="admin_close" target="_blank" href="http://www.crmeb.com/">联系我们</a>
-                            </li>
+<!--                            <li><a class="admin_close" target="_blank" href="http://www.crmeb.com/">联系我们</a>-->
+<!--                            </li>-->
                             <li class="divider"></li>
                             <li><a href="{:Url('login/logout')}">安全退出</a>
                             </li>
@@ -145,9 +145,15 @@
             </div>
         </div>
         <!--内容展示模块-->
+        {if ($roles == 1)}
         <div class="row J_mainContent" id="content-main">
             <iframe class="J_iframe" name="iframe_crmeb_main" width="100%" height="100%" src="{:Url('Index/main')}" frameborder="0" data-id="{:Url('Index/main')}" seamless></iframe>
         </div>
+        {else}
+        <div class="row J_mainContent" id="content-main">
+            <iframe class="J_iframe" name="iframe_crmeb_main" width="100%" height="100%" src="" frameborder="0" data-id="{:Url('Index/main')}" seamless></iframe>
+        </div>
+        {/if}
         <!--底部版权-->
 <!--        <div class="footer"  @touchmove.prevent>-->
 <!--            <div class="pull-right">© 2017-2020 <a href="http://www.crmeb.com/" target="_blank">CRMEB</a>-->

app/api/controller/many/ManyController.php

@@ -127,6 +127,7 @@ class ManyController
             ]);
             $many->save();
             if ($many['add_time'] > time()) $green->save();
+            event('Many', ['many' => $many, 'data' => $data, 'uid' => $request->uid()]);
             Db::commit();
             return app('json')->success('投注成功');
         } catch (\Exception $e) {

app/models/many/ManyOrder.php

@@ -9,6 +9,7 @@ namespace app\models\many;
 use app\admin\model\system\SystemConfig;
 use app\models\user\User;
 use app\models\user\UserBill;
+use app\models\user\UserNotice;
 use crmeb\services\PHPExcelService;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
@@ -74,7 +75,7 @@ class ManyOrder extends BaseModel
             foreach ($order as $item)
             {
                 $many = Many::where('id', $item['many_id'])->find();
-                if (strtotime($item['create_time'])+(86400*7) < time()){
+                if (strtotime($item['create_time'])+(10) < time()){
                     $user = User::where('uid', $item['uid'])->find();//用户
                     $user1 = [];
                     $user2 = [];
@@ -106,11 +107,13 @@ class ManyOrder extends BaseModel
                     if ($user1){
                         UserBill::income('直推奖励阳光积分', $user1['uid'], 'purple_integral', 'zt_purple_integral', $sy1*0.7, $user1['spread_uid'], $user1['purple_integral'], '直推奖励阳光积分');
                         UserBill::income('直推奖励商城积分', $user1['uid'], 'integral', 'zt_integral', $sy1*0.3, $user1['spread_uid'], $user1['integral'], '直推奖励商家积分');
+                        UserNotice::create(['uid' => $user1['uid'], 'type' => 3, 'title' => '直推佣金', 'content' => $user['phone'].'在'.date('Y-m-d H:i:s', time()).'成功打怪,恭喜你获得直推'.round($sy1 * 0.7, 2).'阳光积分', 'add_time' => time()]); // 通知消息
                         $user1->save();
                     }
                     if ($user2){
                         UserBill::income('间推奖励阳光积分', $user2['uid'], 'purple_integral', 'jt_purple_integral', $sy2*0.7, $user2['spread_uid'], $user2['purple_integral'], '间推奖励阳光积分');
                         UserBill::income('间推奖励商城积分', $user2['uid'], 'integral', 'jt_integral', $sy2*0.3, $user2['spread_uid'], $user2['integral'], '间推奖励商家积分');
+                        UserNotice::create(['uid' => $user2['uid'], 'type' => 3, 'title' => '间推佣金', 'content' => $user['phone'].'在'.date('Y-m-d H:i:s', time()).'成功打怪,恭喜你获得间推'.round($sy2 * 0.7, 2).'阳光积分', 'add_time' => time()]); // 通知消息
                         $user2->save();
                     }
                 }

app/models/user/User.php

@@ -633,6 +633,9 @@ class User extends BaseModel
         $data['uid'] = $res2->uid;
         $res1 = self::create($data);
         $res = $res1 && $res2;
+        if ($spread){
+            UserNotice::create(['uid' => $res1['uid'], 'type' => 2, 'title' => '推荐用户', 'content' => '恭喜你,'.$res1['phone'].'在'.date('Y-m-d H:i:s', time()).'成为你的下线', 'add_time' => time()]); // 通知消息
+        }
         self::checkTrans($res);
         return $res;
     }

app/models/user/UserLevel.php

@@ -109,6 +109,7 @@ class UserLevel extends BaseModel
             $res = self::create($data);
             if (!$res) return false;
             User::where('uid', $uid)->update(['level' => $level_id]);
+            UserNotice::create(['uid' => $uid, 'type' => 1, 'title' => '升级会员', 'content' => $data['mark'], 'add_time' => time()]); // 通知消息
             return $res;
         }
     }

crmeb/subscribes/UserSubscribe.php

@@ -2,7 +2,11 @@
 
 namespace crmeb\subscribes;
 
+use app\models\store\StoreOrder;
+use app\models\store\StoreOrderCartInfo;
+use app\models\store\StoreProduct;
 use app\models\user\User;
+use app\models\user\UserNotice;
 use app\models\user\WechatUser;
 use think\facade\Cookie;
 use app\admin\model\system\SystemAttachment;
@@ -111,4 +115,33 @@ class UserSubscribe
         UserLevel::setLevelComplete($userUid);
     }
 
+    /**
+     * 发货通知
+     * @param $event
+     * @return void
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function onDeliverGoodsNews($event)
+    {
+        $order = StoreOrder::where('id', $event)->find();
+        $orderInfo = StoreOrderCartInfo::where('oid', $event)->find();
+
+        $product = StoreProduct::where('id', $orderInfo['product_id'])->value('store_name');
+        UserNotice::create(['uid' => $order['uid'], 'type' => 4, 'title' => '发货', 'content' => '你够购买的商品'.$product.'在'.date('Y-m-d H:i:s', time()).'已成功发货', 'add_time' => time()]); // 通知消息
+
+    }
+
+    /**
+     * 投注通知
+     * @param $event
+     * @return void
+     */
+    public function onMany($event)
+    {
+        UserNotice::create(['uid' => $event['uid'], 'type' => 4, 'title' => '打怪', 'content' => '你于'.date('Y-m-d H:i:s', time()).'成功参与'.$event['many']['name'].'场次,第'.$event['many']['stage'].'期,打怪'.$event['data']['price'].'成功,快去邀请好友一起来玩吧', 'add_time' => time()]); // 通知消息
+    }
+
+
 }