Merge branch 'master' into huangfamily

app/command/PensionTasks.php

@@ -1573,16 +1573,16 @@ class PensionTasks extends Command
     public function huafeiOrderNew($timeLimit)
     {
         // 普通订单
-        $order_data = Db::name('order_huafei')->where('status', 3)->where('gzc' , 0)->select();
+        $order_data = Db::name('order_huafei')->where('status', 2)->where('gzc' , 0)->select();
         if($order_data) {
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < $online['finish_time']) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_huafei_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_huafei')->where('order_huafei_id', $online['order_huafei_id'])->update(['gzc' => 1 ,'modify_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_huafei')->where('order_huafei_id', $online['order_huafei_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1604,11 +1604,11 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s', $online['pay_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_pdd_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_pdd')->where('order_pdd_id', $online['order_pdd_id'])->update(['gzc' => 1 ,'settle_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_pdd')->where('order_pdd_id', $online['order_pdd_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1630,11 +1630,11 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < $online['finish_time']) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_jd_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_jd')->where('order_jd_id', $online['order_jd_id'])->update(['gzc' => 1 ,'modify_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_jd')->where('order_jd_id', $online['order_jd_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1651,16 +1651,16 @@ class PensionTasks extends Command
     public function suOrderNew($timeLimit)
     {
         // 普通订单
-        $order_data = Db::name('order_su')->where('status', 1)->where('gzc', 0)->select();
+        $order_data = Db::name('order_su')->where('status', '确认收货')->where('gzc', 0)->select();
         if($order_data) {
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s',$online['pay_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_su_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_su')->where('order_su_id', $online['order_su_id'])->update(['gzc' => 1 ,'settled_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_su')->where('order_su_id', $online['order_su_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1682,7 +1682,7 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s',$online['tk_earning_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_tb_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
@@ -1708,11 +1708,11 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s',$online['last_update_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_vip_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_vip')->where('order_vip_id', $online['order_vip_id'])->update(['gzc' => 1,'settle_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_vip')->where('order_vip_id', $online['order_vip_id'])->update(['gzc' => 1]);
                 });
             }
         }
@@ -1734,11 +1734,11 @@ class PensionTasks extends Command
             $order_data = $order_data->toArray();
             foreach ($order_data as $online) {
                 $date = date('Y-m-d H:i:s', strtotime('-' . $timeLimit . ' days'));
-                if($date < date('Y-m-d H:i:s',$online['pay_success_time'])) continue;
+                if($date < $online['create_time']) continue;
                 $online['order_id'] = $online['order_dy_id'];
                 Db::transaction(function () use ($online) {
                     $this->settleAward($online);
-                    Db::name('order_dy')->where('order_dy_id', $online['order_dy_id'])->update(['gzc' => 1,'settle_time' => date('Y-m-d H:i:s')]);
+                    Db::name('order_dy')->where('order_dy_id', $online['order_dy_id'])->update(['gzc' => 1]);
                 });
             }
         }

app/command/repairPvLog.php

@@ -24,10 +24,10 @@ class repairPvLog extends Command
      */
     protected function execute(Input $input, Output $output)
     {
-        $user_id_list = Db::name('user')->where([['pv','=',0],['contribute','>',0]])->column('uid');
+        $user_id_list = Db::name('user')->where([['pv','=',0]])->column('uid');
         if($user_id_list){
             foreach ($user_id_list as $user_id) {
-                $order_list = Db::name('store_order')->where(['uid' => $user_id,'paid' => 1,'gzc' => 1])->select();
+                $order_list = Db::name('store_order')->where(['uid' => $user_id,'paid' => 1])->where('mer_id',496)->select();
                 if($order_list) {
                     $pv = 0;
                     foreach ($order_list as $order) {

app/common/repositories/finance/FinanceRepository.php

@@ -28,142 +28,217 @@ class FinanceRepository extends BaseRepository
      */
     public function order_overview($mer_id = 0)
     {
-        // if ($mer_id) {
-        //     $where = "mer_id = " . $mer_id . " and paid = 1";
-        // } else {
+        if ($mer_id) {
+            $where = "mer_id = " . $mer_id . " and paid = 1";
+            $type = input('type', 1);
+            $day = input('day', '');
+    
+            if ($type == 1 and $day != '') {
+                $where .= " and DATE(pay_time) = '" . $day . "'";
+            }
+            if ($type == 2 and $day != '') {
+                $date = new \DateTime($day);
+                $year = $date->format('Y');
+                $month = $date->format('m');
+    
+                $where .= " and YEAR(pay_time) = " . $year . " AND MONTH(pay_time) = " . $month;
+            }
+            $xianshangzhifu = Db::name('store_order')->where($where)->whereIn('pay_type', [0, 1])->sum('pay_price');
+            $xianshangzhifu_xuni = Db::name('store_order')->where($where)->where('pay_type', 0)->sum('pay_price');
+            $hongjifenxiaofei = Db::name('store_order')->where($where)->where("pay_type", 5)->sum('pay_price');
+    
+            $chengjiaomoney = decimal2($xianshangzhifu + $hongjifenxiaofei);
+            $list1[] = ['count' => set_price_rtrim($xianshangzhifu), 'name' => '线上支付金额'];
+            if (!$mer_id) {
+                $list1[] = ['count' => set_price_rtrim($xianshangzhifu_xuni), 'name' => '虚拟支付金额'];
+            }
+            $list1[] = ['count' => 0, 'name' => '代付金额'];
+            $xianshangzhifunum = Db::name('store_order')->where($where)->whereIn('pay_type', [0, 1])->count();
+            $xianshangzhifunum_xuni = Db::name('store_order')->where($where)->where('pay_type', 0)->count();
+            $hongjifenxiaofeinum = Db::name('store_order')->where($where)->where("pay_type", 5)->count();
+    
+            $chengjiaocount = $xianshangzhifunum + $hongjifenxiaofeinum;
+    
+            $list2[] = ['count' => $xianshangzhifunum, 'name' => '线上支付订单量'];
+            if (!$mer_id) {
+                $list2[] = ['count' => $xianshangzhifunum_xuni, 'name' => '虚拟支付订单量'];
+            }
+            $list2[] = ['count' => 0, 'name' => '代付订单量'];
+            $xianshangzhifuren = Db::name('store_order')->where($where)->whereIn('pay_type', [0, 1])->group('uid')->count();
+            $xianshangzhifuren_xuni = Db::name('store_order')->where($where)->where('pay_type', 0)->group('uid')->count();
+            $hongjifenxiaofeiren = Db::name('store_order')->where($where)->where("pay_type", 5)->group('uid')->count();
+    
+            $chengjiaoren = Db::name('store_order')->where($where)->whereIn('pay_type', [0, 1, 5])->group('uid')->count();
+            $list3[] = ['count' => set_price_rtrim($xianshangzhifuren), 'name' => '线上支付人数'];
+            if (!$mer_id) {
+                $list3[] = ['count' => set_price_rtrim($xianshangzhifuren_xuni), 'name' => '虚拟支付人数'];
+            }
+            $list3[] = ['count' => 0, 'name' => '代付人数'];
+    
+    
+            $xianshangtuikuan = Db::name('store_order')->where($where)->where('status', -1)->sum('pay_price');
+    
+            $tuikuanmoney = $xianshangtuikuan;
+            $list4 = array(
+                array('count' => $xianshangtuikuan, 'name' => '线上支付退单'),
+                array('count' => 0, 'name' => '代付退单'),
+            );
+            $xianshangzhifutuinum = Db::name('store_order')->where($where)->where('status', -1)->count();
+    
+            $tuikuancount = $xianshangzhifutuinum;
+            $list5 = array(
+                array('count' => set_price_rtrim($xianshangzhifutuinum), 'name' => '线上支付退单量'),
+                array('count' => 0, 'name' => '代付退单量'),
+            );
+            $xianshangzhifutuiremn = Db::name('store_order')->where($where)->where('status', -1)->group('uid')->count();
+    
+            $tuikuanren = $xianshangzhifutuiremn;
+            $list6 = array(
+                array('count' => set_price_rtrim($xianshangzhifutuiremn), 'name' => '线上支付退单人数'),
+                array('count' => 0, 'name' => '代付退单数'),
+            );
+    
+    
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '成交金额', 'list' => $list1];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '成交订单量', 'list' => $list2];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaoren), 'name' => '支付人数', 'list' => $list3];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '退款金额', 'list' => $list4];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuancount), 'name' => '退款订单量', 'list' => $list5];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanren), 'name' => '退款人数', 'list' => $list6];
+            return $data;
+        } else {
             $where = " paid = 1";
-        // }
-
-        $type = input('type', 1);
-        $day = input('day', '');
-        //天
-        if ($type == 1 and $day != '') {
-            $where .= " and DATE(create_time) = '" . $day . "'";
-        }
-        //月
-        if ($type == 2 and $day != '') {
-            $date = new \DateTime($day);
-            $year = $date->format('Y');
-            $month = $date->format('m');
-            $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            $type = input('type', 1);
+            $day = input('day', '');
+            //天
+            if ($type == 1 and $day != '') {
+                $where .= " and DATE(create_time) = '" . $day . "'";
+            }
+            //月
+            if ($type == 2 and $day != '') {
+                $date = new \DateTime($day);
+                $year = $date->format('Y');
+                $month = $date->format('m');
+                $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            }
+    
+            $weekWhere = " paid = 1";
+            $dayWhere = " paid = 1";
+            // 获取今天的日期和时间
+            $today = new \DateTime();
+            // 计算一周前的日期
+            $oneWeekAgo = clone $today; // 克隆一个对象，避免修改原始对象
+            $oneWeekAgo->sub(new \DateInterval('P1W')); // 减去一周
+            
+            // 格式化日期
+            $todayFormatted = $today->format('Y-m-d');
+            $oneWeekAgoFormatted = $oneWeekAgo->format('Y-m-d');
+    
+            //周时间条件
+            $weekWhere .= " and DATE(create_time) >= '" . $oneWeekAgoFormatted . "' and DATE(create_time) <= '" . $todayFormatted . "'";
+            //今日时间条件
+            $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
+    
+    
+            // 会员专区订单总数
+            //总数
+            $chengjiaomoney = Db::name('store_order')->where($where)->where('mer_id', 496)->count();
+            $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 496)->count();
+            $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 496)->count();
+            $list1[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list1[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //精彩生活区订单总数
+            //总数
+            $chengjiaocount = Db::name('store_order')->where($where)->where('mer_id', 439)->count();
+            $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 439)->count();
+            $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 439)->count();
+            $list2[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list2[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //商贸区订单总数
+            //总数
+            $chengjiaoren = Db::name('store_order')->where($where)->whereNotIn('mer_id', [496, 439, 491])->count();
+            $weekCount = Db::name('store_order')->where($weekWhere)->whereNotIn('mer_id', [496, 439, 491])->count();
+            $todayCount = Db::name('store_order')->where($dayWhere)->whereNotIn('mer_id', [496, 439, 491])->count();
+            $list3[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list3[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //复购区订单总数
+            //总数
+            $tuikuanmoney = Db::name('store_order')->where($where)->where('mer_id', 491)->count();
+            $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 491)->count();
+            $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 491)->count();
+            $list4[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list4[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //三方平台订单总数
+            //总数
+    
+            //话费
+            $whereNew = str_replace("paid", "status", $where);
+            $weekWhereNew = str_replace("paid", "status", $weekWhere);
+            $dayWhereNew = str_replace("paid", "status", $dayWhere);
+            $huafei = Db::name('order_huafei_hf')->where($whereNew)->count();
+            $huafei_week = Db::name('order_huafei_hf')->where($weekWhereNew)->count();
+            $huafei_today = Db::name('order_huafei_hf')->where($dayWhereNew)->count();
+    
+    
+            //京东
+            $whereNew = str_replace(" paid = 1", " status IN (16, 17)", $where);
+            $weekWhereNew = str_replace(" paid = 1", " status IN (16, 17)", $weekWhere);
+            $dayWhereNew = str_replace(" paid = 1", " status IN (16, 17)", $dayWhere);
+            $jd = Db::name('order_jd')->where($whereNew)->count();
+            $jd_week = Db::name('order_jd')->where($weekWhereNew)->count();
+            $jd_today = Db::name('order_jd')->where($dayWhereNew)->count();
+    
+            //拼多多
+            $whereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $where);
+            $weekWhereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $weekWhere);
+            $dayWhereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $dayWhere);
+            $pdd = Db::name('order_pdd')->where($whereNew)->count();
+            $pdd_week = Db::name('order_pdd')->where($weekWhereNew)->count();
+            $pdd_today = Db::name('order_pdd')->where($dayWhereNew)->count();
+    
+            //淘宝
+            $whereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $where);
+            $weekWhereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $weekWhere);
+            $dayWhereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $dayWhere);
+            $tb = Db::name('order_tb')->where($whereNew)->count();
+            $tb_week = Db::name('order_tb')->where($weekWhereNew)->count();
+            $tb_today = Db::name('order_tb')->where($dayWhereNew)->count();
+    
+            //电影票
+            $whereNew = str_replace(" paid = 1", " status IN (1, 4)", $where);
+            $weekWhereNew = str_replace(" paid = 1", " status IN (1, 4)", $weekWhere);
+            $dayWhereNew = str_replace(" paid = 1", " status IN (1, 4)", $dayWhere);
+            $movie = Db::name('order_movie')->where($whereNew)->count();
+            $movie_week = Db::name('order_movie')->where($weekWhereNew)->count();
+            $movie_today = Db::name('order_movie')->where($dayWhereNew)->count();
+    
+            $tuikuancount = $huafei+$jd+$pdd+$tb+$movie;
+            $weekCount = $huafei_week+$jd_week+$pdd_week+$tb_week+$movie_week;
+            $todayCount = $huafei_today+$jd_today+$pdd_today+$tb_today+$movie_today;
+            $list5[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list5[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+            //线下订单总数
+            //总数
+            $tuikuanren = Db::name('order_merchant')->where($where)->count();
+            $weekCount = Db::name('order_merchant')->where($weekWhere)->count();
+            $todayCount = Db::name('order_merchant')->where($dayWhere)->count();
+            $list6[] = ['count' => $weekCount, 'name' => '周订单总数'];
+            $list6[] = ['count' => $todayCount, 'name' => '日订单总数'];
+    
+    
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '会员专区订单总数', 'list' => $list1];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '精彩生活区订单总数', 'list' => $list2];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaoren), 'name' => '商贸区订单总数', 'list' => $list3];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '复购区订单总数', 'list' => $list4];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuancount), 'name' => '三方平台订单总数', 'list' => $list5];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanren), 'name' => '线下订单总数', 'list' => $list6];
+            return $data;
         }
