Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Report.php

@@ -91,7 +91,7 @@ class Report extends Base
         $where_ladder = [['gl.is_del', '=', 0]];
         $where_good = [['g.is_del', '=', 0]];
         if (!empty($param['start_date']) && !empty($param['end_date'])) {
-            $where_ladder[] = ['gp.online_time', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
+            $where_ladder[] = ['gp.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
             $where_good[] = ['gp.addtime', 'between', [$param['start_date'] . ' 00:00:00', $param['end_date'] . ' 23:59:59']];
         }
         if (!empty($param['platform_id'])) {
@@ -112,7 +112,7 @@ class Report extends Base
             ->where($where_ladder)
             ->leftJoin('good_platform gp', 'gp.skuCode=gl.skuCode')
             ->leftJoin('good g', 'g.spuCode=gp.spuCode')
-            ->order('gl.id')
+            ->order('g.id')
             ->select()
             ->toArray();
 

app/admin/controller/Sale.php

@@ -2292,6 +2292,7 @@ class Sale extends Base
                     $wsmcode = Db::name("warehouse_info")->where(["wsm_code" => $value['wsm_code']])->find();
                     $value['wsm_name'] =isset($wsmcode['name'])?$wsmcode['name']:"";
                 }
+                $value['sendtime'] = $value['status']<2 ? '':$value['sendtime'];
                 $addrs[] = $value;
             }
         }
@@ -3255,7 +3256,7 @@ class Sale extends Base
             $value['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
             $value['can'] = isset($goon['cat_id']) && $goon['cat_id'] != 0 ? made($goon['cat_id']) : [];
             $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
-
+            $value['sendtime'] = $value['status']<2 ? '' :$value['sendtime'];
             $data[] = $value;
         }
         return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);
@@ -3298,6 +3299,7 @@ class Sale extends Base
         $codeinfo['addr_code'] = isset($addr['addr_code']) ? $addr['addr_code'] : "";
         $codeinfo['contactor'] = isset($addr['contactor']) ? $addr['contactor'] : "";
         $codeinfo['mobile'] = isset($addr['mobile']) ? $addr['mobile'] : "";
+        $codeinfo['sendtime'] = $codeinfo['status']<2 ? '' :$codeinfo['sendtime'];
         $codeinfo['can'] = $int;
         $orderReturn = Db::name("order_return")->where(["outCode"=>$outCode,"is_del"=>0])->order("id desc")->find();
         $codeinfo['order_return'] = $orderReturn ;