Kirin há 3 anos atrás
pai
commit
f229d6480b

+ 11 - 3
app/admin/model/order/StoreOrder.php

@@ -66,10 +66,12 @@ class StoreOrder extends BaseModel
         $data['yt'] = self::statusByWhere(-2, new self())->where($where)->count();
         $data['del'] = self::statusByWhere(-4, new self())->where($where)->count();
         $data['write_off'] = self::statusByWhere(5, new self())->where($where)->count();
-        $data['general'] = self::where(['pink_id' => 0, 'combination_id' => 0, 'seckill_id' => 0, 'bargain_id' => 0])->where($where)->count();
+        $data['general'] = self::where(['pink_id' => 0, 'combination_id' => 0, 'seckill_id' => 0, 'bargain_id' => 0, 'suit' => 0, 'is_consumer' => 0])->where($where)->count();
         $data['pink'] = self::where('pink_id|combination_id', '>', 0)->where($where)->count();
         $data['seckill'] = self::where('seckill_id', '>', 0)->where($where)->count();
         $data['bargain'] = self::where('bargain_id', '>', 0)->where($where)->count();
+        $data['integral'] = self::where('is_consumer', '>', 0)->where($where)->count();
+        $data['suit'] = self::where('suit', '>', 0)->where($where)->count();
         return $data;
     }
 