-
-        $weekWhere = " paid = 1";
-        $dayWhere = " paid = 1";
-        // 获取今天的日期和时间
-        $today = new \DateTime();
-        // 计算一周前的日期
-        $oneWeekAgo = clone $today; // 克隆一个对象，避免修改原始对象
-        $oneWeekAgo->sub(new \DateInterval('P1W')); // 减去一周
-        
-        // 格式化日期
-        $todayFormatted = $today->format('Y-m-d');
-        $oneWeekAgoFormatted = $oneWeekAgo->format('Y-m-d');
-
-        //周时间条件
-        $weekWhere .= " and DATE(create_time) >= '" . $oneWeekAgoFormatted . "' and DATE(create_time) <= '" . $todayFormatted . "'";
-        //今日时间条件
-        $dayWhere .= " and DATE(create_time) = '" . $todayFormatted . "'";
-
-
-        // 会员专区订单总数
-        //总数
-        $chengjiaomoney = Db::name('store_order')->where($where)->where('mer_id', 496)->count();
-        $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 496)->count();
-        $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 496)->count();
-        $list1[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list1[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //精彩生活区订单总数
-        //总数
-        $chengjiaocount = Db::name('store_order')->where($where)->where('mer_id', 439)->count();
-        $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 439)->count();
-        $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 439)->count();
-        $list2[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list2[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //商贸区订单总数
-        //总数
-        $chengjiaoren = Db::name('store_order')->where($where)->whereNotIn('mer_id', [496, 439, 491])->count();
-        $weekCount = Db::name('store_order')->where($weekWhere)->whereNotIn('mer_id', [496, 439, 491])->count();
-        $todayCount = Db::name('store_order')->where($dayWhere)->whereNotIn('mer_id', [496, 439, 491])->count();
-        $list3[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list3[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //复购区订单总数
-        //总数
-        $tuikuanmoney = Db::name('store_order')->where($where)->where('mer_id', 491)->count();
-        $weekCount = Db::name('store_order')->where($weekWhere)->where('mer_id', 491)->count();
-        $todayCount = Db::name('store_order')->where($dayWhere)->where('mer_id', 491)->count();
-        $list4[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list4[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //三方平台订单总数
-        //总数
-
-        //话费
-        $whereNew = str_replace("paid", "status", $where);
-        $weekWhereNew = str_replace("paid", "status", $weekWhere);
-        $dayWhereNew = str_replace("paid", "status", $dayWhere);
-        $huafei = Db::name('order_huafei_hf')->where($whereNew)->count();
-        $huafei_week = Db::name('order_huafei_hf')->where($weekWhereNew)->count();
-        $huafei_today = Db::name('order_huafei_hf')->where($dayWhereNew)->count();
-
-
-        //京东
-        $whereNew = str_replace(" paid = 1", " status IN (16, 17)", $where);
-        $weekWhereNew = str_replace(" paid = 1", " status IN (16, 17)", $weekWhere);
-        $dayWhereNew = str_replace(" paid = 1", " status IN (16, 17)", $dayWhere);
-        $jd = Db::name('order_jd')->where($whereNew)->count();
-        $jd_week = Db::name('order_jd')->where($weekWhereNew)->count();
-        $jd_today = Db::name('order_jd')->where($dayWhereNew)->count();
-
-        //拼多多
-        $whereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $where);
-        $weekWhereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $weekWhere);
-        $dayWhereNew = str_replace(" paid = 1", " pin_order_status IN (0, 2, 3)", $dayWhere);
-        $pdd = Db::name('order_pdd')->where($whereNew)->count();
-        $pdd_week = Db::name('order_pdd')->where($weekWhereNew)->count();
-        $pdd_today = Db::name('order_pdd')->where($dayWhereNew)->count();
-
-        //淘宝
-        $whereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $where);
-        $weekWhereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $weekWhere);
-        $dayWhereNew = str_replace(" paid = 1", " tk_status IN (12, 3)", $dayWhere);
-        $tb = Db::name('order_tb')->where($whereNew)->count();
-        $tb_week = Db::name('order_tb')->where($weekWhereNew)->count();
-        $tb_today = Db::name('order_tb')->where($dayWhereNew)->count();
-
-        //电影票
-        $whereNew = str_replace(" paid = 1", " status IN (1, 4)", $where);
-        $weekWhereNew = str_replace(" paid = 1", " status IN (1, 4)", $weekWhere);
-        $dayWhereNew = str_replace(" paid = 1", " status IN (1, 4)", $dayWhere);
-        $movie = Db::name('order_movie')->where($whereNew)->count();
-        $movie_week = Db::name('order_movie')->where($weekWhereNew)->count();
-        $movie_today = Db::name('order_movie')->where($dayWhereNew)->count();
-
-        $tuikuancount = $huafei+$jd+$pdd+$tb+$movie;
-        $weekCount = $huafei_week+$jd_week+$pdd_week+$tb_week+$movie_week;
-        $todayCount = $huafei_today+$jd_today+$pdd_today+$tb_today+$movie_today;
-        $list5[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list5[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-        //线下订单总数
-        //总数
-        $tuikuanren = Db::name('order_merchant')->where($where)->count();
-        $weekCount = Db::name('order_merchant')->where($weekWhere)->count();
-        $todayCount = Db::name('order_merchant')->where($dayWhere)->count();
-        $list6[] = ['count' => $weekCount, 'name' => '周订单总数'];
-        $list6[] = ['count' => $todayCount, 'name' => '日订单总数'];
-
-
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaomoney), 'name' => '会员专区订单总数', 'list' => $list1];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaocount), 'name' => '精彩生活区订单总数', 'list' => $list2];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($chengjiaoren), 'name' => '商贸区订单总数', 'list' => $list3];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanmoney), 'name' => '复购区订单总数', 'list' => $list4];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuancount), 'name' => '三方平台订单总数', 'list' => $list5];
-        $data[] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($tuikuanren), 'name' => '线下订单总数', 'list' => $list6];
-        return $data;
     }
 
     /**
@@ -184,43 +259,97 @@ class FinanceRepository extends BaseRepository
                 $chilid_userids_string = implode(',',$chilid_userids);
             }
             $where .= "and uid in ({$chilid_userids_string})";
-        }
-        $type = input('type', 1);
-        $day = input('day', '');
 
-        if ($type == 1 and $day != '') {
-            $where .= " and DATE(create_time) = '" . $day . "'";
-        }
-        if ($type == 2 and $day != '') {
-            $date = new \DateTime($day);
-            $year = $date->format('Y');
-            $month = $date->format('m');
-            $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            $where = "1=1 ";
+            if ($mer_id) {
+                $mer_uid = Db::name('merchant')->where('mer_id', $mer_id)->value('uid');
+                $userRepository = app()->make(UserRepository::class);
+                $chilid_userids = $userRepository->getSpreadUidBreak($mer_uid);
+                $chilid_userids_string = "1";
+                if (!empty($chilid_userids)) {
+                    $chilid_userids_string = implode(',',$chilid_userids);
+                }
+                $where .= "and uid in ({$chilid_userids_string})";
+            }
+            $type = input('type', 1);
+            $day = input('day', '');
+    
+            if ($type == 1 and $day != '') {
+                $where .= " and DATE(create_time) = '" . $day . "'";
+            }
+            if ($type == 2 and $day != '') {
+                $date = new \DateTime($day);
+                $year = $date->format('Y');
+                $month = $date->format('m');
+                $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            }
+            $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
+            $dataQuery = array_column($dataQuery, 'count', 'user_group');
+            $shopPartnerCount = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where mer_id={$mer_id} and is_shop_partner=1 group by user_group");
+    
+            $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
+            $maker = array_column($maker, 'count', 'k');
+    
+            $userByCodeCount = Db::query("SELECT 'temp' as `temp1`, count(*) count FROM `rrx_user` where {$where} and user_group =4 and is_show = 3");
+            $userByCodeCount = array_column($userByCodeCount, 'count', 'temp1');
+    
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[1] ?? 0), 'name' => '消费者'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[2] ?? 0), 'name' => '业务员'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[3] ?? 0), 'name' => '业务经理'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[5] ?? 0), 'name' => '初级合伙人'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[6] ?? 0), 'name' => '中级合伙人'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[7] ?? 0), 'name' => '高级合伙人'];
+            $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[8] ?? 0), 'name' => '董事'];
+            $list1 = array(
+                array('className' => 'el-icon-s-goods', 'count' => intval($maker['4-2'] ?? 0), 'name' => '集团会员'),//is_show=2
+                array('className' => 'el-icon-s-goods', 'count' => intval($maker['4-1'] ?? 0), 'name' => '电商创客'),
+                array('className' => 'el-icon-s-goods', 'count' => intval($userByCodeCount['temp'] ?? 0), 'name' => '激活创客'),
+            );
+    
+            if ($mer_id) {
+                $data[] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[4] ?? 0), 'name' => '创客'];
+            }
+            $res['left'][] = $data;
+            $res['right'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim(intval($maker['4-2'] ?? 0) + intval($maker['4-1'] ?? 0) + intval($userByCodeCount['temp'] ?? 0)), 'name' => '创客'];
+        }else{
+            $type = input('type', 1);
+            $day = input('day', '');
+    
+            if ($type == 1 and $day != '') {
+                $where .= " and DATE(create_time) = '" . $day . "'";
+            }
+            if ($type == 2 and $day != '') {
+                $date = new \DateTime($day);
+                $year = $date->format('Y');
+                $month = $date->format('m');
+                $where .= " and YEAR(create_time) = " . $year . " AND MONTH(create_time) = " . $month;
+            }
+            $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
+            $dataQuery = array_column($dataQuery, 'count', 'user_group');
+    
+            $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
+            $maker = array_column($maker, 'count', 'k');
+    
+    
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[1] ?? 0), 'name' => '消费者'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[2] ?? 0), 'name' => '业务员'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[3] ?? 0), 'name' => '业务经理'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[5] ?? 0), 'name' => '初级合伙人'];
+            $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[6] ?? 0), 'name' => '中级合伙人'];
+    
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[7] ?? 0), 'name' => '高级合伙人'];
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[8] ?? 0), 'name' => '董事'];
+            $maker = Db::query("SELECT count(uid) as count FROM `rrx_user` where {$where} and originator_id_old > 0");
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '联创'];
+            
+            $whereTow = str_replace("uid", "user_id", $where);
+            $maker = Db::query("SELECT count(user_id) as count FROM `rrx_old_user_stock` where {$whereTow}");
+            
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '股权'];
+            $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
+            $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '商户'];
+            $res['left'] = $data;
         }
-        $dataQuery = Db::query("SELECT user_group,count(uid) count FROM `rrx_user` where {$where} group by user_group");
-        $dataQuery = array_column($dataQuery, 'count', 'user_group');
-
-        $maker = Db::query("SELECT CONCAT(`user_group`, '-',`is_show`) as k, count(uid) count FROM `rrx_user` where {$where} group by user_group,is_show");
-        $maker = array_column($maker, 'count', 'k');
-
-
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[1] ?? 0), 'name' => '消费者'];
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[2] ?? 0), 'name' => '业务员'];
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[3] ?? 0), 'name' => '业务经理'];
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[5] ?? 0), 'name' => '初级合伙人'];
-        $data['one'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[6] ?? 0), 'name' => '中级合伙人'];
-
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[7] ?? 0), 'name' => '高级合伙人'];
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => (int)($dataQuery[8] ?? 0), 'name' => '董事'];
-        $maker = Db::query("SELECT count(uid) as count FROM `rrx_user` where {$where} and originator_id_old > 0");
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '联创'];
-        $maker = Db::query("SELECT count(user_id) as count FROM `rrx_old_user_stock` where {$where}");
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '股权'];
-        $maker = Db::query("SELECT count(uid) as count FROM `rrx_merchant` where {$where}");
-        $data['tow'][] = ['className' => 'el-icon-s-goods', 'count' => set_price_rtrim($maker[0]['count'] ?? 0), 'name' => '商户'];
-
-        $res['left'] = $data;
-
         return $res;
     }
 

app/common/repositories/user/UserAwardRepository.php

@@ -0,0 +1,230 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-05-07
+ *
+ * 
+ */
+
+namespace app\common\repositories\user;
+
+
+use app\common\dao\user\UserIdentityDao;
+use app\common\repositories\BaseRepository;
+use FormBuilder\Exception\FormBuilderException;
+use FormBuilder\Factory\Elm;
+use FormBuilder\Form;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+use think\facade\Route; 
+use think\facade\Db;
+
+/**
+ * Class UserAwardRepository
+ * @package app\common\repositories\user
+ * @author xaboy
+ * @day 2020-05-07
+ * @mixin UserIdentityDao
+ */
+class UserAwardRepository extends BaseRepository
+{
+    /**
+     * @var UserIdentityDao
+     */
+    protected $dao;
+
+    /**
+     * UserGroupRepository constructor.
+     * @param UserIdentityDao $dao
+     */
+    public function __construct(UserIdentityDao $dao)
+    {
+        $this->dao = $dao;
+    }
+
+    /**
+     * @param array $where
+     * @param $page
+     * @param $limit
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function getList(array $where, $page, $limit)
+    {
+        $count = 0;
+        $list = [];
+
+
+        $brokerage_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->value("value");
+        $brokerage_fugou_rate = json_decode($brokerage_fugou_rate, true);
+
+        $user_group_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->value("value");
+        $user_group_rate = json_decode($user_group_rate, true);
+
+        $user_group_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_fugou_rate"])->value("value");
+        $user_group_fugou_rate = json_decode($user_group_fugou_rate, true);
+
+        $brokerage_guquan_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_guquan_rate"])->value("value");
+        $fugou_guquan_rate = Db::name("system_config_value")->where(["config_key"=>"fugou_guquan_rate"])->value("value");
+
+        $brokerage_lianchuang_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_lianchuang_rate"])->value("value");
+        $fugou_lianchuang_rate = Db::name("system_config_value")->where(["config_key"=>"fugou_lianchuang_rate"])->value("value");
+
+        $list[] = [
+            'name' => '佣金',
+            'key' => 'brokerage',
+            'number_rate' => $brokerage_fugou_rate['brokerage_rate']??0,
+            'guquan_rate' => $brokerage_guquan_rate??0,
+            'lianchuang_rate' => $brokerage_lianchuang_rate??0,
+            'user_groub_1' => $user_group_rate[0]['rate']??0,
+            'user_groub_2' => $user_group_rate[1]['rate']??0,
+            'user_groub_3' => $user_group_rate[2]['rate']??0,
+            'user_groub_4' => $user_group_rate[3]['rate']??0,
+            'user_groub_5' => $user_group_rate[4]['rate']??0,
+            'user_groub_6' => $user_group_rate[5]['rate']??0,
+            'user_groub_7' => $user_group_rate[6]['rate']??0,
+        ];
+
+        $list[] = [
+            'name' => '复购金',
+            'key' => 'fugou',
+            'number_rate' => $brokerage_fugou_rate['fugou_rate']??0,
+            'lianchuang_rate' => $fugou_lianchuang_rate??0,
+            'guquan_rate' => $fugou_guquan_rate??0,
+            'user_groub_1' => $user_group_fugou_rate[0]['rate']??0,
+            'user_groub_2' => $user_group_fugou_rate[1]['rate']??0,
+            'user_groub_3' => $user_group_fugou_rate[2]['rate']??0,
+            'user_groub_4' => $user_group_fugou_rate[3]['rate']??0,
+            'user_groub_5' => $user_group_fugou_rate[4]['rate']??0,
+            'user_groub_6' => $user_group_fugou_rate[5]['rate']??0,
+            'user_groub_7' => $user_group_fugou_rate[6]['rate']??0,
+        ];
+
+        $count = count($list);
+        return compact('count', 'list');
+    }
+
+    /**
+     * @param array $formData
+     * @return Form
+     * @throws FormBuilderException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function form(array $formData = [])
+    {
+        $action = Route::buildUrl('configAwardUpdate' , $formData)->build();
+        return Elm::createForm($action, [
+            Elm::number('number_rate', $formData['name'].'占比(%)')->min(0)->size('large'),
+            Elm::number('lianchuang_rate', '联创占比(%)')->min(0)->size('large'),
+            Elm::number('guquan_rate', '股权占比(%)')->min(0)->size('large'),
+            Elm::number('user_groub_1', '消费者占比(%)')->min(0)->size('large'),
+            Elm::number('user_groub_2', '业务员占比(%)')->min(0)->size('large'),
+            Elm::number('user_groub_3', '业务经理占比(%)')->min(0)->size('large'),
+            Elm::number('user_groub_4', '初级合伙人占比(%)')->min(0)->size('large'),
+            Elm::number('user_groub_5', '中级合伙人占比(%)')->min(0)->size('large'),
+            Elm::number('user_groub_6', '高级合伙人占比(%)')->min(0)->size('large'),
+            Elm::number('user_groub_7', '董事占比(%)')->min(0)->size('large'),
+        ])->setTitle($formData['name'].'设置')->formData($formData);
+    }
+
+    /**
+     * @param $id
+     * @return Form
+     * @throws FormBuilderException
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-05-07
+     */
+    public function updateForm($data)
+    {
+        return $this->form($data);
+    }
+
+    /**
+     * @param $id
+     * @param data
+     * @return array
+     * @day 2020-05-07
+     */
+    public function updateAward($key, $data)
+    {
+        if ($key == 'brokerage') {
+            //修改佣金比例
+            $brokerage_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->value("value");
+            $brokerage_fugou_rate = json_decode($brokerage_fugou_rate, true);
+            $brokerage_fugou_rate['brokerage_rate'] = $data['number_rate'];
+            Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->where('mer_id', 0)->update([
+                'value' => json_encode($brokerage_fugou_rate)
+            ]);
+
+            //修改佣金等级分成比例
+            $user_group_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->value("value");
+            $user_group_rate = json_decode($user_group_rate, true);
+            $user_group_rate[0]['rate'] = $data['user_groub_1'];
+            $user_group_rate[1]['rate'] = $data['user_groub_2'];
+            $user_group_rate[2]['rate'] = $data['user_groub_3'];
+            $user_group_rate[3]['rate'] = $data['user_groub_4'];
+            $user_group_rate[4]['rate'] = $data['user_groub_5'];
+            $user_group_rate[5]['rate'] = $data['user_groub_6'];
+            $user_group_rate[6]['rate'] = $data['user_groub_7'];
+            Db::name("system_config_value")->where(["config_key"=>"user_group_rate"])->where('mer_id', 0)->update(['value' =>json_encode($user_group_rate)]);
+
+            //修改佣金股权比例
+            Db::name("system_config_value")->where(["config_key"=>"brokerage_guquan_rate"])->where('mer_id', 0)->update(['value' =>$data['guquan_rate']]);
+            //修改佣金联创比例
+            Db::name("system_config_value")->where(["config_key"=>"brokerage_lianchuang_rate"])->where('mer_id', 0)->update(['value' =>$data['lianchuang_rate']]);
+        }
+
+        if ($key == 'fugou') {
+            //修改复购金比例
+            $brokerage_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->value("value");
+            $brokerage_fugou_rate = json_decode($brokerage_fugou_rate, true);
+            $brokerage_fugou_rate['fugou_rate'] = $data['number_rate'];
+            Db::name("system_config_value")->where(["config_key"=>"brokerage_fugou_rate"])->where('mer_id', 0)->update([
+                'value' => json_encode($brokerage_fugou_rate)
+            ]);
+            //修改复购金等级分成比例
+            $user_group_fugou_rate = Db::name("system_config_value")->where(["config_key"=>"user_group_fugou_rate"])->value("value");
+            $user_group_fugou_rate = json_decode($user_group_fugou_rate, true);
+            $user_group_fugou_rate[0]['rate'] = $data['user_groub_1'];
+            $user_group_fugou_rate[1]['rate'] = $data['user_groub_2'];
+            $user_group_fugou_rate[2]['rate'] = $data['user_groub_3'];
+            $user_group_fugou_rate[3]['rate'] = $data['user_groub_4'];
+            $user_group_fugou_rate[4]['rate'] = $data['user_groub_5'];
+            $user_group_fugou_rate[5]['rate'] = $data['user_groub_6'];
+            $user_group_fugou_rate[6]['rate'] = $data['user_groub_7'];
+            Db::name("system_config_value")->where(["config_key"=>"user_group_fugou_rate"])->where('mer_id', 0)->update([
+                'value' => json_encode($user_group_fugou_rate)
+            ]);
+            //修改复购金股权比例
+            Db::name("system_config_value")->where(["config_key"=>"fugou_guquan_rate"])->where('mer_id', 0)->update(['value' => $data['guquan_rate']]);
+            //修改复购金联创比例
+            Db::name("system_config_value")->where(["config_key"=>"fugou_lianchuang_rate"])->where('mer_id', 0)->update(['value' => $data['lianchuang_rate']]);
+        }
+
+        return true;
+    }
+
+    /**
+     * @param array $where
+     * @return array
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     */
+    public function getIdentityList(array $where = [])
+    {
+        $query = $this->dao->search($where);
+        return $query->select()->toArray();
+    }
+}

