Merge branch 'master' into dev

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

@@ -32,33 +32,45 @@ class TaskPartnerProfits
     {
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
         $orders = Db::name("store_order")
-            ->where('mer_id', 496)
-            ->whereNotIn('uid', $removeUserIdList)
-            ->whereIn('status', [0, 1, 2, 3])
-            ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
-            ->whereBetween("pay_time", [$startTime, $endTime])
-            ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
+            ->alias('a')
+            ->where('a.mer_id', 496)
+            ->whereNotIn('a.uid', $removeUserIdList)
+            ->whereIn('a.status', [0, 1, 2, 3])
+            // ->whereIn("a.total_price", [1180, 11800, 10620, 2360, 9440])
+            ->whereBetween("a.pay_time", [$startTime, $endTime])
+            ->whereNotNull("a.pay_time") // 排除 pay_time 为 NULL 的订单
+            ->leftJoin('rrx_store_cart b', 'a.cart_id = b.cart_id')
+            ->field('a.mer_id, a.cart_id, a.status, a.pay_time, a.total_price, b.product_id')
             ->select();
 
         // 计算总业绩
         $totalPv = 0;
         foreach ($orders as $order) {
-            switch ($order['total_price']) {
-                case 1180:
+            switch ($order['product_id']) {
+                case in_array($order['product_id'], [15762, 15763]):
                     $totalPv += 700;
                     break;
-                case 11800:
+                case in_array($order['product_id'], [15813, 15820]):
                     $totalPv += 7000;
                     break;
-                case 10620:
+                case in_array($order['product_id'], [15814, 15819]):
                     $totalPv += 6300;
                     break;
-                case 2360:
+                case in_array($order['product_id'], [15815, 15817]):
                     $totalPv += 1400;
                     break;
-                case 9440:
+                case in_array($order['product_id'], [15816, 15818]):
                     $totalPv += 5600;
                     break;
+                case in_array($order['product_id'], [17610]):
+                    $totalPv += 35;
+                    break;
+                case in_array($order['product_id'], [17611]):
+                    $totalPv += 175;
+                    break;
+                case in_array($order['product_id'], [17612]):
+                    $totalPv += 350;
+                    break;
             }
         }
 
@@ -805,7 +817,7 @@ class TaskPartnerProfits
             'order_type' => 1,//1自营  2 第三方  订单类型
             'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
             'gzc' => 3,//养老金是否已进入公证处log表0：未进入。1：已进入
-            'take_time' => '',//结算时间
+            'take_time' => time(),//结算时间
             'district_id' => '',//
             'street_id' => '',//
             'month' => '',//月份

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

@@ -19,73 +19,69 @@ class Taskorderguquan
 
         /**
         补贴下面人员
-        13231658486周行体1000
-        13333069689魏   新1000
-        13959100621周金花600
-        13701061395李素红500
-        17501006833邢艳丽400
-        15631982690魏震洪400
-        18603401312黄金花500
-        13521438652徐立苹500
-        15832971815孟晓玮500
-        18600200909陈冠霖500
-        15810064711 王   玲 500
-        13932925303会强400
-        13901074090陈玉刚500
-        13381085923王建军100
-        13601071082隋彩云400
-        18001316701闫旭400
-        13601179856陈瑞元100
-        13161909228刘银霞200
-        18760167163刘春梅100
-        13215917919李小秋100
-        13801358713金波 50
-        15321221558李伟 500
+        13231658486周行体600
+        13333069689魏   新600
+        13959100621周金花300
+        13701061395李素红300
+        17501006833邢艳丽300
+        15631982690魏震洪200
+        18603401312黄金花200
+        13521438652徐立苹300
+        15832971815孟晓玮300
+        18600200909陈冠霖300
+        15810064711 王   玲 300
+        13932925303会强200
+        13901074090陈玉刚300
+        13381085923王建军50
+        13601071082隋彩云200
+        18001316701闫旭200
+        13601179856陈瑞元50
+        13161909228刘银霞50
+        18760167163刘春梅50
+        13215917919李小秋50
+        13801358713金波50
+        15321221558李伟 200
         15332507711张传莲50
-        15960349667吕丽娣100
-        13231658486周军市场补贴1000
-        18513005403王培100
+        15960349667吕丽娣50
+        13231658486周军市场补贴600
+        18513005403王培50
         18612051372李金俭 50
         15803242611王志敏50
-        13701059062王金权100
-        13331043787张吉良138
-        15081901002刘文生 50
-        17501020833耀祖3500
-        18715313601大饼400
+        13701059062王金权50
+        13331043787张吉良115
+        18715313601大饼300
         */
         $data = [
-            '13231658486' => 2000,
-            '13333069689' => 1000,
-            '13959100621' => 600,
-            '13701061395' => 500,
-            '17501006833' => 400,
-            '15631982690' => 400,
-            '18603401312' => 500,
-            '13521438652' => 500,
-            '15832971815' => 500,
-            '18600200909' => 500,
-            '15810064711' => 500,
-            '13932925303' => 400,
-            '13901074090' => 500,
-            '13381085923' => 100,
-            '13601071082' => 400,
-            '18001316701' => 400,
-            '13601179856' => 100,
-            '13161909228' => 200,
-            '18760167163' => 100,
-            '13215917919' => 100,
+            '13231658486' => 1200,
+            '13333069689' => 600,
+            '13959100621' => 300,
+            '13701061395' => 300,
+            '17501006833' => 300,
+            '15631982690' => 200,
+            '18603401312' => 200,
+            '13521438652' => 300,
+            '15832971815' => 300,
+            '18600200909' => 300,
+            '15810064711' => 300,
+            '13932925303' => 200,
+            '13901074090' => 300,
+            '13381085923' => 50,
+            '13601071082' => 200,
+            '18001316701' => 200,
+            '13601179856' => 50,
+            '13161909228' => 50,
+            '18760167163' => 50,
+            '13215917919' => 50,
             '13801358713' => 50,
-            '15321221558' => 500,
+            '15321221558' => 200,
             '15332507711' => 50,
-            '15960349667' => 100,
-            '18513005403' => 100,
+            '15960349667' => 50,
+            '18513005403' => 50,
             '18612051372' => 50,
             '15803242611' => 50,
-            '13701059062' => 100,
-            '13331043787' => 138,
-            '15081901002' => 50,
-            '17501020833' => 3500,
-            '18715313601' => 400
+            '13701059062' => 50,
+            '13331043787' => 115,
+            '18715313601' => 300
         ];
 
         $result = Db::name("user")
@@ -1007,7 +1003,7 @@ class Taskorderguquan
             'order_type' => 1,//1自营  2 第三方  订单类型
             'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
             'gzc' => 3,//养老金是否已进入公证处log表0：未进入。1：已进入
-            'take_time' => '',//结算时间
+            'take_time' => time(),//结算时间
             'district_id' => '',//
             'street_id' => '',//
             'month' => '',//月份
@@ -1090,33 +1086,45 @@ class Taskorderguquan
     {
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
         $orders = Db::name("store_order")
-            ->where('mer_id', 496)
-            ->whereNotIn('uid', $removeUserIdList)
-            ->whereIn('status', [0, 1, 2, 3])
-            ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
-            ->whereBetween("pay_time", [$startTime, $endTime])
-            ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
+            ->alias('a')
+            ->where('a.mer_id', 496)
+            ->whereNotIn('a.uid', $removeUserIdList)
+            ->whereIn('a.status', [0, 1, 2, 3])
+            // ->whereIn("a.total_price", [1180, 11800, 10620, 2360, 9440])
+            ->whereBetween("a.pay_time", [$startTime, $endTime])
+            ->whereNotNull("a.pay_time") // 排除 pay_time 为 NULL 的订单
+            ->leftJoin('rrx_store_cart b', 'a.cart_id = b.cart_id')
+            ->field('a.mer_id, a.cart_id, a.status, a.pay_time, a.total_price, b.product_id')
             ->select();
 
         // 计算总业绩
         $totalPv = 0;
         foreach ($orders as $order) {
-            switch ($order['total_price']) {
-                case 1180:
+            switch ($order['product_id']) {
+                case in_array($order['product_id'], [15762, 15763]):
                     $totalPv += 700;
                     break;
-                case 11800:
+                case in_array($order['product_id'], [15813, 15820]):
                     $totalPv += 7000;
                     break;
-                case 10620:
+                case in_array($order['product_id'], [15814, 15819]):
                     $totalPv += 6300;
                     break;
-                case 2360:
+                case in_array($order['product_id'], [15815, 15817]):
                     $totalPv += 1400;
                     break;
-                case 9440:
+                case in_array($order['product_id'], [15816, 15818]):
                     $totalPv += 5600;
                     break;
+                case in_array($order['product_id'], [17610]):
+                    $totalPv += 35;
+                    break;
+                case in_array($order['product_id'], [17611]):
+                    $totalPv += 175;
+                    break;
+                case in_array($order['product_id'], [17612]):
+                    $totalPv += 350;
+                    break;
             }
         }
 

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

@@ -560,7 +560,7 @@ class Taskorderlianc
             'order_type' => 1,//1自营  2 第三方  订单类型
             'is_red_brokerage' => 0,//1红积分对冲佣金 0正常佣金
             'gzc' => 3,//养老金是否已进入公证处log表0：未进入。1：已进入
-            'take_time' => '',//结算时间
+            'take_time' => time(),//结算时间
             'district_id' => '',//
             'street_id' => '',//
             'month' => '',//月份
@@ -723,33 +723,45 @@ class Taskorderlianc
     {
         // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
         $orders = Db::name("store_order")
-            ->where('mer_id', 496)
-            ->whereNotIn('uid', $removeUserIdList)
-            ->whereIn('status', [0, 1, 2, 3])
-            ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
-            ->whereBetween("pay_time", [$startTime, $endTime])
-            ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
+            ->alias('a')
+            ->where('a.mer_id', 496)
+            ->whereNotIn('a.uid', $removeUserIdList)
+            ->whereIn('a.status', [0, 1, 2, 3])
+            // ->whereIn("a.total_price", [1180, 11800, 10620, 2360, 9440])
+            ->whereBetween("a.pay_time", [$startTime, $endTime])
+            ->whereNotNull("a.pay_time") // 排除 pay_time 为 NULL 的订单
+            ->leftJoin('rrx_store_cart b', 'a.cart_id = b.cart_id')
+            ->field('a.mer_id, a.cart_id, a.status, a.pay_time, a.total_price, b.product_id')
             ->select();
 
         // 计算总业绩
         $totalPv = 0;
         foreach ($orders as $order) {
-            switch ($order['total_price']) {
-                case 1180:
+            switch ($order['product_id']) {
+                case in_array($order['product_id'], [15762, 15763]):
                     $totalPv += 700;
                     break;
-                case 11800:
+                case in_array($order['product_id'], [15813, 15820]):
                     $totalPv += 7000;
                     break;
-                case 10620:
+                case in_array($order['product_id'], [15814, 15819]):
                     $totalPv += 6300;
                     break;
-                case 2360:
+                case in_array($order['product_id'], [15815, 15817]):
                     $totalPv += 1400;
                     break;
-                case 9440:
+                case in_array($order['product_id'], [15816, 15818]):
                     $totalPv += 5600;
                     break;
+                case in_array($order['product_id'], [17610]):
+                    $totalPv += 35;
+                    break;
+                case in_array($order['product_id'], [17611]):
+                    $totalPv += 175;
+                    break;
+                case in_array($order['product_id'], [17612]):
+                    $totalPv += 350;
+                    break;
             }
         }