@@ -535,7 +537,7 @@ HTML;
         if (isset($where['is_del']) && $where['is_del'] != '' && $where['is_del'] != -1) $model = $model->where($aler . 'is_del', $where['is_del']);
         if (isset($where['combination_id'])) {
             if ($where['combination_id'] == '普通订单') {
-                $model = $model->where($aler . 'combination_id', 0)->where($aler . 'seckill_id', 0)->where($aler . 'bargain_id', 0);
+                $model = $model->where($aler . 'combination_id', 0)->where($aler . 'is_consumer', 0)->where($aler . 'seckill_id', 0)->where($aler . 'bargain_id', 0)->where($aler . 'suit', 0);
             }
             if ($where['combination_id'] == '拼团订单') {
                 $model = $model->where($aler . 'combination_id', ">", 0)->where($aler . 'pink_id', ">", 0);
@@ -549,6 +551,9 @@ HTML;
             if ($where['combination_id'] == '消费券订单') {
                 $model = $model->where($aler . 'is_consumer', ">", 0);
             }
+            if ($where['combination_id'] == '套装订单') {
+                $model = $model->where($aler . 'suit', ">", 0);
+            }
         }
         if (isset($where['pay_type'])) {
             switch ($where['pay_type']) {
@@ -569,7 +574,7 @@ HTML;
         if (isset($where['type'])) {
             switch ($where['type']) {
                 case 1:
-                    $model = $model->where($aler . 'combination_id', 0)->where($aler . 'seckill_id', 0)->where($aler . 'bargain_id', 0);
+                    $model = $model->where($aler . 'combination_id', 0)->where($aler . 'seckill_id', 0)->where($aler . 'bargain_id', 0)->where($aler . 'suit', 0)->where($aler . 'is_consumer', 0);
                     break;
                 case 2:
 //                    $model = $model->where($aler.'combination_id',">",0)->where($aler.'pink_id',">",0);
@@ -584,6 +589,9 @@ HTML;
                 case  5:
                     $model = $model->where($aler . 'is_consumer', ">", 0);
                     break;
+                case  6:
+                    $model = $model->where($aler . 'suit', ">", 0);
+                    break;
             }
         }
 

+ 24 - 6
app/admin/model/user/User.php

@@ -8,6 +8,9 @@ namespace app\admin\model\user;
 
 use app\admin\model\order\StoreOrder;
 use app\admin\model\system\SystemUserLevel;
+use app\models\store\StoreCart;
+use app\models\system\SystemAwardLevel;
+use app\models\system\SystemGroupLevel;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 use app\admin\model\wechat\WechatUser;
@@ -149,9 +152,24 @@ class User extends BaseModel
             ->page((int)$where['page'], (int)$where['limit'])
             ->select()
             ->each(function ($item) {
+                $orders = StoreOrder::where('paid', 1)
+                    ->where('uid', $item['uid'])
+                    ->where('refund_status', 0)
+                    ->where('is_del', 0)
+                    ->where('is_system_del', 0)->select();
+                $num = 0;
+                foreach ($orders as $v) {
+                    $num += StoreCart::where('id', 'in', $v['cart_id'])->where('is_suit', 1)->sum('cart_num');
+                }
+
+                $item['suit_num'] = $num;
+
+                $item['group_level_name'] = $item['group_level'] ? SystemGroupLevel::where('id', $item['group_level'])->value('name') : '--';
+                $item['award_level_name'] = $item['award_level'] ? SystemAwardLevel::where('id', $item['award_level'])->value('name') : '--';
+
                 $item['group_name'] = '';
-                if($item['group_id']){
-                    $group = UserGroup::where('id',$item['group_id'])->find();
+                if ($item['group_id']) {
+                    $group = UserGroup::where('id', $item['group_id'])->find();
                     $item['group_name'] = $group ? $group['group_name'] : '';
                 }
                 if ($item['last_time']) $item['last_time'] = date('Y-m-d H:i:s', $item['last_time']);//最近一次访问日期
@@ -631,7 +649,7 @@ class User extends BaseModel
                 ->where('pm', 0)
                 ->sum('number');
             if ($value['sum_number'] > $refund_commission)
-                $value['sum_number'] = bcsub($value['sum_number'],$refund_commission,2);
+                $value['sum_number'] = bcsub($value['sum_number'], $refund_commission, 2);
             else
                 $value['sum_number'] = 0;
             $value['ex_price'] = UserExtract::where('uid', $value['uid'])->sum('extract_price');
@@ -664,7 +682,7 @@ class User extends BaseModel
             ->join('user_bill B', 'B.uid=A.uid')
             ->group('A.uid')
             ->where('B.type', 'brokerage')
-            ->where('B.pm',1)
+            ->where('B.pm', 1)
             ->where('B.category', 'now_money')
             ->field('sum(B.number) as sum_number,A.nickname,A.uid,A.now_money,A.brokerage_price');
         if ($where['order'] == '') {
@@ -693,13 +711,13 @@ class User extends BaseModel
     public static function getUserinfo($uid)
     {
         $userinfo = self::where('uid', $uid)->field('nickname,spread_uid,now_money,add_time')->find()->toArray();
-        $userinfo['number'] = (float)UserBill::where('category', 'now_money')->where('uid', $uid)->where('pm',1)->where('type', 'brokerage')->sum('number');
+        $userinfo['number'] = (float)UserBill::where('category', 'now_money')->where('uid', $uid)->where('pm', 1)->where('type', 'brokerage')->sum('number');
         //退款退的佣金 -
         $refund_commission = UserBill::where(['uid' => $uid, 'category' => 'now_money', 'type' => 'brokerage'])
             ->where('pm', 0)
             ->sum('number');
         if ($userinfo['number'] > $refund_commission)
-            $userinfo['number'] = bcsub($userinfo['number'],$refund_commission,2);
+            $userinfo['number'] = bcsub($userinfo['number'], $refund_commission, 2);
         else
             $userinfo['number'] = 0;
         $userinfo['spread_name'] = $userinfo['spread_uid'] ? self::where('uid', $userinfo['spread_uid'])->value('nickname') : '';

+ 8 - 0
app/admin/view/finance/finance/bill.php

@@ -62,6 +62,13 @@
                         <span style="color:#009688">0</span>
                         {{# } }}
                     </script>
+                    <script type="text/html" id="status">
+                        {{#  if(d.status ==0 ){ }}
+                        <span style="color:#FF5722">待发放</span>
+                        {{# }else{ }}
+                        <span style="color:#009688">已发放</span>
+                        {{# } }}
+                    </script>
                 </div>
             </div>
         </div>
@@ -79,6 +86,7 @@
             {field: 'number', title: '金额',sort:true,templet:'#number',align:"center",width:"10%"},
             {field: 'title', title: '类型',align:"center",width:"10%"},
             {field: 'mark', title: '备注',align:"center"},
+            {field: 'status', title: '状态',templet:'#status',align:"center"},
             {field: 'add_time', title: '创建时间',align:"center",width:"16%"},
         ];
     });

+ 1 - 0
app/admin/view/order/store_order/index.php

@@ -526,6 +526,7 @@
                 orderType: [
                     {name: '全部', value: ''},
                     {name: '普通订单', value: 1, count: orderCount.general},
+                    {name: '套装订单', value: 6, count: orderCount.suit},
                     {name: '拼团订单', value: 2, count: orderCount.pink},
                     {name: '秒杀订单', value: 3, count: orderCount.seckill},
                     {name: '砍价订单', value: 4, count: orderCount.bargain},

+ 13 - 2
app/admin/view/user/user/index.php

@@ -219,6 +219,15 @@
                         <p style="color:#dab176">{{d.vip_name}}</p>
                         {{# } }}
                     </script>
+                    <script type="text/html" id="suit">
+                        <div >套装单数:{{d.suit_num}}</div>
+                        <div >直推单数:{{d.recommend_suit_num}}</div>
+                        <div >团队单数:{{d.group_suit_num}}</div>
+                    </script>
+                    <script type="text/html" id="award_level">
+                        <div >团队等级:{{d.group_level_name}}</div>
+                        <div >极差等级:{{d.award_level_name}}</div>
+                    </script>
                     <script type="text/html" id="data_time">
                         <div >首次:{{d.add_time}}</div>
                         <div >最近:{{d.last_time}}</div>
@@ -323,8 +332,10 @@
             {field: 'now_money', title: '余额',width:'6%',sort:true,event:'now_money',align:'center'},
             {field: 'integral', title: '积分',width:'6%',sort:true,event:'integral',align:'center'},
             {field: 'gf', title: '股份',width:'6%',sort:true,event:'gf',align:'center'},
-            {field: 'pay_count', title: '购买次数',align:'center',width:'6%'},
-            {field: 'extract_count_price', title: '累计提现',align:'center',width:'6%'},
+            {field: 'gf', title: '股份',width:'6%',sort:true,event:'gf',align:'center'},
+            {field: 'suit', title: '套装单数',templet:'#suit',align:'center'},
+            // {field: 'pay_count', title: '购买次数',align:'center',width:'6%'},
+            // {field: 'extract_count_price', title: '累计提现',align:'center',width:'6%'},
             {field: 'consumer', title: '消费券',width:'6%',align:'center'},
             {field: 'spread_uid_nickname', title: '推荐人',align:'center'},
             {field: 'sex', title: '性别',width:'4%',align:'center'},