Merge branch 'dev' into dev-sxb

app/common/repositories/store/order/StoreOrderRepository.php

@@ -5068,7 +5068,7 @@ class StoreOrderRepository extends BaseRepository
         foreach ($list as $key => $item) {
             if ($item['fzone_paytype']) {
                 $list[$key]['fzone_paytype'] = json_decode($item['fzone_paytype'], true);
-                if (!count($list[$key]['fzone_paytype'])) {
+                if (is_array($list[$key]['fzone_paytype']) && !count($list[$key]['fzone_paytype'])) {
                     $list[$key]['fzone_paytype'] = null;
                 }
             } else {

app/controller/admin/order/Order.php

@@ -77,7 +77,7 @@ class Order extends BaseController
         // 导出
         $is_excel = request()->param('is_excel', 0);
 
-        $result = $this->repository->merchantGetList($where, $page, $limit);
+        $result = $this->repository->merchantGetList($where, $page, $limit, $is_excel);
 
         if ($is_excel == 1) {
             $data = $result['list'];
@@ -91,9 +91,9 @@ class Order extends BaseController
                     $item['real_name'], // 收货人
                     $item['merchant']['mer_name'] ?? '', // 商户名称
                     // $item['orderProduct'][0]['cart_info']['product']['image'],
-                    $item['orderProduct'][0]['cart_info']['product']['store_name'] . ' | ' . $item['orderProduct'][0]['cart_info']['productAttr']['sku'],
-                    $item['orderProduct'][0]['cart_info']['productAttr']['price'],
-                    $item['orderProduct'][0]['product_num'],
+                    ($item['orderProduct'][0]['cart_info']['product']['store_name'] ?? '') . ' | ' . ($item['orderProduct'][0]['cart_info']['productAttr']['sku'] ?? ''),
+                    $item['orderProduct'][0]['cart_info']['productAttr']['price'] ?? 0.00,
+                    $item['orderProduct'][0]['product_num'] ?? 0,
                     $item['pay_price'], // 订单金额
                     $item['fzone_pay_note'], // 支付方式
                     $item['paid'] == 0 ? "未支付" : "已支付", // 支付状态

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

@@ -18,21 +18,21 @@ class Taskorderguquan
     {
 
         /**
-         * 10000元补贴下面人员
+         * 9900元补贴下面人员
          * 13231658486周行体1500
          * 13333069689魏惠新2000
-         * 13959100621周金花500
+         * 13959100621周金花600
          * 13701061395李素红500
          * 17501006833邢艳丽500
          * 15631982690魏震洪400
          * 18603401312黄金花400
-         * 13521438652徐立苹500
+         * 13521438652徐立苹200
          * 15832971815孟晓玮500
          * 18600200909陈冠霖500
          * 18001316701闫旭400
          * 15810064711 王   玲 500
          * 13932925303会强400
-         * 15321221558李伟300
+         * 15321221558李伟400
          * 15232797965侯玉兰50
          * 13601071082隋彩云300
          * 13161909228刘银霞50
@@ -42,29 +42,29 @@ class Taskorderguquan
          * 15332507711张传莲50
          * 18715313601大饼500
          *
-         * 计10000元
+         * 计9900元
          *
          * 2000转给周军VR市场使用
          *
-         * 43258.35做合伙人分红
+         * 4.3258.35万做合伙人分红
          *
-         * 共计55258.35
+         * 共计55158.35万
          */
         $data = [
             '13231658486' => 1500,
             '13333069689' => 2000,
-            '13959100621' => 500,
+            '13959100621' => 600,
             '13701061395' => 500,
             '17501006833' => 500,
             '15631982690' => 400,
             '18603401312' => 400,
-            '13521438652' => 500,
+            '13521438652' => 200,
             '15832971815' => 500,
             '18600200909' => 500,
             '18001316701' => 400,
             '15810064711' => 500,
             '13932925303' => 400,
-            '15321221558' => 300,
+            '15321221558' => 400,
             '15232797965' => 50,
             '13601071082' => 300,
             '13161909228' => 50,
@@ -72,7 +72,7 @@ class Taskorderguquan
             '18911752386' => 50,
             '13215917919' => 50,
             '15332507711' => 50,
-            '18715313601' => 500,
+            '18715313601' => 500
         ];
 
         $result = Db::name("user")