app/common/repositories/user/UserRepository.php

@@ -3365,11 +3365,11 @@ class UserRepository extends BaseRepository
      * @throws DbException
      * @throws ModelNotFoundException
      */
-    public function getUidContributeListBySpreadUidList(array $uidList)
+    public function getUidContributeListByLevelIdList(array $uidList)
     {
         return Db::name("user")
-            ->whereIn("spread_uid", $uidList)
-            ->field("uid, contribute, spread_uid")
+            ->whereIn("level_id", $uidList)
+            ->field("uid, contribute, level_id")
             ->select()
             ->toArray();
     }
@@ -3420,7 +3420,7 @@ class UserRepository extends BaseRepository
             foreach(array_chunk($currentLevelIds, $chunkSize) as $chunk) {
                 $subordinatesChunk = Db::name('user')
                     ->field('uid') // 只需要下级的uid
-                    ->whereIn('spread_uid', $chunk) // spread_uid 在当前层级用户块中
+                    ->whereIn('level_id', $chunk) //level_id 在当前层级用户块中
                     ->where('status', 1)
                     ->select()
                     ->toArray();
@@ -3549,7 +3549,8 @@ class UserRepository extends BaseRepository
         foreach ($userSignGongxianList as $value) {
             // 贡献表中 包含多种类型的 贡献值记录，比如 用户消费商家获得赠送贡献值 , 推广获得的贡献值（直推），这些都不能算是 用户的 直接贡献值
             // 只有 用户取消费 比如：购买 ** 商品、扫码消费获得赠送贡献值 等 才算做个人贡献值
-            if (strpos($value['mark'], "购买") !== false || strpos($value['mark'], "扫码") !== false) {
+            //            || strpos($value['mark'], "扫码") !== false
+            if (strpos($value['mark'], "购买") !== false || strpos($value['mark'], "会员专区消费商品赠送贡献值") !== false) {
                 if($value['type'] == 1) {
                     $type = 1;
                 } else {
@@ -3562,40 +3563,40 @@ class UserRepository extends BaseRepository
                 ];
             }
         }
-        // 老订单 产生的贡献值 并未在 贡献记录表中
-        $oldUserOfGoodsList = Db::name('old_user_of_goods')
-            ->where('status', 1) // '是否完成 0, 未完成 1 已完成',
-            ->whereIn('user_id', $uidList)
-            ->field('user_id, money, status, create_time') // 只需要下级的uid和贡献值
-            ->select()
-            ->toArray();
-        // 定义一个映射数组，用于存储不同 money 对应的 contribute 值
-        $contributeMapping = [
-            1180 => 700,
-            10620 => 6300,
-            11800 => 7000,
-            9440 => 5600,
-            2360 => 1400,
-        ];
-        // 遍历每个 $storeProductData
-        foreach ($oldUserOfGoodsList as $storeProductData) {
-            // 获取 money 的值
-            $money = $storeProductData['money'];
-            // 检查 money 是否在映射中
-            if (isset($contributeMapping[$money])) {
-                // 如果存在，则使用映射的值
-                $contribute = $contributeMapping[$money];
-            } else {
-                // 否则按默认规则计算
-                $contribute = bcmul($money, 0.7, 2);
-            }
-            // 将数据添加到 $userContributeTimeList
-            $userContributeTimeMap[$storeProductData['user_id']][] = [
-                'type' => 1,
-                'contribute' => $contribute,
-                'settlementTime' => $storeProductData['create_time']
-            ];
-        }
+        // // 老订单 产生的贡献值 并未在 贡献记录表中
+        // $oldUserOfGoodsList = Db::name('old_user_of_goods')
+        //     ->where('status', 1) // '是否完成 0, 未完成 1 已完成',
+        //     ->whereIn('user_id', $uidList)
+        //     ->field('user_id, money, status, create_time') // 只需要下级的uid和贡献值
+        //     ->select()
+        //     ->toArray();
+        // // 定义一个映射数组，用于存储不同 money 对应的 contribute 值
+        // $contributeMapping = [
+        //     1180 => 700,
+        //     10620 => 6300,
+        //     11800 => 7000,
+        //     9440 => 5600,
+        //     2360 => 1400,
+        // ];
+        // // 遍历每个 $storeProductData
+        // foreach ($oldUserOfGoodsList as $storeProductData) {
+        //     // 获取 money 的值
+        //     $money = $storeProductData['money'];
+        //     // 检查 money 是否在映射中
+        //     if (isset($contributeMapping[$money])) {
+        //         // 如果存在，则使用映射的值
+        //         $contribute = $contributeMapping[$money];
+        //     } else {
+        //         // 否则按默认规则计算
+        //         $contribute = bcmul($money, 0.7, 2);
+        //     }
+        //     // 将数据添加到 $userContributeTimeList
+        //     $userContributeTimeMap[$storeProductData['user_id']][] = [
+        //         'type' => 1,
+        //         'contribute' => $contribute,
+        //         'settlementTime' => date('Y-m-d H:i:s', $storeProductData['create_time'])
+        //     ];
+        // }
         foreach ($userContributeTimeMap as $key => &$subArray) {
             usort($subArray, function ($a, $b) {
                 return strtotime($a['settlementTime']) - strtotime($b['settlementTime']);
@@ -3630,9 +3631,9 @@ class UserRepository extends BaseRepository
             }
             // 2、获取用户贡献值 日志记录 对应时间
             $userContributeTimeMap = $this->getUserContributeTimeMapByUidList([$uid]);
+            $myIdentityUpTime = '';
             if (!empty($userContributeTimeMap[$uid])) {
                 $myArriveNumOwn = 0;
-                $myIdentityUpTime = '';
                 foreach ($userContributeTimeMap[$uid] as $value) {
                     if ($value['type'] == 1) {
                         $myArriveNumOwn += $value['contribute'];
@@ -3644,12 +3645,17 @@ class UserRepository extends BaseRepository
                         break;
                     }
                 }
-                if (!empty($myIdentityUpTime)) {
-                    $data['identity_up_time'] = $userData['identity_up_time'] = $myIdentityUpTime;
-                    // 只升级 不降级
-                    if ($userData['user_group'] == 1) {
-                        $userData['user_group'] = $yeWuYuanId;
-                    }
+            }
+            if (!empty($myIdentityUpTime)) {
+                $data['identity_up_time'] = $userData['identity_up_time'] = $myIdentityUpTime;
+                // 只升级 不降级
+                if ($userData['user_group'] == 1) {
+                    $userData['user_group'] = $yeWuYuanId;
+                }
+                $this->dao->update($uid, $data);
+            } else {
+                if ($userData['is_old'] == 1) {
+                    $data['identity_up_time'] = $userData['identity_up_time'] = $userData['create_time'];
                     $this->dao->update($uid, $data);
                 }
             }
@@ -3720,7 +3726,7 @@ class UserRepository extends BaseRepository
         $userContributionSumMap = [];
         if ($depth >= 0 && !empty($startTime)) {
             // 获取用户的直属下级
-            $uidContributeList = $this->getUidContributeListBySpreadUidList([$uid]);
+            $uidContributeList = $this->getUidContributeListByLevelIdList([$uid]);
             $uidContributeUidList = array_column($uidContributeList, 'uid');
             $subordinatesOfCurrentLevelUidList = $this->getUserContributeByUidList($uidContributeUidList, $startTime, $endTime);
 

app/controller/admin/system/config/Award.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * @package merchant
+ *
+ * @author xaboy
+ * @day 2020-03-24
+ *
+ * 
+ */
+
+namespace app\controller\admin\system\config;
+
+
+use crmeb\basic\BaseController;
+use app\common\repositories\user\UserAwardRepository;
+use FormBuilder\Exception\FormBuilderException;
+use think\App;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\DbException;
+use think\db\exception\ModelNotFoundException;
+
+/**
+ * Class Config
+ * @package app\controller\admin\system\config
+ * @author xaboy
+ * @day 2020-03-27
+ */
+class Award extends BaseController
+{
+    /**
+     * @var UserAwardRepository
+     */
+    protected $repository;
+
+    /**
+     * Config constructor.
+     * @param App $app
+     * @param UserAwardRepository $repository
+     */
+    public function __construct(App $app, UserAwardRepository $repository)
+    {
+        parent::__construct($app);
+        $this->repository = $repository;
+    }
+
+    /**
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @author xaboy
+     * @day 2020-03-31
+     */
+    public function lst()
+    {
+        $where = $this->request->params(['keyword']);
+        [$page, $limit] = $this->getPage();
+        $lst = $this->repository->getList($where, $page, $limit);
+
+        return app('json')->success($lst);
+    }
+
+    /**
+     * @return mixed
+     * @throws DataNotFoundException
+     * @throws DbException
+     * @throws ModelNotFoundException
+     * @throws FormBuilderException
+     * @author xaboy
+     * @day 2020-03-31
+     */
+    public function updateTable()
+    {
+        $data = $this->request->param();
+        $form = $this->repository->updateForm($data);
+        return app('json')->success(formToData($form));
+    }
+
+    /**
+     * @param int $key
+     * @return mixed
+     * @throws DbException
+     * @author xaboy
+     * @day 2020-03-27
+     */
+    public function update($key)
+    {
+        $data = $this->request->param();
+        $this->repository->updateAward($key,$data);
+        return app('json')->success('修改成功');
+    }
+
+}

app/controller/api/Auth.php

@@ -935,7 +935,7 @@ class Auth extends BaseController
 //
 //        }
 
-        return Db::name('user')->where(['spread_uid'=>$teamid])->count();
+        return Db::name('user')->where(['level_id'=>$teamid])->count();
 
     }
 

app/controller/api/store/merchant/Merchant.php

@@ -142,6 +142,53 @@ class Merchant extends BaseController
     }
 
     /**
+     * 商贸区店铺商品列表
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function commerceProductList()
+    {
+        $params= $this->request->params(['pageNum','pageSize']);
+        $mer_id_unset = [496,486,439,148,491];
+        $domain = $this->request->domain();
+        if(strpos($domain, 'test.hebeiyhc.com') !== false) {
+            // 域名中包含 "test.hebeiyhc.com'" 字符串
+            array_push($mer_id_unset, 486);
+        }else{
+            array_push($mer_id_unset, 497);
+        }
+
+        $is_commercetrade = 1;
+        [$page, $limit] = $this->getPage();
+        if($params['pageNum']!=''){
+            $page=$params['pageNum'];
+        }
+        if($params['pageSize']!=''){
+            $limit=$params['pageSize'];
+        }
+        $mer_list = Db::name('merchant')->where(['category_id' => 32,'status' => 1,'is_del' => 0])->page($page)->limit($limit)->select();
+        $where['is_gift_bag'] = 0;
+        $where['is_used'] = 1;
+        $where['product_type'] = 0;
+        $where['is_hide'] = 0;
+        $return_list = [];
+        if($mer_list) {
+            $mer_list = $mer_list->toArray();
+            foreach ($mer_list as $mer) {
+                if(in_array($mer['mer_id'],$mer_id_unset)) continue;
+                $goods = $this->repository->productList($mer['mer_id'],$where, 1, 3,$this->userInfo,false,$is_commercetrade);
+                if(empty($goods['list'])) continue;
+                $mer['goods_list'] = $goods['list'];
+                $return_list[] = $mer;
+            }
+        }
+        return app('json')->success(['list'=>$return_list]);
+
+    }
+
+    /**
      * 查询代理人商品
      * @param $type
      * @return mixed

app/controller/api/store/merchant/Taskorderguquan.php

@@ -7,6 +7,7 @@
 
 namespace app\controller\api\store\merchant;
 
+use app\common\model\user\User;
 use think\facade\Db;
 
 class Taskorderguquan
@@ -14,74 +15,652 @@ class Taskorderguquan
 
     public function assignment()
     {
-        /**
-         * 周金花200(13959100621)
-         * 黄金花200(18603401312)
-         * 徐立苹100(13521438652)
-         * 李素红200(13701061395)
-         * 周行体200(13231658486)
-         * 刘银霞100(13161909228)
-         * 李卫东100(13911601230)
-         * 金    波100(13801358713)
-         * 王   玲 150(15810064711)
-         * 侯玉兰150(15232797965)
-         * 吕丽娣100(15960349667)
-         * 张传莲100(15332507711)
-         * 刘春梅100(18760167163)
-         * 付天如100(18863873000)
-         * 付绍先100(15324059286)
-         * 黄桂林100(15960196876)
-         * 温  煌100(18350134089)
-         * 谭英先100(13978627072)
-         * 陈玉珍100(19858353660)
-         * 黄雪云100(18650055445)
-         * 黄  玲100(13877193411)
-         * 邱佳珍100(13960379098)
-         * 隋彩云100（13601071082）
-         */
-        $data = [
-            '13959100621' => 200,
-            '18603401312' => 200,
-            '13521438652' => 100,
-            '13701061395' => 200,
-            '13231658486' => 200,
-            '13161909228' => 100,
-            '13911601230' => 100,
-            '13801358713' => 100,
-            '15810064711' => 150,
-            '15232797965' => 150,
-            '15960349667' => 100,
-            '15332507711' => 100,
-            '18760167163' => 100,
-            '18863873000' => 100,
-            '15324059286' => 100,
-            '15960196876' => 100,
-            '18350134089' => 100,
-            '13978627072' => 100,
-            '19858353660' => 100,
-            '18650055445' => 100,
-            '13877193411' => 100,
-            '13960379098' => 100,
-            '13601071082' => 100,
+        $result = [
+            'oldOrderExistGongXian' => [],
+            'orderExistGongXian' => [],
+            'oldOrderExistPv' => [],
+            'orderExistPv' => [],
+            'gongXianDataOldList' => [],
+            'gongXianDataList' => [],
+            'pvDataOldList' => [],
+            'pvDataList' => [],
+            'contributeNot' => [],
+            'pvNot' => [],
+            'userUpdateSummary' => ['success' => 0, 'failed' => 0, 'skipped' => 0], // 优化: 汇总用户更新结果
+            'insertGongXianSummary' => ['success' => 0, 'failed' => 0], // 优化: 汇总贡献插入结果
+            'insertPvSummary' => ['success' => 0, 'failed' => 0],         // 优化: 汇总PV插入结果
+            'errors' => [],               // 优化: 统一记录错误信息
         ];
-        $result = Db::name("user")
-            ->whereIn("account", array_keys($data))
+
+        // --- 数据库查询部分 (保持不变，已优化) ---
+        // 1. 查询用户
+        $userList = Db::name("user")
             ->where('is_del', 0)
-            ->field('uid, brokerage_price, account, nickname')
-            ->select();
-        $res = [];
-        foreach ($result as $v) {
-            Db::name("user")->where("uid", $v['uid'])->inc("brokerage_price", $data[$v['account']])->save();
-            $this->bill_user_log111111($v['uid'], "佣金补贴", $data[$v['account']], "佣金补贴", 8);//股权分佣明细2.0系统
-            $res[] = [
-                'uid' => $v['uid'],
-                'account' => $v['account'],
-                'brokerage_price_pre' => $v['brokerage_price'],
-                'brokerage_price' => $data[$v['account']],
-                'nickname' => $v['nickname']
+            //            ->whereIn('uid', [277, 1593])
+            ->column('uid, spread_uid, contribute, per_contribute, pv', 'uid');
+        // $userIds = array_keys($userList);
+
+        $oldUserList = Db::name("old_user_jbp")
+            ->column('id, amount');
+
+        // 2. 查询老订单
+        $userOfGoodsListRaw = Db::name("old_user_of_goods")
+            ->where('status', 1)
+            // 优化: 如果用户量大，可以考虑只查相关用户的订单
+            // ->whereIn('user_id', $userIds)
+            ->field('user_id, money, order_id, create_time')
+            ->select()
+            ->toArray();
+
+        // 3. 查询新订单
+        $storeOrderListRaw = Db::name("store_order")
+            ->whereIn('status', [0, 1, 2, 3])
+            // 优化: 如果用户量大，可以考虑只查相关用户的订单
+            // ->whereIn('uid', $userIds)
+            ->field('uid, pay_price, mer_id, status, order_id, create_time')
+            ->select()
+            ->toArray();
+
+        // 4. 查询已存在的贡献值记录
+        $gongXianListRaw = Db::name("user_sign_gongxian")
+            ->where('status', '<>', -1)
+            // 优化: 如果记录非常多，可以分批查询或只查相关用户的
+            // ->whereIn('uid', array_merge($userIds, array_column($userList, 'spread_uid'))) // 查询购买者和潜在推广者
+            ->field('uid, order_id, number, status, type')
+            ->select()
+            ->toArray();
+
+        // 5. 查询已存在的PV记录
+        $pvListRaw = Db::name("user_pv_log")
+            ->where('status', '<>', -1)
+            // 优化: 同上
+            // ->whereIn('uid', $userIds)
+            ->field('uid, order_id, pv, status')
+            ->select()
+            ->toArray();
+
+        // --- 数据预处理部分
+        $existingGongXian = [];
+        $existingGongXianByUid = [];
+        foreach ($gongXianListRaw as $gx) {
+            $existingGongXian[$gx['uid'] . '_' . $gx['order_id']] = ['number' => $gx['number'], 'status' => $gx['status'], 'type' => $gx['type']];
+            // TODO 目前老订单id 1-900 新订单ID 4868 - 6255 线下扫码订单 6870 - 8733
+            if ((1 <= $gx['order_id'] && $gx['order_id'] <= 900) || (4868 <= $gx['order_id'] && $gx['order_id'] <= 6869)) {
+                $existingGongXianByUid[$gx['uid']][] = $gx['order_id'];
+            }
+        }
+        unset($gongXianListRaw);
+
+        $existingPv = [];
+        $existingPvByUid = [];
+        foreach ($pvListRaw as $pv) {
+            $existingPv[$pv['uid'] . '_' . $pv['order_id']] = ['pv' => $pv['pv'], 'status' => $pv['status']];
+            // TODO 目前老订单id 1-900 新订单ID 4868 - 6255 线下扫码订单 6870 - 8733
+            if ((1 <= $pv['order_id'] && $pv['order_id'] <= 900) || (4868 <= $pv['order_id'] && $pv['order_id'] <= 6869)) {
+                $existingPvByUid[$pv['uid']][] = $pv['order_id'];
+            }
+        }
+        unset($pvListRaw);
+
+        $userOfGoodsByUid = [];
+        foreach ($userOfGoodsListRaw as $oldOrder) $userOfGoodsByUid[$oldOrder['user_id']][] = $oldOrder;
+        unset($userOfGoodsListRaw);
+
+        $storeOrdersByUid = [];
+        foreach ($storeOrderListRaw as $order) $storeOrdersByUid[$order['uid']][] = $order;
+        unset($storeOrderListRaw);
+
+        // *** 主逻辑处理与数据收集 ***
+        $gongXianDataToInsert = []; // 优化: 合并新旧贡献插入列表
+        $pvDataToInsert = [];       // 优化: 合并新旧PV插入列表
+        $userUpdateData = [];       // 优化: 收集所有需要更新的用户数据 [uid => ['contribute'=>float, 'pv'=>float, 'per_contribute'=>float]]
+
+        // 初始化所有用户的待更新数据
+        foreach ($userList as $uid => $user) {
+            // 预先设置初始值，确保即使没有订单的用户也能被包含在后续可能的更新逻辑中（如果需要）
+            // 如果用户没有任何订单，他们的 contribute 和 pv 应该保持数据库原始值或根据业务逻辑设为0
+            // 这里我们先假设如果没有订单，他们的计算值就是0
+            $userUpdateData[$uid] = [
+                'uid' => $uid,
+                'contribute' => 0.0,
+                'pv' => 0.0,
+                'per_contribute' => 0.0,
             ];
+            // 初始化推广者的 per_contribute 累加器
+            if (!empty($user['spread_uid'])) {
+                $spreadUid = $user['spread_uid'];
+                if (!isset($userUpdateData[$spreadUid])) {
+                    if (isset($userList[$spreadUid])) {
+                        if (!isset($userUpdateData[$spreadUid]['per_contribute'])) {
+                            $userUpdateData[$spreadUid]['per_contribute'] = 0.0; // 初始化推广者的累加
+                        }
+                    } else {
+                        // 记录或处理推广者不在当前用户列表的情况
+                        $result['errors'][] = "执行{$uid}时，没找到 推荐人 {$spreadUid}";
+                        // 可以选择跳过给这个推广者增加 per_contribute
+                    }
+
+                } else if (!isset($userUpdateData[$spreadUid]['per_contribute'])) {
+                    $userUpdateData[$spreadUid]['per_contribute'] = 0.0; // 初始化推广者的累加
+                }
+            }
+        }
+
+        // 遍历用户列表进行计算和数据收集
+        foreach ($userList as $uid => $user) {
+            $spreadUid = $user['spread_uid'];
+            $existingGongXianByUid[$uid] = $existingGongXianByUid[$uid] ?? [];
+            $existingPvByUid[$uid] = $existingPvByUid[$uid] ?? [];
+            if (isset($userOfGoodsByUid[$uid])) {
+                foreach ($userOfGoodsByUid[$uid] as $oldOrder) {
+                    switch ($oldOrder['money']) {
+                        case 1180:
+                            $totalPv = 700.0;
+                            break;
+                        case 11800:
+                            $totalPv = 7000.0;
+                            break;
+                        case 10620:
+                            $totalPv = 6300.0;
+                            break;
+                        case 2360:
+                            $totalPv = 1400.0;
+                            break;
+                        case 9440:
+                            $totalPv = 5600.0;
+                            break;
+                        default:
+                            $totalPv = round($oldOrder['money'] * 0.7, 2);
+                            break;
+                    }
+
+                    $settlementTimeOld = $oldOrder['create_time'] ? date('Y-m-d H:i:s', $oldOrder['create_time']) : strtotime($user['create_time']);
+                    // --- 收集贡献值插入数据 ---
+                    $orderKey = $uid . '_' . $oldOrder['order_id'];
+                    // 一个人 同一个订单 可能有多条记录 有问题
+                    if (isset($existingGongXian[$orderKey])) {
+                        $result['oldOrderExistGongXian'][] = ['uid' => $uid, 'order_id' => $oldOrder['order_id']];
+                        $existingGongXianByUid[$uid] = array_diff($existingGongXianByUid[$uid], [$oldOrder['order_id']]);
+                        if ($existingGongXian[$orderKey]['status'] == 1) {
+                            if ($existingGongXian[$orderKey]['type'] == 1) {
+                                $userUpdateData[$uid]['contribute'] += $existingGongXian[$orderKey]['number'];
+                            } else if ($existingGongXian[$orderKey]['type'] == 2) {
+                                $userUpdateData[$uid]['contribute'] -= $existingGongXian[$orderKey]['number'];
+                            }
+                        }
+                        if (!empty($spreadUid) && isset($userUpdateData[$spreadUid])) {
+                            $existingGongXianByUid[$spreadUid] = array_diff($existingGongXianByUid[$spreadUid], [$oldOrder['order_id']]);
+                            if (isset($existingGongXian[$spreadUid . '_' . $oldOrder['order_id']])) {
+                                if ($existingGongXian[$spreadUid . '_' . $oldOrder['order_id']]['status'] == 1) {
+                                    if ($existingGongXian[$spreadUid . '_' . $oldOrder['order_id']]['type'] == 1) {
+                                        $userUpdateData[$spreadUid]['per_contribute'] += $existingGongXian[$spreadUid . '_' . $oldOrder['order_id']]['number'];
+                                    } else if ($existingGongXian[$spreadUid . '_' . $oldOrder['order_id']]['type'] == 2) {
+                                        $userUpdateData[$spreadUid]['per_contribute'] -= $existingGongXian[$spreadUid . '_' . $oldOrder['order_id']]['number'];
+                                    }
+                                }
+                            }
+                        }
+                    } else {
+                        if ($totalPv > 0) {
+                            $userUpdateData[$uid]['contribute'] += $totalPv;
+                            // --- 收集贡献值插入数据 ---
+                            $gongXianBase = [
+                                "number" => $totalPv, "addtime" => strtotime($settlementTimeOld), "status" => 1,
+                                "order_type" => 21, "order_id" => $oldOrder['order_id'],
+                                "desc" => '', "surplus" => 0, "type" => 1, 'settlement_time' => $settlementTimeOld
+                            ];
+                            // 本人
+                            $gongXianDataToInsert[] = array_merge(["uid" => $uid, "mark" => "购买会员专区商品赠送贡献值(1.0)"], $gongXianBase);
+                            $existingGongXianByUid[$uid] = array_diff($existingGongXianByUid[$uid], [$oldOrder['order_id']]);
+                            // 推广人
+                            if (!empty($user['spread_uid'])) {
+                                if (isset($userUpdateData[$spreadUid])) {
+                                    $userUpdateData[$spreadUid]['per_contribute'] += $totalPv;
+                                    $gongXianDataToInsert[] = array_merge(["uid" => $spreadUid, "mark" => "推广会员专区商品赠送贡献值(1.0)"], $gongXianBase);
+                                    $existingGongXianByUid[$spreadUid] = array_diff($existingGongXianByUid[$spreadUid], [$oldOrder['order_id']]);
+                                }
+                            }
+                        }
+                    }
+                    // --- 收集 PV 插入数据 ---
+                    if (isset($existingPv[$orderKey])) {
+                        $result['oldOrderExistPv'][] = ['uid' => $uid, 'order_id' => $oldOrder['order_id']];
+                        if ($existingPv[$orderKey]['status'] == 1) {
+                            $userUpdateData[$uid]['pv'] += $existingPv[$orderKey]['pv'];
+                        }
+                    } else {
+                        $userUpdateData[$uid]['pv'] += $totalPv;
+                        $pvDataToInsert[] = [
+                            "uid" => $uid, "pv" => $totalPv, "addtime" => strtotime($settlementTimeOld), "status" => 1,
+                            "order_type" => 21, "order_id" => $oldOrder['order_id'],
+                            "mark" => "购买会员专区商品赠送PV(1.0)", 'settlement_time' => $settlementTimeOld
+                        ];
+                    }
+                    if (!empty($existingPvByUid[$uid])) {
+                        $existingPvByUid[$uid] = array_diff($existingPvByUid[$uid], [$oldOrder['order_id']]);
+                    }
+                }
+            } // end if isset($userOfGoodsByUid[$uid])
+
+            // --- 处理新订单 ---
+            if (isset($storeOrdersByUid[$uid])) {
+                foreach ($storeOrdersByUid[$uid] as $order) {
+                    $totalPv = 0.0;
+                    // ... (if/else logic and switch case for $totalPv calculation - same as before)
+                    if ($order['mer_id'] == 496) {
+                        switch ($order['pay_price']) {
+                            case 1180:
+                                $totalPv = 700.0;
+                                break;
+                            case 11800:
+                                $totalPv = 7000.0;
+                                break;
+                            case 10620:
+                                $totalPv = 6300.0;
+                                break;
+                            case 2360:
+                                $totalPv = 1400.0;
+                                break;
+                            case 9440:
+                                $totalPv = 5600.0;
+                                break;
+                            default:
+                                $totalPv = round($order['pay_price'] * 0.7, 2);
+                                break;
+                        }
+                    } else if ($order['status'] == 3) {
+                        $totalPv = round($order['pay_price'] * 0.7, 2);
+                    }
+                    // --- 收集贡献值插入数据 ---
+                    $orderKey = $uid . '_' . $order['order_id'];
+                    $settlementTimeNew = $order['create_time'] ?: date('Y-m-d H:i:s', $user['create_time']);
+                    // --- 收集贡献值插入数据 ---
+                    if (isset($existingGongXian[$orderKey])) {
+                        $result['orderExistGongXian'][] = ['uid' => $uid, 'order_id' => $order['order_id']];
+                        $existingGongXianByUid[$uid] = array_diff($existingGongXianByUid[$uid], [$order['order_id']]);
+                        // 累加计算值
+                        if ($existingGongXian[$orderKey]['status'] == 1) {
+                            if ($existingGongXian[$orderKey]['type'] == 1) {
+                                $userUpdateData[$uid]['contribute'] += $existingGongXian[$orderKey]['number'];
+                            } else if ($existingGongXian[$orderKey]['type'] == 2) {
+                                $userUpdateData[$uid]['contribute'] -= $existingGongXian[$orderKey]['number'];
+                            }
+                        }
+                        if (!empty($spreadUid) && isset($userUpdateData[$spreadUid])) {
+                            $existingGongXianByUid[$spreadUid] = array_diff($existingGongXianByUid[$spreadUid], [$order['order_id']]);
+                            if (isset($existingGongXian[$spreadUid . '_' . $order['order_id']])) {
+                                if ($existingGongXian[$spreadUid . '_' . $order['order_id']]['status'] == 1) {
+                                    if ($existingGongXian[$spreadUid . '_' . $order['order_id']]['type'] == 1) {
+                                        $userUpdateData[$spreadUid]['per_contribute'] += $existingGongXian[$spreadUid . '_' . $order['order_id']]['number'];
+                                    } else if ($existingGongXian[$spreadUid . '_' . $order['order_id']]['type'] == 2) {
+                                        $userUpdateData[$spreadUid]['per_contribute'] += $existingGongXian[$spreadUid . '_' . $order['order_id']]['number'];
+                                    }
+                                }
+                            }
+                        }
+
+                    } else {
+                        if ($totalPv > 0) {
+                            $userUpdateData[$uid]['contribute'] += $totalPv;
+                            $gongXianBase = [ // 优化: 提取公共字段
+                                "number" => $totalPv, "addtime" => strtotime($settlementTimeNew), "status" => 1,
+                                "order_type" => 22, "order_id" => $order['order_id'],
+                                "desc" => '', "surplus" => 0, "type" => 1, 'settlement_time' => $settlementTimeNew
+                            ];
+                            // 本人
+                            $gongXianDataToInsert[] = array_merge(["uid" => $uid, "mark" => "购买商品赠送贡献值(2.0)"], $gongXianBase);
+                            $existingGongXianByUid[$uid] = array_diff($existingGongXianByUid[$uid], [$order['order_id']]);
+                            // 推广人
+                            if (!empty($user['spread_uid'])) {
+                                $spreadUid = $user['spread_uid'];
+                                if (isset($userUpdateData[$spreadUid])) { // 确保推广者存在
+                                    $gongXianDataToInsert[] = array_merge(["uid" => $spreadUid, "mark" => "推广商品赠送贡献值(2.0)"], $gongXianBase);
+                                    $userUpdateData[$spreadUid]['per_contribute'] += $totalPv; // 累加推广者业绩
+                                    $existingGongXianByUid[$spreadUid] = array_diff($existingGongXianByUid[$spreadUid], [$order['order_id']]);
+                                }
+                            }
+                        }
+                    }
+
+                    // --- 收集 PV 插入数据 ---
+                    if (isset($existingPv[$orderKey])) {
+                        $result['orderExistPv'][] = ['uid' => $uid, 'order_id' => $order['order_id']];
+                        if ($existingPv[$orderKey]['status'] == 1) {
+                            $userUpdateData[$uid]['pv'] += $existingPv[$orderKey]['pv'];
+                        }
+                    } else {
+                        $userUpdateData[$uid]['pv'] += $totalPv;
+                        $pvDataToInsert[] = [
+                            "uid" => $uid, "pv" => $totalPv, "addtime" => strtotime($settlementTimeNew), "status" => 1,
+                            "order_type" => 22, // 确认 PV log 的 order_type 是否与贡献一致或有区分
+                            "order_id" => $order['order_id'],
+                            "mark" => "购买商品赠送PV(2.0)", // 标记调整为更通用
+                            'settlement_time' => $settlementTimeNew
+                        ];
+                    }
+                    if (!empty($existingPvByUid[$uid])) {
+                        $existingPvByUid[$uid] = array_diff($existingPvByUid[$uid], [$order['order_id']]);
+                    }
+                }
+            }
+            // end if isset($storeOrdersByUid[$uid])
+
+            // --- 比较计算值与原值 (移到循环外处理) ---
+            // （在此处比较并记录到 $result['contributeNot'] / $result['pvNot']）
+            // 注意：浮点数比较可能需要容差
+            $tolerance = 0.001; // 定义一个小的容差值
+            if (abs($userUpdateData[$uid]['contribute'] - (float)$user['contribute']) > $tolerance) {
+                $result['contributeNot'][] = [
+                    'uid' => $uid,
+                    'contribute_old' => (float)$user['contribute'], // 显式转换
+                    'contribute_new' => $userUpdateData[$uid]['contribute']
+                ];
+            }
+            if (abs($userUpdateData[$uid]['pv'] - (float)$user['pv']) > $tolerance) {
+                $result['pvNot'][] = [
+                    'uid' => $uid,
+                    'pv_old' => (float)$user['pv'], // 显式转换
+                    'pv_new' => $userUpdateData[$uid]['pv']
+                ];
+            }
+            // per_contribute 是累加的，不需要与旧值比较，直接更新
+
+        } // end foreach ($userList as $uid => $user)
+
+        // *** 数据库批量操作 ***
+        // 使用事务确保数据一致性
+        Db::startTrans();
+        try {
+            $bill = [];
+            foreach ($oldUserList as $item) {
+                $bill[] = [
+                    'uid' => $item['id'],
+                    'link_id' => 0,//关联订单id
+                    'pm' => 1,//0：支出，1：获得
+                    'title' => '佣金',//账单标题
+                    'category' => 'now_money',//明细种类
+                    'type' => 'commission',//明细类型
+                    'number' => $item['amount'],//明细数字
+                    'balance' => 0,//剩余
+                    'mark' => '1.0佣金记录',//备注
+                    'create_time' => '2025-02-04 00:00:00',//添加时间
+                    'status' => 1,//0待确定，1有效，-1无效
+                    'commission_type' => 21,//佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\r\n5 养老金√ 6 广告费
+                    //7 跨店奖励√ 8平台奖励 9渠道商\r\n10 推荐创客收益√ 11分红奖金√ 12代理区域收益√ 13消费循环佣金
+                    //14-推荐代理收益√ 15邀请小区团长升级√ 16大v分享奖√ 17创客合伙人√ 18积分奖励√ 19创客补贴√’
+                    'order_sn' => 0,//订单号
+                    'tripartite' => 0,//
+                    'type_shop' => 0,//0平台1多多进宝2唯品会3苏宁易购4网易考拉5淘宝客6京东联盟7饿了么8线上
+                    'mer_id' => 0,//商户id
+                    'source' => 0,//1线下 0线上
+                    'order_type' => 1,//1自营  2 第三方  订单类型
+                    'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
+                    'gzc' => 3,//养老金是否已进入公证处log表0：未进入。1：已进入
+                    'take_time' => '',//结算时间
+                    'district_id' => '',//
+                    'street_id' => '',//
+                    'month' => '',//月份
+
+
+                ];
+            }
+            $chunkedBill = array_chunk($bill, 500);
+            foreach ($chunkedBill as $chunk) {
+                Db::name('user_bill')->insertAll($chunk);
+            }
+
+            if (!empty($existingGongXianByUid)) {
+                foreach ($existingGongXianByUid as $uid => $orderList) {
+                    if (!empty($orderList)) {
+                        Db::name("user_sign_gongxian")
+                            ->where('uid', $uid)
+                            ->whereIn('order_id', $orderList)
+                            ->update(['status' => 0]);
+                    }
+                }
+            }
+            if (!empty($existingPvByUid)) {
+                foreach ($existingPvByUid as $uid => $orderList) {
+                    if (!empty($orderList)) {
+                        Db::name("user_pv_log")
+                            ->where('uid', $uid)
+                            ->whereIn('order_id', $orderList)
+                            ->update(['status' => 0]);
+                    }
+                }
+            }
+            // --- 批量插入贡献值 ---
+            if (!empty($gongXianDataToInsert)) {
+                // 分块插入，避免单次插入过多数据 (例如一次500条)
+                $chunkedGongXian = array_chunk($gongXianDataToInsert, 500);
+                foreach ($chunkedGongXian as $chunk) {
+                    $insertedGongXianCount = Db::name('user_sign_gongxian')->insertAll($chunk);
+                    $result['insertGongXianSummary']['success'] += $insertedGongXianCount;
+                }
+
+                if ($result['insertGongXianSummary']['success'] < count($gongXianDataToInsert)) {
+                    $result['insertGongXianSummary']['failed'] = count($gongXianDataToInsert) - $result['insertGongXianSummary']['success'];
+                    // 可以考虑记录更详细的失败信息，但这比较复杂，需要知道哪些失败了
+                    $result['errors'][] = "GongXian insertion partially failed or failed completely.";
+                    // 根据业务决定是否回滚
+                    // throw new Exception("GongXian insertion failed");
+                }
+            } else {
+                $result['insertGongXianSummary']['skipped'] = true; // 标记为跳过（无数据）
+            }
+
+            // --- 批量插入PV ---
+            if (!empty($pvDataToInsert)) {
+                $chunkedPv = array_chunk($pvDataToInsert, 500);
+                foreach ($chunkedPv as $chunk) {
+                    $insertedPvCount = Db::name('user_pv_log')->insertAll($chunk);
+                    $result['insertPvSummary']['success'] += $insertedPvCount;
+                }
+                if ($result['insertPvSummary']['success'] < count($pvDataToInsert)) {
+                    $result['insertPvSummary']['failed'] = count($pvDataToInsert) - $result['insertPvSummary']['success'];
+                    $result['errors'][] = "PV Log insertion partially failed or failed completely.";
+                    // throw new Exception("PV Log insertion failed");
+                }
+            } else {
+                $result['insertPvSummary']['skipped'] = true; // 标记为跳过（无数据）
+            }
+
+            // --- 批量更新用户信息 ---
+            $usersToUpdate = [];
+            // 筛选出实际需要更新的用户数据 (值有变化或 per_contribute > 0)
+            foreach ($userUpdateData as $uid => $updateInfo) {
+                $originalUser = $userList[$uid]; // 获取原始用户信息
+                // 检查 contribute 或 pv 是否变化（使用容差），或者 per_contribute 是否需要更新
+                $needsUpdate = false;
+                if (abs($updateInfo['contribute'] - (float)$originalUser['contribute']) > $tolerance) $needsUpdate = true;
+                if (abs($updateInfo['pv'] - (float)$originalUser['pv']) > $tolerance) $needsUpdate = true;
+                // per_contribute 始终更新，因为它是在现有基础上累加的（除非业务定义不同）
+                // 如果 per_contribute 数据库设计是直接覆盖，那只有 > 0 时才需要更新
+                // 假设是覆盖更新，且只有大于0时才需要更新变动（如果一直是0则不用更新）
+                if ($updateInfo['per_contribute'] > 0.0) { // 只有当推广业绩>0时才触发更新
+                    // 这里需要确认 per_contribute 是覆盖还是累加?
+                    // 如果是数据库累加: Db::name("user")->where('uid', $uid)->inc('per_contribute', $amount)->update(); 需要单独处理
+                    // 如果是覆盖: 直接放入 saveAll
+                    // 假设是覆盖，我们只更新有变化的或per_contribute > 0 的
+                    $needsUpdate = true;
+                } else {
+                    // 如果 per_contribute 计算结果为0，且 contribute 和 pv 也未变，则不需要更新 per_contribute 字段
+                    unset($updateInfo['per_contribute']); // 移除无需更新的 per_contribute
+                    if (empty($updateInfo)) $needsUpdate = false; // 如果移除后为空，则不更新
+                }
+
+                if ($needsUpdate) {
+                    // 确保只包含需要更新的字段，并且包含主键 'uid'
+                    $finalUpdateData = ['uid' => $uid];
+                    if (isset($updateInfo['contribute'])) $finalUpdateData['contribute'] = $updateInfo['contribute'];
+                    if (isset($updateInfo['pv'])) $finalUpdateData['pv'] = $updateInfo['pv'];
+                    if (isset($updateInfo['per_contribute']) && $updateInfo['per_contribute'] > 0.0) { // 再次确认只更新大于0的推广业绩
+                        $finalUpdateData['per_contribute'] = $updateInfo['per_contribute'];
+                    }
+
+                    if (count($finalUpdateData) > 1) { // 确保除了uid还有其他字段要更新
+                        $usersToUpdate[] = $finalUpdateData;
+                    } else {
+                        $result['userUpdateSummary']['skipped']++; // 记录跳过的更新（无变化）
+                    }
+
+                } else {
+                    $result['userUpdateSummary']['skipped']++; // 记录跳过的更新（无变化）
+                }
+            }
+
+            if (!empty($usersToUpdate)) {
+                // 使用 saveAll 进行批量更新 (要求 PHP >= 7.1.8 for MySQL)
+                // saveAll 会根据主键 'uid' 更新对应记录
+                $userModel = new User();
+                $updatedCount = $userModel->saveAll($usersToUpdate); // TP6 支持 saveAll
+
+                // 注意: saveAll 返回的是成功保存或更新的 *对象集合* 或 *布尔值*，不是影响的行数。
+                // 需要检查返回类型并判断成功数量。通常返回集合时 count(集合) 是成功数。
+                // 如果是 TP5，可能需要循环 update 或构造复杂 SQL。
+                // 假设 TP6 saveAll 成功会返回包含更新后数据的集合或true，失败是false
+                if ($updatedCount !== false) {
+                    // 这里需要一种方法来确定实际更新了多少条记录。
+                    // saveAll 的返回值可能需要进一步处理。
+                    // 简单假设：如果返回不是 false，就认为请求中的都成功了（可能不准确）
+                    // 更精确的方法是 saveAll 后再查询一次确认。
+                    // 这里我们暂时认为 saveAll 返回非 false 即为大部分成功
+                    $result['userUpdateSummary']['success'] = count($usersToUpdate); // 乐观估计
+                } else {
+                    $result['userUpdateSummary']['failed'] = count($usersToUpdate); // 全部失败
+                    $result['errors'][] = "User batch update failed using saveAll.";
+                    // throw new Exception("User batch update failed");
+                }
+            }
+            // 更新统计：失败数等于总数减去成功和跳过的
+            //$result['userUpdateSummary']['failed'] = count($userList) - $result['userUpdateSummary']['success'] - $result['userUpdateSummary']['skipped'];
+
+            // 如果所有操作都成功，提交事务
+            Db::commit();
+
+        } catch
+        (\Exception $e) {
+            // 如果任何数据库操作失败，回滚事务
+            Db::rollback();
+            // 记录错误信息
+            $result['errors'][] = "Transaction failed: " . $e->getMessage();
+            // 可以根据需要将 insert/update 摘要设置为失败
+            $result['userUpdateSummary']['failed'] = count($usersToUpdate); // 假设更新失败
+            $result['insertGongXianSummary']['failed'] = count($gongXianDataToInsert); // 假设插入失败
+            $result['insertPvSummary']['failed'] = count($pvDataToInsert);      // 假设插入失败
         }
-        return json($res);
+
+        // --- 清理/最终结果赋值 (可选) ---
+        // $result['gongXianDataOldList'] = $gongXianDataOldList; // 这些已合并到 ToInsert
+        // $result['gongXianDataList'] = $gongXianDataList;
+        // $result['pvDataOldList'] = $pvDataOldList;
+        // $result['pvDataList'] = $pvDataList;
+
+        return json($result);
+
+        //        // 计算总业绩
+        //        $totalPv = [];
+        //        foreach ($user_team_amount as $order) {
+        //            if (!isset($totalPv[$order['user_id']])) {
+        //                $totalPv[$order['user_id']] = 0;
+        //            }
+        //            switch ($order['money']) {
+        //                case 1180:
+        //                    $totalPv[$order['user_id']] += 700;
+        //                    break;
+        //                case 11800:
+        //                    $totalPv[$order['user_id']] += 7000;
+        //                    break;
+        //                case 10620:
+        //                    $totalPv[$order['user_id']] += 6300;
+        //                    break;
+        //                case 2360:
+        //                    $totalPv[$order['user_id']] += 1400;
+        //                    break;
+        //                case 9440:
+        //                    $totalPv[$order['user_id']] += 5600;
+        //                    break;
+        //                default:
+        //                    if ($order['money'] == 2344.99) {
+        //                        break;
+        //                    }
+        //                    $totalPv[$order['user_id']] += round($order['money'] * 0.7, 2);
+        //                    break;
+        //            }
+        //        }
+        //        foreach ($totalPv as $uid => $pv) {
+        //            Db::name("user")->where('is_old', 1)->where("uid", $uid)->update(['pv' => $pv]);
+        //        }
+        //
+        //        return;
+        //        /**
+        //         * 周金花200(13959100621)
+        //         * 黄金花200(18603401312)
+        //         * 徐立苹100(13521438652)
+        //         * 李素红200(13701061395)
+        //         * 周行体200(13231658486)
+        //         * 刘银霞100(13161909228)
+        //         * 李卫东100(13911601230)
+        //         * 金    波100(13801358713)
+        //         * 王   玲 150(15810064711)
+        //         * 侯玉兰150(15232797965)
+        //         * 吕丽娣100(15960349667)
+        //         * 张传莲100(15332507711)
+        //         * 刘春梅100(18760167163)
+        //         * 付天如100(18863873000)
+        //         * 付绍先100(15324059286)
+        //         * 黄桂林100(15960196876)
+        //         * 温  煌100(18350134089)
+        //         * 谭英先100(13978627072)
+        //         * 陈玉珍100(19858353660)
+        //         * 黄雪云100(18650055445)
+        //         * 黄  玲100(13877193411)
+        //         * 邱佳珍100(13960379098)
+        //         * 隋彩云100（13601071082）
+        //         */
+        //        $data = [
+        //            '13959100621' => 200,
+        //            '18603401312' => 200,
+        //            '13521438652' => 100,
+        //            '13701061395' => 200,
+        //            '13231658486' => 200,
+        //            '13161909228' => 100,
+        //            '13911601230' => 100,
+        //            '13801358713' => 100,
+        //            '15810064711' => 150,
+        //            '15232797965' => 150,
+        //            '15960349667' => 100,
+        //            '15332507711' => 100,
+        //            '18760167163' => 100,
+        //            '18863873000' => 100,
+        //            '15324059286' => 100,
+        //            '15960196876' => 100,
+        //            '18350134089' => 100,
+        //            '13978627072' => 100,
+        //            '19858353660' => 100,
+        //            '18650055445' => 100,
+        //            '13877193411' => 100,
+        //            '13960379098' => 100,
+        //            '13601071082' => 100,
+        //        ];
+        //        $result = Db::name("user")
+        //            ->whereIn("account", array_keys($data))
+        //            ->where('is_del', 0)
+        //            ->field('uid, brokerage_price, account, nickname')
+        //            ->select();
+        //        $res = [];
+        //        foreach ($result as $v) {
+        //            Db::name("user")->where("uid", $v['uid'])->inc("brokerage_price", $data[$v['account']])->save();
+        //            $this->bill_user_log111111($v['uid'], "佣金补贴", $data[$v['account']], "佣金补贴", 8);//股权分佣明细2.0系统
+        //            $res[] = [
+        //                'uid' => $v['uid'],
+        //                'account' => $v['account'],
+        //                'brokerage_price_pre' => $v['brokerage_price'],
+        //                'brokerage_price' => $data[$v['account']],
+        //                'nickname' => $v['nickname']
+        //            ];
+        //        }
+        //        return json($res);
 
     }
 

app/controller/api/store/product/Jt.php

@@ -589,13 +589,13 @@ class Jt extends BaseController
 
             $formatData['materialUrl'] = '';
             if($userId!=''){
-            //加入转链地址
-            $clparams = [
-                'positionid' => pow(10, 5) + $userId,
-                'gid' => $goodsId,
-                'coupon_url' => $detail['couponInfo']['couponList'][0]['discount_link'] ?? '',
-            ];
-            $formatData['materialUrl'] = $this->changLink($clparams);
+                //加入转链地址 此步骤可优化 分两个步骤
+                $clparams = [
+                    'positionid' => pow(10, 5) + $userId,
+                    'gid' => $goodsId,
+                    'coupon_url' => $detail['couponInfo']['couponList'][0]['discount_link'] ?? '',
+                ];
+                $formatData['materialUrl'] = $this->changLink($clparams);
             }
 
             $return[] = $formatData;

route/admin.php

@@ -93,6 +93,13 @@ Route::group(config('admin.api_admin_prefix') . '/', function () {
             Route::get('lst', '/lst')->name('configIdentityLst');
         })->prefix('admin.system.config.Identity');
 
+        //用户奖励配置
+        Route::group('config/award', function () {
+            Route::get('lst', '/lst')->name('configAwardLst');
+            Route::post('update/:key', '/update')->name('configAwardUpdate');
+            Route::get('update/table', '/updateTable')->name('configAwardUpdateForm');
+        })->prefix('admin.system.config.award');    
+
         Route::group('config/others', function () {
             Route::get('lst', 'ConfigOthers/lst')->name('configOthersSettingLst');
             Route::post('update', 'ConfigOthers/update')->name('configOthersSettingUpdate');

route/api.php

@@ -298,6 +298,7 @@ Route::group('api/', function () {
 
             Route::get('green_integral_list', 'User/green_integral_list');//积分明细
             Route::get('team_list', 'User/team_list');//一壶茶-团队列表
+            Route::get('team_list_old', 'User/team_list_old');//一壶茶-团队列表
             Route::get('team_details', 'User/team_details');//一壶茶-团队详情
             Route::get('user_invite_profit_list', 'User/user_invite_profit_list');//一壶茶-团队详情
 
@@ -729,6 +730,7 @@ Route::group('api/', function () {
             Route::get('listindex', 'Merchant/listindex');
             Route::get('/product/lst/:id', 'Merchant/productList');
             Route::get('/product/type_lst', 'Merchant/productTypeList');//特殊-根据商户查询商品
+            Route::get('/product/commerce_list', 'Merchant/commerceProductList');//特殊-根据商户查询商品
             Route::get('/areaProduct/lst', 'Merchant/areaProductList');
             Route::get('/category/lst/:id', 'Merchant/categoryList');
             Route::get('/detail/:id', 'Merchant/detail');