Merge branch 'dev' into dev-sxb

app/common/repositories/store/product/ProductRepository.php

@@ -1905,16 +1905,18 @@ class ProductRepository extends BaseRepository
             } else {
                 // 平台商品 走商户后台
                 // 推荐创客收益设置
-                $shop_bonus_setting                 = merchantConfig($mer_id, 'shop_bonus_setting') ?: [
-                    'shop_bonus_rate' => 30,
-                    'yanglao_rate'    => 5,
-                ];
-                $shop_bonus_setting['yanglao_rate'] = $shop_bonus_setting['yanglao_rate'] ?? 5;
-//                if ($mer_id == 496) {
-//                    $yanglao = $total_price * 5 / 100;
-//                } else {
-                $yanglao = $total_price * $shop_bonus_setting['yanglao_rate'] / 100;
-//                }
+//                 $shop_bonus_setting                 = merchantConfig($mer_id, 'shop_bonus_setting') ?: [
+//                     'shop_bonus_rate' => 30,
+//                     'yanglao_rate'    => 5,
+//                 ];
+//                 $shop_bonus_setting['yanglao_rate'] = $shop_bonus_setting['yanglao_rate'] ?? 5;
+// //                if ($mer_id == 496) {
+// //                    $yanglao = $total_price * 5 / 100;
+// //                } else {
+//                 $yanglao = $total_price * $shop_bonus_setting['yanglao_rate'] / 100;
+// //                }
+                $yanglao = bcmul($product['concession_pri'], 0.3, 2);
+
             }
             $yanglao= decimal2($yanglao);
         } else {

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

@@ -172,7 +172,22 @@ class Merchant extends BaseController
         $where['is_del'] = 0;
         $where['status'] = 1;
         $category_id && $where['category_id'] = $category_id;
-        $mer_list = Db::name('merchant')->where($where)->page($page)->limit(100)->select();
+
+        $hasProductMerIdList = Db::name('store_product')
+            ->where('status', '=', 1)
+            ->where('is_show', '=', 1)
+            ->where('is_del', '=', 0)
+            ->group('mer_id')
+            ->field('mer_id')
+            ->select();
+        if ($hasProductMerIdList) {
+            $hasProductMerIdList = array_column($hasProductMerIdList->toArray(), 'mer_id');
+        }
+        $query = Db::name('merchant')->where($where);
+        if (!empty($hasProductMerIdList) && is_array($hasProductMerIdList)) {
+            $query->whereIn('mer_id', $hasProductMerIdList);
+        }
+        $mer_list = $query->page($page)->limit($limit)->select();
         $where['is_gift_bag'] = 0;
         $where['is_used'] = 1;
         $where['product_type'] = 0;

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

@@ -18,55 +18,44 @@ class Taskorderguquan
     {
 
         /**
-         * 9900元补贴下面人员
-         * 13231658486周行体1500
-         * 13333069689魏惠新2000
-         * 13959100621周金花600
-         * 13701061395李素红500
-         * 17501006833邢艳丽500
-         * 15631982690魏震洪400
-         * 18603401312黄金花400
+         * 请根据内容：
+         * 6250元补贴下面人员
+         * 13231658486周行体1000
+         * 13333069689魏惠新1500
+         * 13959100621周金花300
+         * 13701061395李素红300
+         * 17501006833邢艳丽300
+         * 15631982690魏震洪300
+         * 18603401312黄金花200
          * 13521438652徐立苹200
-         * 15832971815孟晓玮500
-         * 18600200909陈冠霖500
-         * 18001316701闫旭400
-         * 15810064711 王   玲 500
-         * 13932925303会强400
-         * 15321221558李伟400
-         * 15232797965侯玉兰50
-         * 13601071082隋彩云300
+         * 15832971815孟晓玮300
+         * 18600200909陈冠霖300
+         * 15810064711 王   玲 300
+         * 13932925303会强300
+         * 13601071082隋彩云200
          * 13161909228刘银霞50
          * 18760167163刘春梅50
          * 18911752386魏利琴50
          * 13215917919李小秋50
          * 15332507711张传莲50
          * 18715313601大饼500
-         *
-         * 计9900元
-         *
-         * 2000转给周军VR市场使用
-         *
-         * 4.3258.35万做合伙人分红
-         *
-         * 共计55158.35万
-         */
+         * 23750元做合伙人分红
+         * 共计3万
+ */
         $data = [
-            '13231658486' => 1500,
-            '13333069689' => 2000,
-            '13959100621' => 600,
-            '13701061395' => 500,
-            '17501006833' => 500,
-            '15631982690' => 400,
-            '18603401312' => 400,
+            '13231658486' => 1000,
+            '13333069689' => 1500,
+            '13959100621' => 300,
+            '13701061395' => 300,
+            '17501006833' => 300,
+            '15631982690' => 300,
+            '18603401312' => 200,
             '13521438652' => 200,
-            '15832971815' => 500,
-            '18600200909' => 500,
-            '18001316701' => 400,
-            '15810064711' => 500,
-            '13932925303' => 400,
-            '15321221558' => 400,
-            '15232797965' => 50,
-            '13601071082' => 300,
+            '15832971815' => 300,
+            '18600200909' => 300,
+            '15810064711' => 300,
+            '13932925303' => 300,
+            '13601071082' => 200,
             '13161909228' => 50,
             '18760167163' => 50,
             '18911752386' => 50,